提前订

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(() => {

pages/user/order/list.wxml

@@ -8,7 +8,7 @@
   </view>
   <view class="types">
     <view class="type-item{{type?'':' active'}}" bindtap="changeType" data-type="">全部</view>
-	<!-- <view class="type-item{{type=='RESERVATION'?' active':''}}" bindtap="changeType" data-type="RESERVATION">抢票中</view> -->
+	<view class="type-item{{type=='RESERVATION'?' active':''}}" bindtap="changeType" data-type="RESERVATION">抢票中</view>
     <view class="type-item{{type=='WAIT_PAYMENT'?' active':''}}" bindtap="changeType" data-type="WAIT_PAYMENT">待付款</view>
     <view class="type-item{{type=='WAIT_CONFIRM'?' active':''}}" bindtap="changeType" data-type="WAIT_CONFIRM">待确认</view>
     <view class="type-item{{type=='WAIT_POST'?' active':''}}" bindtap="changeType" data-type="WAIT_POST">待发货</view>

pages/user/order/sceneOrderInfo/index.wxml

@@ -6,9 +6,9 @@
 <view class="state-text" wx:if="{{info}}">
     <view class="state-texts">
 		{{info.state_text}}
-		<block wx-if="{{info.order_type == 'reservation' || info.order_type == 'reserve'}}">
+		<block>
-		    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/order/loading.gif"></image>
+		    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/order/loading.gif" wx-if="{{(info.order_type == 'reservation' || info.order_type == 'reserve') && info.reservation_date}}"></image>
-		    <view class="progress-box" catchtap="openProgressPopup">查看进度 ></view>
+		    <view class="progress-box" catchtap="openProgressPopup" wx-if="{{info.order_type == 'reservation' || info.order_type == 'reserve'}}">查看进度 ></view>
 		</block>
 	</view>
     <navigator url="/pages/user/service/index" class="kefu-img">
@@ -16,7 +16,7 @@
     </navigator>
 </view>
 <view class="order-text" wx-if="{{info.order_type == 'reservation' || info.order_type == 'reserve'}}">
-	<view wx-if="{{info.order_type == 'reservation'}}">
+	<view wx-if="{{(info.order_type == 'reservation' || info.order_type == 'reserve') && info.reservation_date}}">
 		我们将于{{info.reservation_date}} 00:00为您预约抢票，最晚在{{info.reservation_date}}
 		09:30前告知抢票结果，请您耐心等待
 	</view>

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 {