Authored by biao

resolve conflict

... ... @@ -75,7 +75,9 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
}, function() {
tip.show('网络异常');
});
}).on('touchstart', '.icon-del', function(e) {
});
$('.icon-del').on('touchstart', function(e) {
var $this = $(this);
e.stopPropagation();
... ... @@ -112,6 +114,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
}
}, function() {
tip.show('网络异常');
window.location.reload();
});
});
});
... ...
... ... @@ -33,6 +33,11 @@
text-align: center;
top: 72%;
color: #fff;
span {
display: inline-block;
@include transform(scale(0.833));
}
}
.gift-tag {
... ...
... ... @@ -13,10 +13,10 @@
<img class="thumb lazy" data-original="{{thumb}}">
</a>
{{#if isAdvanceBuy}}
<p class="few-tag plus-tag">加价购</p>
<p class="few-tag plus-tag"><span>加价购</span></p>
{{/if}}
{{#if isGift}}
<p class="few-tag gift-tag">赠品</p>
<p class="few-tag gift-tag"><span>赠品</span></p>
{{/if}}
<div class="deps show">
... ...