聚合订单

components/cancelPrompt/cancelProgress.vue

@@ -131,7 +131,7 @@
 }
 </style>
 <template>
-    <view class=""
+    <view class="" v-if="datas"
     :class="[type?'cancelProgress':'']">
         <view class="showModalCenter">
             <view class="showModalCTitle column">

pages/airTicket/airTicketOrderDetail.vue

@@ -16,7 +16,7 @@
 								</template>
 								<template v-else>
 									<template v-if="order.AfterSalesOrderStatus==1">等待审批</template>
-									<template v-if="order.AfterSalesOrderStatus==2">汇款中</template>
+									<template v-if="order.AfterSalesOrderStatus==2">退款中</template>
 									<template v-if="order.AfterSalesOrderStatus==3">完成</template>
 								</template>
 							</text>
@@ -233,27 +233,44 @@
 					
 				</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>
+				<view class="row" v-if="order.OrderStatus==2">
+					<view class="col" style="color: #9999A5;">
+						<text class="small">已支付：¥ </text>
+						<text style="font-size: 40rpx;font-weight: bold;color:#ff3166;">
+							{{order.TotalPrice-Number(order.PreferentialPrice)}}
+						</text>
+					</view>
+					<view style="font-size: 22rpx;">
+						<view class="text-right">
+							如有变更，请联系：
+						</view>
+						<view class="">
+							{{erpBaseInfo.emName}}/{{erpBaseInfo.imAccount}}
+						</view>
+					</view>
+				</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>
 				<view class="text-center cities-name" @click="requeryHandle" v-if="order.status==2" style="background-color: #1d1d20;border-radius: 10rpx;height: 80rpx; line-height: 80rpx;color:#EEF1F4">再次预定</view>
-			<!-- #endif -->
-			<view class="row" v-if="order.ResultPrice && order.status==1">
-				<view class="col" style="color: #9999A5;">
-					<text class="small">已支付：¥ </text>
-					<text style="font-size: 40rpx;font-weight: bold;color:#ff3166;">
-						{{order.ResultPrice-Number(order.DueInMoney)}}
-					</text>
-				</view>
-				<view style="font-size: 22rpx;">
-					<view class="text-right">
-						如有变更，请联系：
+				<view class="row" v-if="order.ResultPrice && order.status==1">
+					<view class="col" style="color: #9999A5;">
+						<text class="small">已支付：¥ </text>
+						<text style="font-size: 40rpx;font-weight: bold;color:#ff3166;">
+							{{order.ResultPrice-Number(order.DueInMoney)}}
+						</text>
 					</view>
-					<view class="">
-						{{order.SaleName}}/{{order.SalePhone}}
+					<view style="font-size: 22rpx;">
+						<view class="text-right">
+							如有变更，请联系：
+						</view>
+						<view class="">
+							{{order.SaleName}}/{{order.SalePhone}}
+						</view>
 					</view>
 				</view>
-			</view>
+			<!-- #endif -->
+			
 		</view>
 		<u-popup mode="bottom" border-radius="20" :popup="false" v-model="flightVisible" :maskCloseAble="true" length="auto" :safeAreaInsetBottom="true" @close="popupClose" :z-index="9999">
 			<view style="padding:30rpx;min-height: 60vh;">
@@ -346,6 +363,7 @@
 				OrderTypeStr: '',
 				OrderNo: '',
 				showModal: false,
+				erpBaseInfo: null,
 			}
 		},
 		computed:{
@@ -376,6 +394,7 @@
 			},
 		},
 		onLoad(options) {
+			this.erpBaseInfo = uni.getStorageSync("b2b_user").erpBaseInfo
 			if(options.OrderNo||(options.id&&options.OrderTypeStr)){
 				this.id = options.id
 				this.order.status = options.status?options.status:1

pages/jiuzhai/jz_SureOrder.vue

@@ -927,7 +927,7 @@
 						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;