Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

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:`${(vipInfo.progressCount/vipInfo.OrderCount)*100}%`}"></view>
+                                <view class="step-item" :class="{'active':(x+1)==datas.AfterSalesOrderStatus}" v-for="x in vipInfo.OrderCount">
                                     {{x+1}}
                                     <text v-if="x==0">等待审批</text>
                                     <text v-if="x==1">汇款中</text>
@@ -171,24 +170,37 @@
                             </view>
                         </view>
                     </view>
-                </template>
             </view>
         </view>
     </view>
 </template>
 <script>
-// import vip from './vip.vue'
 export default {
     props:['datas','type'], 
-    // components: {vip},
     data(){
 			return{
                 vipInfo:{
-					FinishOrderCount: 0.8,
+					progressCount: 3,
 					OrderCount:3
 				},
-				userVipRights:{}
             }
+    },
+	watch: {
+		datas: {
+			handler (val, oldval) {
+				if(val.OrderStatus==5){
+					if(val.AfterSalesOrderStatus==1){
+						this.vipInfo.progressCount = 0.8
+					}else if(val.AfterSalesOrderStatus==2){
+						this.vipInfo.progressCount = 2.2
+					}else if(val.AfterSalesOrderStatus==3){	
+						this.vipInfo.progressCount = 3
+					}
+				}
+				
+			},
+			deep: true,
+		},
 	},
 	created() {
 		

pages/jiuzhai/jz_SureOrder.vue

@@ -445,7 +445,7 @@
 			</view>
 		</view>
 		<view class="empty-block"></view>
-		<cancelProgress :datas="orderData"></cancelProgress>
+		<cancelProgress :datas="orderData" v-if="orderData.OrderStatus==2||orderData.OrderStatus==5"></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">