11

pages/AggregateOrders/components/orders.vue

@@ -213,7 +213,8 @@
 				if (item.goodsType > 0 && item.goodsType < 4) url = `jiuzhai/jz_SureOrder?` //线路
 				else if (item.goodsType > 3 && item.goodsType < 8) { //景点门票
 				} else if (item.goodsType > 7 && item.goodsType < 12) { //酒店住宿
-					url = `hotel/orderdetails?orderId=` + item.erpOrderId;
+					msg = `orderId=` + item.erpOrderId
+					url = `hotel/orderdetails?`;
 				} else if (item.goodsType > 11 && item.goodsType < 15) { //目的地用车
 				} else if (item.goodsType == 15) url = `visa/visa_SureOrder?` //签证  
 				else if (item.goodsType == 16) url = `airTicket/airTicketOrderDetail?` //机票
@@ -224,7 +225,7 @@
 				else if (item.goodsType == 4) { //景点门票
 				} else if (item.goodsType == 3) { //酒店住宿
 
-				} else if (item.goodsType==7) { //酒店住宿
+				} else if (item.goodsType == 7) { //酒店住宿
 					url = `hotel/orderdetails?`;
 				} else if (item.goodsType == 5) { //目的地用车
 				} else if (item.goodsType == 6) url = `visa/visa_SureOrder?` //签证  

pages/hotel/orderdetails.vue

@@ -34,8 +34,10 @@
 							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)}}
+								{{ 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>
 					<view class="orderIforRzNum">
 						{{getDay(orderData.parmResultRoomInfo.CheckInDate.slice(0, 10),orderData.parmResultRoomInfo.CheckOutDate.slice(0, 10))}}晚
@@ -49,7 +51,7 @@
 								src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638766148323678002.png" />
 						</view>
 						<view class="orderIforDiZhiRText">
-							酒店地址
+							{{orderData.Address}}
 						</view>
 					</view>
 				</view>
@@ -128,7 +130,8 @@
 				<view class="ResInforText row-sb-n">
 					<view class="ResInforL Lwidth">联系姓名</view>
 					<view class="ResInforR">
-						{{ orderData.parmResultRoomInfo.SurName }}{{ orderData.parmResultRoomInfo.Name }}</view>
+						{{ orderData.parmResultRoomInfo.SurName }}{{ orderData.parmResultRoomInfo.Name }}
+					</view>
 				</view>
 				<view class="ResInforText row-sb-n">
 					<view class="ResInforL Lwidth">联系电话</view>
@@ -191,16 +194,7 @@
 
 			<view style="height: 36rpx;"></view>
 		</scroll-view>
-		<!-- <view class="opera-box">
-        <view class="box flex">
-            <view class="price">
-                <text class="f11">￥</text>
-                <text> 11111</text>
-            </view>
-            <view class="sum-detail">共计 222间房</view>
-            <u-button :ripple="true" :hair-line="false" :custom-style="btnStyle" @click="buyRoom">立即购买</u-button>
-        </view>
-      </view> -->
+
 		<view class="jz_orderbox flex" v-if="showPayBtn">
 			<view style="display: flex">
 				<!-- #ifdef MP-DI -->
@@ -285,7 +279,6 @@
 				0;
 		},
 		onLoad(options) {
-			console.log("options", options);
 			this.id = options.orderId;
 			let that = this;
 			uni.getSystemInfo({
@@ -305,10 +298,14 @@
 			submitGetCodeByOrderNo() {
 				if (this.submit || this.submitCancel) return;
 				this.submit = true
-				this.apipost("GetCodeByOrderNo_post", {
-					OrderNo: this.OrderNo,
+				var payMsg = {
+					OrderNo: "",
 					MallBaseId: uni.getStorageSync("mall_UserInfo").MallBaseId
-				}, (res) => {
+				}
+				if (this.orderData && this.orderData.directOrder && this.orderData.directOrder.OrderNo) {
+					payMsg.OrderNo = this.orderData.directOrder.OrderNo;
+				}
+				this.apipost("GetCodeByOrderNo_post", payMsg, (res) => {
 					if (res.resultCode == 1) {
 						this.orderInfo = JSON.parse(res.data.sPayInfo)
 						this.goPayHandler();
@@ -344,7 +341,6 @@
 							});
 							this.getOrderDetail(this.id)
 						}
-
 					},
 					(err) => {
 						uni.showToast({
@@ -355,48 +351,6 @@
 					}
 				);
 			},
-			//立即购买
-			buyRoom() {
-				let that = this;
-				if (that.orderMsg.Consignee == '') {
-					this.$refs.uToast.show({
-						title: '请输入住客姓名！',
-						type: 'warning'
-					});
-					return;
-				}
-				if (that.orderMsg.ConsigneeMobile == '') {
-					this.$refs.uToast.show({
-						title: '请输入联系电话！',
-						type: 'warning'
-					});
-					return;
-				}
-				var tempObj = uni.getStorageSync('basedata').mall.wechatmessage;
-				var tmplIds = [];
-				if (tempObj && tempObj.length > 0) {
-					tempObj.forEach(x => {
-						if (x.Name == '下单成功提醒' || x.Name == '订单取消提醒' || x.Name == '订单确认通知') {
-							tmplIds.push(x.MessageId)
-						}
-					})
-				}
-				uni.requestSubscribeMessage({
-					tmplIds: tmplIds,
-					complete(res) {
-						that.request2({
-								url: '/api/Hotel/SetAppletHotelOrder',
-								data: that.orderMsg
-							},
-							res => {
-								if (res.resultCode == 1) {
-									that.queren(res.data)
-								}
-							}
-						);
-					}
-				})
-			},
 			formatStatus(status) {
 				// #ifdef MP-DI
 				if (status == 4) {
@@ -457,7 +411,6 @@
 					delta: 1,
 				});
 			},
-
 			//获取酒店详情
 			getOrderDetail(id) {
 				uni.showLoading({
@@ -465,8 +418,6 @@
 				});
 				let msg = {
 					orderId: id,
-					// StartDate: this.dayObj.start,
-					// EndDate: this.dayObj.end,
 				};
 				this.apipost("dmc_post_Get_GetJAPAN_OrderDetail", msg,
 					(res) => {
@@ -482,10 +433,7 @@
 									this.peopleNum++
 								})
 							})
-							// this.orderData = res.data.BookingDetailsList[0]
-							// this.hotelData = res.data.BookingDetailsList[0].Hotel;
 							this.formatStatus(res.data.model.OrderStatus);
-							console.log(res, '订单详情数据');
 						}
 					}, err => {
 						uni.hideLoading();