diff --git a/app.js b/app.js index c82fe4a..7f6a07b 100644 --- a/app.js +++ b/app.js @@ -39,7 +39,7 @@ App({ // 获取前端配置文件 commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest166? true : false; + data.isTest = data.isTest167? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml index eb46ae1..2d6abcd 100644 --- a/pages/user/order/list.wxml +++ b/pages/user/order/list.wxml @@ -8,7 +8,7 @@ 全部 - + 抢票中 待付款 待确认 待发货 diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 5354b6b..9a51d97 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -6,9 +6,9 @@ {{info.state_text}} - - - 查看进度 > + + + 查看进度 > @@ -16,7 +16,7 @@ - + 我们将于{{info.reservation_date}} 00:00为您预约抢票,最晚在{{info.reservation_date}} 09:30前告知抢票结果,请您耐心等待 diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss index 4f45a57..4f47f0b 100644 --- a/pages/user/order/sceneOrderInfo/index.wxss +++ b/pages/user/order/sceneOrderInfo/index.wxss @@ -30,6 +30,7 @@ page { font-weight: 500; font-size: 24rpx; color: #FFFFFF; + margin-left: 20rpx; } .state-texts { display: flex; @@ -436,6 +437,7 @@ page { border-radius: 24rpx 24rpx 0 0; display: flex; flex-direction: column; + overflow: hidden; /* animation: slideUp 0.3s ease-out; */ padding-bottom: env(safe-area-inset-bottom); /* 适配iPhone底部黑条 */ } @@ -475,7 +477,8 @@ page { /* --- 内容区 --- */ .progress-content { flex: 1; - height: 0; + height: 100%; + overflow-y: hidden; } .content-padding {