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

pages/AggregateOrders/components/orders.vue

@@ -127,6 +127,7 @@
 					ErpOrderId: item.erpOrderId, //这是第三方订单表的Id
 					OrderTypeStr: "Hotel", //订单类型为酒店
 					ConfirmID: "",
+					Amount:0,
 				};
 				wx.showModal({
 					title: '提示',
@@ -148,6 +149,7 @@
 											var tempData = res.data;
 											if (tempData) {
 												cancelMsg.ConfirmID = tempData.ConfirmID;
+												cancelMsg.Amount=tempData.Amount;
 												//有取消费用
 												if (tempData.Amount && tempData.Amount > 0) {
 													var tipmsg = "取消订单将收取【" + tempData.Amount +

pages/hotel/orderdetails.vue

@@ -103,7 +103,7 @@
 					<view class="ResInforR">
 						<text v-if="roomRateDetails&&
                     roomRateDetails.CancellationPolicyList &&
-                    roomRateDetails.CancellationPolicyList.length > 0">
+                    roomRateDetails.CancellationPolicyList.length > 0" style="color: #ff3166;">
 							<template v-for="(itemCancella, index1) in roomRateDetails.CancellationPolicyList">
 								<template
 									v-if="index1==0">{{ getformatDateStr(itemCancella.FromDate) }}之前免费取消</template>
@@ -355,6 +355,7 @@
 					ErpOrderId: this.orderData.model.OrderID,
 					OrderTypeStr: "Hotel", //订单类型为酒店
 					ConfirmID: "",
+					Amount:0,
 				};
 				wx.showModal({
 					title: '提示',
@@ -376,6 +377,7 @@
 											var tempData = res.data;
 											if (tempData) {
 												cancelMsg.ConfirmID = tempData.ConfirmID;
+												cancelMsg.Amount=tempData.Amount;
 												//有取消费用
 												if (tempData.Amount && tempData.Amount > 0) {
 													var tipmsg = "取消订单将收取【" + tempData.Amount +