diff --git a/app.js b/app.js index 3bc4f3a..ae5b71b 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.isTest136? true : false; + data.isTest = data.isTest137? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index 047dcba..058a4f4 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -225,8 +225,10 @@ Page({ }, // 获取日期 changeDate: function (e) { + console.log(e); this.setData({ - date: e.detail + date: e.detail, + showPrice:e.detail.price }) console.log(this.data.date); }, diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index d5f0efc..86b2b38 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -87,7 +87,8 @@ Page({ } this.setData({ product: app.globalData.product, - singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price + singlePrice: app.globalData.product?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price) + // singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price }) console.log(this.data.singlePrice); this.showAllPrice()