fe / YOHOBUYPC · Commits

Go to a project

Authored by Lynnic
Commit 218bfb892f5da0e3399d9e2494e83e4d68fc8cfb 1 parent 9b21e15c

fixed conflict

Inline Side-by-side
Showing 2 changed files with 2 additions and 10 deletions
... ... @@ -36,14 +36,10 @@ if (0 === $('.goods-discount .discount-folder').children().length) {
//goods-discount下拉按钮点击事件
$('.goodsDiscount .dropdown').on('click', function() {
if ($('.goodsDiscount .discount-folder').is(':hidden')) {
$('.goodsDiscount .first-item span').removeClass('icon-down');
$('.goodsDiscount .first-item span').addClass('icon-up');
$('.goodsDiscount .first-item span').html('');
$('.goodsDiscount .first-item span').removeClass('icon-down').addClass('icon-up').html('');
$('.goodsDiscount .discount-folder').slideDown();
} else {
$('.goodsDiscount .first-item span').removeClass('icon-up');
$('.goodsDiscount .first-item span').addClass('icon-down');
$('.goodsDiscount .first-item span').html('');
$('.goodsDiscount .first-item span').removeClass('icon-up').addClass('icon-down').html('');
$('.goodsDiscount .discount-folder').slideUp();
}
});
... ...
... ... @@ -18,11 +18,7 @@ likeHammer.on('tap', function(e) {
var opt,
favorite;
<<<<<<< HEAD
var $this = $(e.target);
=======
var $this = $(this);
>>>>>>> 3685878e28b5f0a7fbf2ebdb250a96a5ecc47f52
if ($this.hasClass('liked')) {
opt = 'cancel';
... ...