diff --git a/app.js b/app.js index dcb19b7..8daa8ad 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest147? true : false; + data.isTest = data.isTest148? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 0592d57..31de4f4 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -94,8 +94,8 @@ Page({ // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price }) console.log(this.data.singlePrice); - this.showAllPrice() this.getNewCoupon() + // this.showAllPrice() // console.log('********',this.data.product); if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') { this.couponCom = this.selectAllComponents("#coupon")[0]; @@ -167,8 +167,8 @@ Page({ // console.log(this.data.singlePrice); }else { let price - if (this.data.coupon) { - if (this.data.coupon.discount_type == 'pricebreak') { + if (this.data.coupon) { + if (this.data.coupon.activity.discount_type == 'pricebreak') { price = this.data.singlePrice * this.data.productNum - this.data.coupon.activity.money } else { price =(this.data.singlePrice * this.data.productNum * this.data.coupon.activity.fold)/ 10