|
|
|
@ -115,7 +115,7 @@ Page({ |
|
|
|
icon: 'none' |
|
|
|
}) |
|
|
|
} |
|
|
|
if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) { |
|
|
|
if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag) { |
|
|
|
this.couponCom.setNullCoupon() |
|
|
|
} |
|
|
|
app.globalData.couponInfo = null; |
|
|
|
@ -251,7 +251,8 @@ Page({ |
|
|
|
} |
|
|
|
app.globalData.list[app.globalData.index] = this.data.product |
|
|
|
app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100; |
|
|
|
if(app.globalData.list.length > app.globalData.index + 1){ |
|
|
|
console.log(app.globalData.list,app.globalData.list.length) |
|
|
|
if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1){ |
|
|
|
if(app.globalData.createDate){ |
|
|
|
app.globalData.createDate.product_list.push(data.product_list[0]) |
|
|
|
}else{ |
|
|
|
@ -265,7 +266,7 @@ Page({ |
|
|
|
return |
|
|
|
}else{ |
|
|
|
console.log(app.globalData.list.length,app.globalData.postProduct) |
|
|
|
if(app.globalData.list.length > 1 || app.globalData.postProduct.length>0){ |
|
|
|
if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){ |
|
|
|
if(app.globalData.createDate){ |
|
|
|
app.globalData.createDate.product_list.push(data.product_list[0]) |
|
|
|
} |
|
|
|
|