Authored by Lynnic

fixed conflict

@@ -36,14 +36,10 @@ if (0 === $('.goods-discount .discount-folder').children().length) { @@ -36,14 +36,10 @@ if (0 === $('.goods-discount .discount-folder').children().length) {
36 //goods-discount下拉按钮点击事件 36 //goods-discount下拉按钮点击事件
37 $('.goodsDiscount .dropdown').on('click', function() { 37 $('.goodsDiscount .dropdown').on('click', function() {
38 if ($('.goodsDiscount .discount-folder').is(':hidden')) { 38 if ($('.goodsDiscount .discount-folder').is(':hidden')) {
39 - $('.goodsDiscount .first-item span').removeClass('icon-down');  
40 - $('.goodsDiscount .first-item span').addClass('icon-up');  
41 - $('.goodsDiscount .first-item span').html(''); 39 + $('.goodsDiscount .first-item span').removeClass('icon-down').addClass('icon-up').html('');
42 $('.goodsDiscount .discount-folder').slideDown(); 40 $('.goodsDiscount .discount-folder').slideDown();
43 } else { 41 } else {
44 - $('.goodsDiscount .first-item span').removeClass('icon-up');  
45 - $('.goodsDiscount .first-item span').addClass('icon-down');  
46 - $('.goodsDiscount .first-item span').html(''); 42 + $('.goodsDiscount .first-item span').removeClass('icon-up').addClass('icon-down').html('');
47 $('.goodsDiscount .discount-folder').slideUp(); 43 $('.goodsDiscount .discount-folder').slideUp();
48 } 44 }
49 }); 45 });
@@ -18,11 +18,7 @@ likeHammer.on('tap', function(e) { @@ -18,11 +18,7 @@ likeHammer.on('tap', function(e) {
18 var opt, 18 var opt,
19 favorite; 19 favorite;
20 20
21 -<<<<<<< HEAD  
22 var $this = $(e.target); 21 var $this = $(e.target);
23 -=======  
24 - var $this = $(this);  
25 ->>>>>>> 3685878e28b5f0a7fbf2ebdb250a96a5ecc47f52  
26 22
27 if ($this.hasClass('liked')) { 23 if ($this.hasClass('liked')) {
28 opt = 'cancel'; 24 opt = 'cancel';