|
|
@@ -683,9 +683,13 @@
|
|
|
}
|
|
|
});
|
|
|
mui(dt.data.cartItems).each(function(index) {
|
|
|
- if(this.cartColorId == 7) {
|
|
|
+ var flag = true
|
|
|
+ if(this.productName.indexOf('【赠品】') > -1){
|
|
|
+ flag = false
|
|
|
+ }
|
|
|
+ if(this.cartColorId == 7 && flag) {
|
|
|
t1 += this.cartNum;
|
|
|
- } else if(this.cartColorId == 8) {
|
|
|
+ } else if(this.cartColorId == 8 && flag) {
|
|
|
t2 += this.cartNum;
|
|
|
} else {
|
|
|
all_t++;
|
|
|
@@ -785,7 +789,6 @@
|
|
|
var checked = '';
|
|
|
console.log(flag)
|
|
|
if((this.couponId == 10000 && flag) || this.couponId == 10002) {
|
|
|
-
|
|
|
checked = 'checked';
|
|
|
}
|
|
|
yhq_str += '<div class="mui-input-row mui-radio"><label>' + this.couponName + '</label><input name="radio1" value="' + accDiv(this.couponReduce, 100) + '" type="radio" couponid=' + this.couponId + ' id="' + this.couponItemId + '" yhq_type="' + this.couponType + '" enough="' + accDiv(this.couponConsumeEnough, 100) + '" ' + checked + '/></div>';
|
|
|
@@ -848,6 +851,7 @@
|
|
|
$("#yhq_name").html(yhq_check.prev().html());
|
|
|
$("#yhq_price").html("免费兑换1支T1或T2滤芯");
|
|
|
$("#accSub,#accSub>div:first-child").show();
|
|
|
+ $(".dhq-last-add").show();
|
|
|
console.log(yhq_val)
|
|
|
if($(".dhq-last-add").length > 0) {
|
|
|
yhq_val = 0;
|
