diff --git a/app.js b/app.js index 8619030..a5fb48f 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.isTest84? true : false; + data.isTest = data.isTest85? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/info/groupOrderInfo/index.wxml b/pages/info/groupOrderInfo/index.wxml index d76bc7e..6491d0a 100644 --- a/pages/info/groupOrderInfo/index.wxml +++ b/pages/info/groupOrderInfo/index.wxml @@ -1,29 +1,27 @@ - - {{info.list.state_text}} - {{info.list.team_name}} + + {{info.list.team_name}} + + 成功预约人数 + {{info.list.members_count}} + 场馆名称:{{info.list.scene.title}} 预约时间:{{info.list.order_info.product_list[0].start_time}} ~ {{info.list.order_info.product_list[0].end_time}} - + 预约人数:{{info.list.member_num}} 填写信息人数:{{info.list.members_count}} - - 提交订单 - 组团中({{restTime}}) - - - {{info.list.state_text}} - 成功预约人数 - {{info.list.members_count}} + + 提交订单 + {{info.list.state_text}} {{(restTime)}} - 倒计时结束后订单将自动提交至后台,订单提交后团员信息将无法修改 + 倒计时结束后订单将自动提交至后台,订单提交后团员信息将无法修改 已填写信息团员 预约成功团员 diff --git a/pages/info/groupOrderInfo/index.wxss b/pages/info/groupOrderInfo/index.wxss index 13d8fb0..d93f1d9 100644 --- a/pages/info/groupOrderInfo/index.wxss +++ b/pages/info/groupOrderInfo/index.wxss @@ -15,8 +15,6 @@ page { .code { color: #0B898E; font-size: 40rpx; - font-weight: bold; - line-height: 100rpx; } .top-tips { display: flex; @@ -128,14 +126,14 @@ page { .count-down { position: absolute; left: 50%; - line-height: 40rpx; + line-height: 50rpx; background: #0B898E; border-radius: 0px 0px 20rpx 20rpx; text-align: center; color: #fff; - font-size: 26rpx; - width: 300rpx; - margin-left: -150rpx; + font-size: 32rpx; + width: 320rpx; + margin-left: -160rpx; top: 0; } .top-new-tips { diff --git a/pages/order/card/index.js b/pages/order/card/index.js index d46a8ce..daa974d 100644 --- a/pages/order/card/index.js +++ b/pages/order/card/index.js @@ -90,7 +90,7 @@ Page({ add:function(){ if(this.data.product.sku.sku_model.traveller_limit_num!=0 && this.data.productNum==this.data.product.sku.sku_model.traveller_limit_num){ wx.showToast({ - title: '出行人限购'+this.data.product.sku.sku_model.traveller_limit_num+"份", + title: '本产品单笔限购'+this.data.product.sku.sku_model.traveller_limit_num+"份", icon:'none' }) return; diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js index 57ad8ab..980d2a3 100644 --- a/pages/order/components/contact/index.js +++ b/pages/order/components/contact/index.js @@ -253,7 +253,7 @@ Component({ } else if(item.selected!=1 && traveller_limit_num!=0 && num>=traveller_limit_num && traveller_limit_num!=-1){ wx.showToast({ - title: '出行人限购'+traveller_limit_num+"份", + title: '本产品单笔限购'+traveller_limit_num+"份", icon:'none' }) return; diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml index b390736..aa27875 100644 --- a/pages/order/components/date/index.wxml +++ b/pages/order/components/date/index.wxml @@ -4,7 +4,7 @@ {{item.date}} - 不开放 + 不可定 {{item.price==0 || kjIdCom?'免费':('¥'+item.price/100)}} {{item.tipText?item.tipText:'售罄'}} @@ -18,7 +18,7 @@ - {{item.start_time}}-{{item.end_time}} 有票 售罄不开放({{'余票'+item.stock_number}}) + {{item.start_time}}-{{item.end_time}} 有票 售罄不可定({{'余票'+item.stock_number}})