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

pages/hotel/orderdetails.vue

@@ -68,7 +68,8 @@
 			</view>
 			<view class="ReservationInforBox">
 				<view class="ReservationInforTitle">预定信息</view>
-				<view class="ResInforText row-sb-n" v-if="orderData.model&&orderData.model.ThirdOrderNo!=''&&orderData.model.OrderStatus==5">
+				<view class="ResInforText row-sb-n"
+					v-if="orderData.model&&orderData.model.ThirdOrderNo!=''&&orderData.model.OrderStatus==5">
 					<view class="ResInforL">订单号</view>
 					<view class="ResInforR" style="color: #ff3166;">
 						{{orderData.model.ThirdOrderNo}}
@@ -106,7 +107,7 @@
                     roomRateDetails.CancellationPolicyList.length > 0" style="color: #ff3166;">
 							<template v-for="(itemCancella, index1) in roomRateDetails.CancellationPolicyList">
 								<template
-									v-if="index1==0">{{ getformatDateStr(itemCancella.FromDate) }}之前免费取消</template>
+									v-if="index1==0">{{ getformatDateStr(itemCancella.FromDate) }}之前免费取消,</template>
 								<template v-if="itemCancella.Amount==roomRateDetails.TotalPrice">
 									<template>{{ getformatDateStr(itemCancella.FromDate) }}起不可取消，取消将收取订单全额费用;</template>
 								</template>
@@ -121,6 +122,15 @@
 						</text>
 					</view>
 				</view>
+				<view class="ResInforText row-sb-n"
+					v-if="orderData&&orderData.model&&orderData.model.ThirdOrderStatus==3">
+					<view class="ResInforL">退款信息</view>
+					<view class="ResInforR">
+						<text style="color: #ff3166;">
+							取消手续费{{orderData.model.CancelFee}}元，实际退款金额{{orderData.model.CancelPrice}}元.
+						</text>
+					</view>
+				</view>
 			</view>
 			<view class="ReservationInforBox">
 				<view class="ReservationInforTitle">订房信息</view>
@@ -355,7 +365,7 @@
 					ErpOrderId: this.orderData.model.OrderID,
 					OrderTypeStr: "Hotel", //订单类型为酒店
 					ConfirmID: "",
-					Amount:0,
+					Amount: 0,
 				};
 				wx.showModal({
 					title: '提示',
@@ -377,7 +387,7 @@
 											var tempData = res.data;
 											if (tempData) {
 												cancelMsg.ConfirmID = tempData.ConfirmID;
-												cancelMsg.Amount=tempData.Amount;
+												cancelMsg.Amount = tempData.Amount;
 												//有取消费用
 												if (tempData.Amount && tempData.Amount > 0) {
 													var tipmsg = "取消订单将收取【" + tempData.Amount +
@@ -433,22 +443,24 @@
 					}
 				);
 			},
-			formatStatus(status) {
+			formatStatus(directOrder) {
+				var status = directOrder.OrderStatus;
+				console.log("formatStatus", status)
 				if (status == 1) {
 					this.orderStatus.code = 0;
 					this.orderStatus.text = "待付款";
 				} else if (status == 2) {
 					this.orderStatus.code = 1;
-					this.orderStatus.text = "已取消";
+					this.orderStatus.text = directOrder.ThirdOrderExtStatusStr;
 				} else if (status == 3) {
 					this.orderStatus.code = 0;
-					this.orderStatus.text = "退款中";
+					this.orderStatus.text = "已完成";
 				} else if (status == 4) {
 					this.orderStatus.code = -1;
-					this.orderStatus.text = "已退款";
+					this.orderStatus.text = "已取消";
 				} else if (status == 5) {
 					this.orderStatus.code = 0;
-					this.orderStatus.text = "正常";
+					this.orderStatus.text = "售后";
 				}
 			},
 			scroll(e) {
@@ -494,7 +506,7 @@
 									this.peopleNum++
 								})
 							})
-							this.formatStatus(res.data.model.OrderStatus);
+							this.formatStatus(res.data.directOrder);
 						}
 					}, err => {
 						uni.hideLoading();
@@ -551,6 +563,7 @@
 							if (tempData && tempData.PriceDetails && tempData.PriceDetails.HotelList && tempData
 								.PriceDetails.HotelList.length > 0) {
 								this.RatePlanList = tempData.PriceDetails.HotelList[0].RatePlanList;
+								this.roomRateDetails = tempData.PriceDetails.HotelList[0];
 							}
 						}
 					}, failed => {