页面修改

pages/hotel/components/hotelRoom.vue

@@ -52,26 +52,21 @@
 									<view class="column">
 										<view class="hotelDetailRPrice">
 											{{subItem.Currency }}
-											<text>
-												{{subItem.TotalPrice}}
-											</text>起/晚
+											<text v-if="subItem&&subItem.PriceList&&subItem.PriceList.length>0">
+												{{subItem.PriceList[0].Price}}
+											</text>起/晚/间
 										</view>
 										<view class="hotelDetailRPriceT">{{dayObj.day}}晚总价
 											<text>
-												{{subItem.Currency}}{{ (subItem.TotalPrice*dayObj.day).toFixed(2) }}
+												{{subItem.Currency}}{{ (subItem.TotalPrice).toFixed(2) }}起
 											</text>
 										</view>
 									</view>
-									<!--:class="[!index?'active':'']"-->
 									<view class="column hotelDetailRPriceBook">
-										<!--<text v-if="!index" class="hotelDetailMinXiRS">剩2间</text>-->
 										<view class="hotelDetailMinXiRB" @click="setOrder(subItem)">
 											订
 										</view>
 									</view>
-									<!-- <view class="hotelDetailRPriceBook" @click="setOrder(subItem)">
-										订
-									</view> -->
 								</view>
 							</view>
 						</view>
@@ -111,13 +106,13 @@
 											<view class="hotelDetailMinXiRF"> </view>
 											<view class="hotelDetailMinXiRP">
 												{{subItem.Currency }}
-												<text>
-													{{subItem.TotalPrice}}
-												</text>
+												<text v-if="subItem&&subItem.PriceList&&subItem.PriceList.length>0">
+													{{subItem.PriceList[0].Price}}
+												</text>起/晚/间
 											</view>
 											<view class="hotelDetailMinXiRT">{{dayObj.day}}晚总价
 												<text>
-													{{subItem.Currency}}{{ (subItem.TotalPrice*dayObj.day).toFixed(2) }}
+													{{subItem.Currency}}{{ (subItem.TotalPrice).toFixed(2) }}起
 												</text>
 											</view>
 										</view>
@@ -405,6 +400,9 @@
 					hotelid: this.HotelInfo.hotelid,
 					name: this.HotelInfo.name,
 					images: [],
+					address: "",
+					destination: "",
+					country: "",
 				}
 				if (this.HotelInfo) {
 					if (this.HotelInfo.images && this.HotelInfo.images.length > 0) {
@@ -412,6 +410,17 @@
 							Path: this.HotelInfo.images[0].url
 						});
 					}
+					if (this.HotelInfo.location) {
+						if (this.HotelInfo.location.address) {
+							pHotel.address = encodeURIComponent(this.HotelInfo.location.address);
+						}
+						if (this.HotelInfo.location.country && this.HotelInfo.location.country.name) {
+							pHotel.country = this.HotelInfo.location.country.name;
+						}
+						if (this.HotelInfo.location.destination && this.HotelInfo.location.destination.name) {
+							pHotel.destination = this.HotelInfo.location.destination.name;
+						}
+					}
 				}
 				uni.navigateTo({
 					url: `/pages/hotel/order?searchObj=${JSON.stringify(this.searchObj)}&HotelInfo=${JSON.stringify(pHotel)}&RoomInfo=${JSON.stringify(subItem)}&CreateBy=${createBy}`,

pages/hotel/order.vue

@@ -100,8 +100,8 @@
 								联系姓名
 							</view>
 							<view class="val row">
-								<input type="text" v-model="orderMsg.SurName" placeholder="请输入姓" />
-								<input type="text" v-model="orderMsg.Name" placeholder="请输入名" />
+								<input type="text" v-model="orderMsg.guestLastName" placeholder="请输入姓" />
+								<input type="text" v-model="orderMsg.guestFirstName" placeholder="请输入名" />
 							</view>
 						</view>
 						<view class="form-items">
@@ -146,7 +146,6 @@
 								<text class="content" style="color:grey" v-else-if="couponList.length==0">暂无优惠券</text>
 								<text class="content" v-else
 									:style="{ color: mainColor }">已优惠{{currentCoupon.discountMoney}} 元</text>
-								<!-- <u-icon name="ellipsis" size="36" v-if="couponList.length > 0"></u-icon> -->
 							</text>
 							<u-icon name="arrow" :size="32" color="#111" v-if="couponList.length>0"></u-icon>
 						</view>
@@ -166,7 +165,7 @@
 								<text style="margin-right: 5rpx;">{{orderMsg.RoomCount}}间房</text>
 								<text style="margin-right: 5rpx;">{{dayObj.day}}晚</text>
 								<text class="red">
-									{{RoomInfo.Currency}}{{(orderMsg.TotalPrice*orderMsg.RoomCount*dayObj.day).toFixed(2)}}
+									{{RoomInfo.Currency}}{{(orderMsg.TotalPrice).toFixed(2)}}
 								</text>
 							</view>
 						</view>
@@ -176,16 +175,19 @@
 							</view>
 						</view>
 
-						<view class="flex f12 grey" style="margin-bottom: 40rpx">
-							<view style="flex: 1">
-								<text style="margin-right: 30rpx">房间</text>
-							</view>
-							<view style="text-align: right">
-								{{orderMsg.RoomCount}}间×{{dayObj.day}}晚×{{RoomInfo.Currency}}
-								<!--{{ getPrice(orderMsg.TotalPrice) }}-->
-								{{ orderMsg.TotalPrice }}
-							</view>
-						</view>
+						<template
+							v-if="roomRateDetails&&roomRateDetails.RatePlanList&&roomRateDetails.RatePlanList.length>0">
+							<template v-for="subItem in roomRateDetails.RatePlanList">
+								<view class="flex f12 grey" style="margin-bottom: 40rpx">
+									<view style="flex: 1">
+										<text style="margin-right: 30rpx">房间{{subItem.RoomOccupancy.RoomNum}}</text>
+									</view>
+									<view style="text-align: right">
+										{{(subItem.PriceList.length*subItem.PriceList[0].Price).toFixed(2)}}
+									</view>
+								</view>
+							</template>
+						</template>
 						<view class="flex f12 grey" style="margin-bottom: 40rpx"
 							:style="{'color':mainColor+' !important'}" v-if="useCouponIds.length>0">
 							<view style="flex: 1">
@@ -198,8 +200,7 @@
 							<view style="flex: 1">小计</view>
 							<view>
 								{{RoomInfo.Currency}}
-								<!--{{ (getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount)-currentCoupon.discountMoney }}-->
-								{{ ((orderMsg.TotalPrice*orderMsg.RoomCount*dayObj.day)-currentCoupon.discountMoney).toFixed(2) }}
+								{{ (orderMsg.TotalPrice-currentCoupon.discountMoney).toFixed(2) }}
 							</view>
 						</view>
 					</view>
@@ -210,7 +211,7 @@
 						<text class="">购买说明</text>
 					</view>
 					<view class="rule">
-						<text class="king"> 
+						<text class="king">
 						</text>
 						<text v-if="roomRateDetails&&
 								roomRateDetails.CancellationPolicyList &&
@@ -242,9 +243,7 @@
 				<view class="price">
 					<text class="f11">{{RoomInfo.Currency}}</text>
 					<text>
-						<!--{{ (getPrice(orderMsg.TotalPrice)*orderMsg.RoomCount)-currentCoupon.discountMoney }}-->
-						<!-- {{ (orderMsg.TotalPrice*orderMsg.RoomCount)-currentCoupon.discountMoney }} -->
-						{{ ((orderMsg.TotalPrice*orderMsg.RoomCount*dayObj.day)-currentCoupon.discountMoney).toFixed(2) }}
+						{{ (orderMsg.TotalPrice-currentCoupon.discountMoney).toFixed(2) }}
 					</text>
 				</view>
 				<view class="sum-detail">共计 {{orderMsg.RoomCount}}间房</view>
@@ -259,9 +258,7 @@
 		<u-toast ref="uToast" />
 		<u-picker mode="selector" v-model="showCountry" :default-selector="[0]" :range="countrys"
 			@confirm='(e)=>{changeDown(e,CountryType)}' range-key="label" @input="showCountry=false"></u-picker>
-		<!-- <coupon v-if="couponList.length > 0 && showCoupon" :price="getPrice(orderMsg.TotalPrice)" :list="couponList"
-			:current="useCouponIds" @close="closeCouponHandler" :order="orderMsg" :numberPeople="searchObj.peoples">
-		</coupon>-->
+
 		<coupon v-if="couponList.length > 0 && showCoupon" :price="orderMsg.TotalPrice" :list="couponList"
 			:current="useCouponIds" @close="closeCouponHandler" :order="orderMsg" :numberPeople="searchObj.peoples">
 		</coupon>
@@ -306,18 +303,18 @@
 					RatePlanID: "",
 					CheckOutDate: "", //离店时间
 					RoomCount: "", //房间数量
-					guestLastName: "张", //英文姓
-					guestFirstName: "无误", //英文名
+					guestLastName: "", //英文姓
+					guestFirstName: "", //英文名
 					guestAddress: "",
-					guestPhoneNumber: "13344445555",
-					guestEmail: "123@qq.com", //Email
+					guestPhoneNumber: "",
+					guestEmail: "", //Email
 					BookingID: "",
 					HotelName: "", //酒店名称
 					HotelPic: "", //酒店封面
 					GuestList: [],
 					TotalPrice: 0, //总价
 					CustomerPayMoney: 0,
-					DiscountMoney: 0, //优惠
+					DiscountMoney: 0, //优惠金额
 					CouponAllotIds: '', //优惠券Id
 					// #ifdef MP-DI
 					OrderSource: 7,
@@ -395,7 +392,7 @@
 				this.searchObj = JSON.parse(options.searchObj)
 			}
 			if (options.HotelInfo) {
-				this.HotelInfo = JSON.parse(options.HotelInfo)
+				this.HotelInfo = JSON.parse(options.HotelInfo);
 				this.orderMsg.hotelId = this.HotelInfo.hotelid;
 				this.orderMsg.HotelName = this.HotelInfo.name;
 				if (this.HotelInfo.images && this.HotelInfo.images.length > 0) {
@@ -504,8 +501,8 @@
 					guestInfo += `儿童${this.searchObj.childrenNumberZC}; `;
 				}
 				let msg = {
-					SurName: this.orderMsg.SurName,
-					Name: this.orderMsg.Name,
+					SurName: this.orderMsg.guestLastName,
+					Name: this.orderMsg.guestFirstName,
 					ContactNumber: this.orderMsg.guestPhoneNumber,
 					Mailbox: this.orderMsg.guestEmail,
 					GoodsId: this.HotelInfo.hotelid,
@@ -543,7 +540,7 @@
 				}
 				//道旅酒店参数
 				let that = this;
-				var CreateBy = 0
+
 				//直客
 				// #ifdef MP-DI
 				if (this.customer.salesBaseInfo && this.customer.salesBaseInfo.employeeId) {
@@ -863,7 +860,6 @@
 				}
 				return msg
 			},
-
 		}
 	}
 </script>

pages/hotel/orderdetails.vue

@@ -130,7 +130,7 @@
 				<view class="ResInforText row-sb-n">
 					<view class="ResInforL Lwidth">联系姓名</view>
 					<view class="ResInforR">
-						{{ orderData.parmResultRoomInfo.SurName }}{{ orderData.parmResultRoomInfo.Name }}
+						{{ orderData.parmResultRoomInfo.guestFirstName }}{{ orderData.parmResultRoomInfo.guestLastName }}
 					</view>
 				</view>
 				<view class="ResInforText row-sb-n">
@@ -169,13 +169,13 @@
 					<view class="form-items" style="border-bottom: none;padding: 20rpx 0;">
 						<view class="label"> 明细 </view>
 					</view>
-					<view class="flex f12 grey" style="margin-bottom: 40rpx"
-						v-for="(item,index) in orderData.parmResultRoomInfo.GuestList" :key="index">
+					<view v-if="RatePlanList&&RatePlanList.length>0" class="flex f12 grey" style="margin-bottom: 40rpx"
+						v-for="(item,index) in RatePlanList" :key="index">
 						<view style="flex: 1">
-							<text style="margin-right: 30rpx">房间数</text>
+							<text style="margin-right: 30rpx">房间数 {{index+1}}</text>
 						</view>
 						<view style="text-align: right">
-							1间({{ item.GuestInfo.length }}人) × {{ DanWei }}{{ orderData.model.RoomPrice }}
+							{{ DanWei }}{{ item.TotalPrice }}
 						</view>
 					</view>
 
@@ -476,6 +476,8 @@
 								this.RatePlanList = res.data.parmResult.Success.BookingDetails.Hotel.RatePlanList
 								this.DanWei = res.data.parmResult.Success.BookingDetails.Hotel.RatePlanList[0].Currency
 								this.roomRateDetails = res.data.parmResult.Success.BookingDetails.Hotel
+							} else {
+								this.initBookHotel()
 							}
 							res.data.parmResultRoomInfo.GuestList.forEach((item, index) => {
 								this.roomNum++
@@ -490,6 +492,63 @@
 					}
 				);
 			},
+			//未付款是初始化预定房型，餐型等，
+			initBookHotel() {
+				var cMsg = {
+					"sort": 1,
+					"displayFrom": 1,
+					"CheckInDate": this.orderData.parmResultRoomInfo.CheckInDate,
+					"CheckOutDate": this.orderData.parmResultRoomInfo.CheckOutDate,
+					"searchroomGroup": [],
+					"ratePlanID": this.orderData.parmResultRoomInfo.RatePlanID,
+					"imgUrl": "",
+					"RoomCount": this.orderData.parmResultRoomInfo.RoomCount,
+					"ChildCount": 0,
+					"AdultCount": 0,
+					"OccupancyDetails": [],
+					"hotelId": this.orderData.parmResultRoomInfo.hotelId
+				};
+				if (this.orderData.parmResultRoomInfo.GuestList && this.orderData.parmResultRoomInfo.GuestList.length >
+					0) {
+					this.orderData.parmResultRoomInfo.GuestList.forEach(item => {
+						var rObj = {
+							"roomNum": item.RoomNum,
+							"numberOfAdults": item.numberOfAdults,
+							"numberOfChildren": item.numberOfChildren,
+							"ChildAgeDetails": item.ChildAgeDetails,
+							"ChildAgeTexts": []
+						};
+						if (item.GuestInfo && item.GuestInfo.length > 0) {
+							item.GuestInfo.forEach(subItem => {
+								if (subItem.IsAdult == 0) {
+									rObj.ChildAgeTexts.push(subItem.Age);
+								}
+							})
+						}
+						cMsg.searchroomGroup.push(rObj)
+					})
+				}
+
+				uni.showLoading({
+					title: '加载中...',
+					mask: true
+				});
+				this.apipost(
+					"dmc_post_GetDiDaPriceConfirm", cMsg,
+					res => {
+						uni.hideLoading();
+						if (res.resultCode == 1) {
+							var tempData = res.data;
+							if (tempData && tempData.PriceDetails && tempData.PriceDetails.HotelList && tempData
+								.PriceDetails.HotelList.length > 0) {
+								this.RatePlanList = tempData.PriceDetails.HotelList[0].RatePlanList;
+							}
+						}
+					}, failed => {
+						uni.hideLoading();
+						console.log("failed", failed);
+					});
+			},
 			//日期格式化
 			getformatDateStr(value) {
 				var dt = new Date(value);