diff --git a/app.js b/app.js index 5322ea9..b1dbe3f 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.isTest133? true : false; + data.isTest = data.isTest134? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index e9d5b05..0fcef85 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -39,7 +39,8 @@ Page({ date: "", time: "", showDate:false, - showPrice:0 + showPrice:0, + showDate2:false }, /** @@ -759,6 +760,9 @@ Page({ }, // 选择日期 selectDate(e) { + this.setData({ + showDate: true, + }) console.log(e.currentTarget.dataset); let sku = { sku: e.currentTarget.dataset.sku @@ -775,7 +779,7 @@ Page({ console.log(app.globalData.product); this.setData({ product: product, - showDate: true, + showDate2: true, skuFlag: 'order', showPrice:e.currentTarget.dataset.sku.price }) diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index a0aafb6..f7635af 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -111,7 +111,7 @@ - + 合计: {{showPrice/100}} diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss index 878fa34..742b30c 100644 --- a/pages/info/sceneProductInfo/index.wxss +++ b/pages/info/sceneProductInfo/index.wxss @@ -888,6 +888,10 @@ page { display: flex; justify-content: space-between; align-items: center; + position: absolute; + left: 0; + right: 0; + bottom: 0; } .next { width: 250rpx; @@ -910,6 +914,7 @@ page { background: white; border-radius: 12rpx; overflow-y: auto; + height: 1100rpx; } .icon-close { position: absolute; diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 5a4e20e..d5f0efc 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -43,6 +43,7 @@ Page({ bookingInfo: null, bookingInfoTitle: "", showDate:false, + showDate2:false, }, /** @@ -275,6 +276,9 @@ Page({ }, changeDate: function (e) { console.log('打印',e); + this.setData({ + showDate:true + }) // debugger // this.showAllPrice() this.totalPrice(e.detail.price) @@ -296,7 +300,7 @@ Page({ this.setData({ date: e.detail, singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price, - showDate:true + showDate2:true }) // this.changePrice() }, diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index 9197311..5c01db0 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -135,7 +135,7 @@ - + 合计: {{price}} diff --git a/pages/order/scene/index.wxss b/pages/order/scene/index.wxss index 0cbec31..649d9ab 100644 --- a/pages/order/scene/index.wxss +++ b/pages/order/scene/index.wxss @@ -399,6 +399,7 @@ page { background: white; border-radius: 12rpx; overflow-y: auto; + height: 1100rpx; } .bottom-box { height: 133rpx; @@ -408,6 +409,10 @@ page { display: flex; justify-content: space-between; align-items: center; + position: absolute; + left: 0; + right: 0; + bottom: 0; } .totalPrice { font-family: PingFang SC;