聚合订单

components/cancelPrompt/cancelProgress.vue

@@ -155,14 +155,13 @@
                     <Text>按旅游费用总额的60%</Text>
                 </view>
             </view>
-            <view class="vip-box">
+            <view class="vip-box" v-if="order.OrderStatus==5">
                 <view class="vip-title">进度</view>
-                <template v-if="vipInfo && vipInfo.FinishOrderCount<vipInfo.OrderCount">
 				<view class="vip-box-unactive row">
 					<view class="col">
 						<view class="step-box row items-center">
-                                <view class="line" :style="{width:`${(vipInfo.FinishOrderCount/vipInfo.OrderCount)*100}%`}"></view>
-                                <view class="step-item" :class="{'active':x<vipInfo.FinishOrderCount}" v-for="x in vipInfo.OrderCount">
+							<view class="line" :style="{width:`${(datas.AfterSalesOrderStatus/vipInfo.OrderCount)*100}%`}"></view>
+							<view class="step-item" :class="{'active':datas.AfterSalesOrderStatus==x+1}" v-for="x in vipInfo.OrderCount">
 								{{x+1}}
 								<text v-if="x==0">等待审批</text>
 								<text v-if="x==1">汇款中</text>
@@ -171,7 +170,6 @@
 						</view>
 					</view>
 				</view>
-                </template>
             </view>
         </view>
     </view>

pages/jiuzhai/jz_SureOrder.vue

@@ -445,7 +445,7 @@
 			</view>
 		</view>
 		<view class="empty-block"></view>
-		<cancelProgress :datas="orderData"></cancelProgress>
+		<cancelProgress v-if="orderData.OrderStatus==2||orderData.OrderStatus==5" :datas="orderData"></cancelProgress>
 		<view class="empty-block"></view>
 		<view style="padding: 50rpx 40rpx">
 			<view class="big-title">

pages/visa/visa_SureOrder.vue

@@ -456,7 +456,7 @@
 			</view>
 		</view>
 		<view class="empty-block"></view>
-		<cancelProgress :datas="orderData"></cancelProgress>
+		<cancelProgress v-if="orderData.OrderStatus==1||orderData.OrderStatus==2" :datas="orderData"></cancelProgress>
 		<view class="empty-block"></view>
 		<view style="padding: 50rpx 40rpx" v-if="orderData.OrderModel">
 			<view class="big-title">