聚合订单

components/cancelPrompt/cancelProgress.vue

@@ -161,7 +161,7 @@
                         <view class="col">
                             <view class="step-box row items-center">
                                 <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">
+                                <view class="step-item" :class="{'active':datas.AfterSalesOrderStatus>x}" v-for="x in vipInfo.OrderCount">
                                     {{x+1}}
                                     <text v-if="x==0">等待审批</text>
                                     <text v-if="x==1">汇款中</text>

pages/airTicket/airTicketOrderDetail.vue

@@ -6,15 +6,18 @@
 					<view class="title row items-center">
 						<!-- #ifdef MP-DI -->
 							<u-icon v-if="order.OrderStatus==1" name='clock' custom-prefix="tffont" size="44"></u-icon>
-							<u-icon v-if="order.OrderStatus==2||order.OrderStatus==3||order.OrderStatus==5" name='checkmark' custom-prefix="tffont" size="44"></u-icon>
+							<u-icon v-if="order.OrderStatus==2||order.OrderStatus==3" name='checkmark' custom-prefix="tffont" size="44"></u-icon>
+							<u-icon v-if="order.OrderStatus==5&&order.AfterSalesOrderStatus==2" customPrefix="iconfont" name="icondaizhifu-" size="52" color="#DFBE6E"></u-icon>
 							<u-icon v-if="order.OrderStatus==4" name='close-circle-o' custom-prefix="tffont" size="44"></u-icon>
+							<u-icon v-if="order.OrderStatus==5&&order.AfterSalesOrderStatus==1" customPrefix="iconfont" name="iconshenhezhong" size="52" color="#86d9a5"></u-icon>
 							<text class="q-ml-sm col bold">
 								<template v-if="order.OrderStatus<5">
 									{{(order.OrderStatus==1?'待支付':(order.OrderStatus==2?'待出行':order.OrderStatus==4?'已取消':order.OrderStatus==3?'已完成':order.OrderStatus==5?'售后':''))}}
 								</template>
 								<template v-else>
-									<template v-if="order.AfterSalesOrderStatus<3">退款中</template>
-									<template v-if="order.AfterSalesOrderStatus==3">已原路退回</template>
+									<template v-if="order.AfterSalesOrderStatus==1">等待审批</template>
+									<template v-if="order.AfterSalesOrderStatus==2">汇款中</template>
+									<template v-if="order.AfterSalesOrderStatus==3">完成</template>
 								</template>
 							</text>
 							<!-- <u-count-down :timestamp="endts" v-if="order.OrderStatus==1" color="#ffffffdd" separator-color="#ffffffdd" :show-days="false" bg-color="transparent"></u-count-down> -->
@@ -227,8 +230,9 @@
 				<view style=" display: flex;justify-content: space-between;">
 					<view class="text-center cities-name" @click="goCancelZK" v-if="order.OrderStatus==1||order.OrderStatus==2" style="background-color: #fff;border: 1px solid #1d1d20;flex:1; border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#333">取消订单</view>
 					<view class="text-center cities-name" @click="submitGetCodeByOrderNo" v-if="order.OrderStatus==1" style="background-color: #1d1d20;flex:1;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4;margin-left: 20rpx;">立即支付</view>
+					
 				</view>
-				<view class="text-center cities-name" @click="requeryHandle" v-if="order.OrderStatus!=1" style="background-color: #1d1d20;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4">再次预定</view>
+				<view class="text-center cities-name" @click="requeryHandle" v-if="order.OrderStatus!=1&&order.OrderStatus!=2" style="background-color: #1d1d20;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4">再次预定</view>
 			<!-- #endif -->
 			<!-- #ifdef MP-AG -->
 				<view class="text-center cities-name" @click="cancelVisible=true" v-if="order.status==0" style="background-color: #1d1d20;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4">取消订单</view>
@@ -462,7 +466,7 @@
 						this.OrderNo = res.data.OrderNo
 						this.id = res.data.ErpOrderId
 						this.order = {
-							OrderStatus:res.data.OrderStatus
+							...res.data
 						}
 						this.getOrderDetailHandle()
 					}else{

pages/jiuzhai/jz_SureOrder.vue

@@ -921,9 +921,13 @@
 						this.orderStatus.code = -1;
 						this.orderStatus.text = "已取消";
 						this.showPayBtn = false;	
-					}else if(status==5&&this.orderData.AfterSalesOrderStatus<3){
+					}else if(status==5&&this.orderData.AfterSalesOrderStatus==1){
+						this.orderStatus.code = -2;
+						this.orderStatus.text = "等待审批";
+						this.showPayBtn = false;	
+					}else if(status==5&&this.orderData.AfterSalesOrderStatus==2){
 						this.orderStatus.code = 0;
-						this.orderStatus.text = "待退款";
+						this.orderStatus.text = "汇款中";
 						this.showPayBtn = false;	
 					}else if(status==5&&this.orderData.AfterSalesOrderStatus==3){
 						this.orderStatus.code = -1;

pages/visa/visa_SureOrder.vue

@@ -870,9 +870,13 @@
 						this.orderStatus.code = -1;
 						this.orderStatus.text = "已取消";
 						this.showPayBtn = false;	
-					}else if(status==5&&this.orderData.AfterSalesOrderStatus<3){
+					}else if(status==5&&this.orderData.AfterSalesOrderStatus==1){
+						this.orderStatus.code = -2;
+						this.orderStatus.text = "等待审批";
+						this.showPayBtn = false;	
+					}else if(status==5&&this.orderData.AfterSalesOrderStatus==2){
 						this.orderStatus.code = 0;
-						this.orderStatus.text = "退款中";
+						this.orderStatus.text = "汇款中";
 						this.showPayBtn = false;	
 					}else if(status==5&&this.orderData.AfterSalesOrderStatus==3){
 						this.orderStatus.code = -1;