修复酒店

pages/AggregateOrders/AggregateOrdersList.vue

@@ -58,7 +58,9 @@
 <template>
 	<view class="AggOrdBox column">
 		<view class="AggOrdHeader" :style="[titleStyle]">
-			<AggOrdHeader :title="pageTitle" @change="getOrderType" :params="msg"></AggOrdHeader>
+			<AggOrdHeader :title="pageTitle" 
+			@getTitle="(title)=>pageTitle=title"
+			@change="getOrderType" :params="msg"></AggOrdHeader>
 			<view class="AggOrdStatus row items-center">
 				<template>
 					<view class="AggOrdT" v-for="(item,index) in statusList" :key="index"
@@ -124,11 +126,10 @@
 		},
 		onLoad(options) {
 			if (options.OrderTypeStr) this.msg.OrderTypeStr = options.OrderTypeStr
-			else this.research()
 			if (options.OrderStatus) this.msg.OrderStatus = options.OrderStatus
 		},
 		onShow() {
-			
+			this.research()
 		},
 		created() {
 			const that = this

pages/AggregateOrders/components/header.vue

@@ -94,7 +94,7 @@
 			// #ifdef MP-DI
 			if (this.params.OrderTypeStr) {
 				let item = this.orderTypeList.find(x => x.Id == this.params.OrderTypeStr)
-				this.$emit('change', item)
+				this.$emit('getTitle', item.Name)
 			}
 			// #endif
 		},
@@ -134,7 +134,7 @@
 						setTimeout(() => {
 							if (this.params.OrderTypeStr) {
 								let item = this.orderTypeList.find(x => x.Id == this.params.OrderTypeStr)
-								this.$emit('change', item)
+								this.$emit('getTitle', item.Name)
 							}
 						}, 200)
 					}

pages/hotel/orderdetails.vue

@@ -34,10 +34,12 @@
 							src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638766174213789755.png" />
 					</view>
 					<view class="orderIforRzTime column col">
-						<view>入住：<text>{{getDate(orderData.parmResultRoomInfo.CheckInDate)}}
-								{{ getWeek(orderData.parmResultRoomInfo.CheckInDate) }} 14:00后</text></view>
-						<view style="margin-top: 28rpx;">离店：<text>{{getDate(orderData.parmResultRoomInfo.CheckOutDate)}}
-								{{ getWeek(orderData.parmResultRoomInfo.CheckOutDate) }} 12:00前</text></view>
+						<view>入住：
+							<text>{{getDate(orderData.parmResultRoomInfo.CheckInDate)}}&nbsp;{{ getWeek(orderData.parmResultRoomInfo.CheckInDate) }}&nbsp;14:00后</text>
+						</view>
+						<view style="margin-top: 28rpx;">离店：
+							<text>{{getDate(orderData.parmResultRoomInfo.CheckOutDate)}}&nbsp;{{ getWeek(orderData.parmResultRoomInfo.CheckOutDate) }}&nbsp;12:00前</text>
+						</view>
 					</view>
 					<view class="orderIforRzNum">
 						{{getDay(orderData.parmResultRoomInfo.CheckInDate.slice(0, 10),orderData.parmResultRoomInfo.CheckOutDate.slice(0, 10))}}晚
@@ -99,7 +101,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="ResInforText row-sb-n">
+				<view class="ResInforText row">
 					<view class="ResInforL">取消政策</view>
 					<view class="ResInforR">
 						<text v-if="roomRateDetails&&
@@ -120,6 +122,7 @@
 								</template>
 							</template>
 						</text>
+						<view style="color: #ff3166;">退款金额请以实际为准</view>
 					</view>
 				</view>
 				<view class="ResInforText row-sb-n"
@@ -359,7 +362,6 @@
 			cancelHotelOrder() {
 				var that = this;
 				if (this.submitCancel) return
-				this.submitCancel = true;
 				let cancelMsg = {
 					OrderNo: this.orderData.directOrder.OrderNo,
 					ErpOrderId: this.orderData.model.OrderID,
@@ -390,8 +392,7 @@
 												cancelMsg.Amount = tempData.Amount;
 												//有取消费用
 												if (tempData.Amount && tempData.Amount > 0) {
-													var tipmsg = "取消订单将收取【" + tempData.Amount +
-														"】取消费用，是否确认取消订单?"
+													var tipmsg = `取消订单将收取【 ${tempData.Amount} 元】手续费，是否确认取消订单?`
 													wx.showModal({
 														title: '提示',
 														content: tipmsg,