From 3ef4d554eb7eb5156df4236f7fe7d02fd6956818 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 2 Sep 2024 09:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/hotelHomestay/detail.vue        |  8 ++--
 subPackages/hotelHomestay/hotelHomestay.vue | 10 ++--
 subPackages/hotelHomestay/order.vue         |  2 +-
 subPackages/ticketBooking/detail.vue        |  5 +-
 subPackages/ticketBooking/order.vue         | 51 +++++++--------------
 5 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/subPackages/hotelHomestay/detail.vue b/subPackages/hotelHomestay/detail.vue
index 94cb777..55db99d 100644
--- a/subPackages/hotelHomestay/detail.vue
+++ b/subPackages/hotelHomestay/detail.vue
@@ -90,7 +90,7 @@
 								</view>
 								<view class="price-container">
 									<view class="price">{{item.price/100}}</view>
-									<view class="btn" @click="goOrder(item)">预定</view>
+									<view class="btn" @click="goOrder(item)">预订</view>
 								</view>
 							</view>
 						</view>
@@ -290,8 +290,8 @@
 						})
 						
 					})
-					// this.sku = data
-					this.sku = [...data,...data,...data,...data]
+					this.sku = data
+					// this.sku = [...data,...data,...data,...data]
 				})
 			},
 			// 收藏
@@ -486,7 +486,7 @@
 				flex-wrap: nowrap;
 				overflow-x: auto;
 				.tag{
-					border-radius: 5rpx 4rpx 4rpx 5rpx;
+					border-radius: 5rpx;
 					border: 1px solid #71B580;
 				
 					padding: 7rpx 14rpx;
diff --git a/subPackages/hotelHomestay/hotelHomestay.vue b/subPackages/hotelHomestay/hotelHomestay.vue
index 210c7a3..555d66a 100644
--- a/subPackages/hotelHomestay/hotelHomestay.vue
+++ b/subPackages/hotelHomestay/hotelHomestay.vue
@@ -27,13 +27,13 @@
 								<view class="tag" v-for="(tag,tagIndex) in item.label.split(',')" :key="tagIndex">{{tag}}</view>
 							</view>
 						</view>
-						<view class="priceBox flex-shrink-0">
-							<view class="price">{{showPrice(item.price)}}</view>
-						</view>
+						
 					</view>
 					<view class="flex-between">
 						<view class="distance">距您约602m</view>
-						<view class="order-btn">立即预定</view>
+						<view class="priceBox flex-shrink-0">
+							<view class="price">{{showPrice(item.price)}}</view>
+						</view>
 					</view>
 
 					
@@ -222,7 +222,7 @@
 						padding: 4rpx 14rpx;
 						font-weight: 500;
 						font-size: 25rpx;
-						color: #4E7956;
+						color: #5BA06A;
 						text-align: center;
 						margin-right: 12rpx;
 						flex-shrink: 0;
diff --git a/subPackages/hotelHomestay/order.vue b/subPackages/hotelHomestay/order.vue
index 36c859d..bed8400 100644
--- a/subPackages/hotelHomestay/order.vue
+++ b/subPackages/hotelHomestay/order.vue
@@ -57,7 +57,7 @@
 			
 			<view class="common-container form-container">
 				<view class="form-title">
-					<text style="font-weight: bold;font-size: 35rpx;padding-right: 28rpx;">预定信息</text>
+					<text style="font-weight: bold;font-size: 35rpx;padding-right: 28rpx;">预订信息</text>
 					<text>姓名需与证件一致</text>
 				</view>
 				<view class="btn-box flex-column">
diff --git a/subPackages/ticketBooking/detail.vue b/subPackages/ticketBooking/detail.vue
index 8d01116..677ab2e 100644
--- a/subPackages/ticketBooking/detail.vue
+++ b/subPackages/ticketBooking/detail.vue
@@ -340,13 +340,10 @@
 					timesArr: this.timesArr,
 					seldTimeIndex: this.seldTimeIndex,
 				}
-				
+				uni.setStorageSync('ticketOrder', JSON.stringify(param));
 				// that.gotoBuy(pInfo, sInfo);
 				uni.navigateTo({
 					url:'/subPackages/ticketBooking/order',
-					success() {
-						uni.$emit("updateDataByConnect", {msgType:'updateTicketBookingOrder',data:param})
-					}
 				})
 			},
 					
diff --git a/subPackages/ticketBooking/order.vue b/subPackages/ticketBooking/order.vue
index 3c3b400..be8d58f 100644
--- a/subPackages/ticketBooking/order.vue
+++ b/subPackages/ticketBooking/order.vue
@@ -114,32 +114,32 @@
 		},
 		onLoad(options) {
 			// this.getList();
-			
-			uni.$on("updateDataByConnect",this.getDataByConnect)
+			this.initPageData()
 		},
 		
 		onShow() {
 			this.getAddressList()
-			this.handlePageData()
 		},
 		
 		onUnload () {
-			uni.$off("updateDataByConnect",this.getDataByConnect)
 		},
 		methods: {
-			getDataByConnect(data) {
-				if (data.msgType == "updateTicketBookingOrder") {
-					uni.setStorageSync('tempData', JSON.stringify(data.data));
+			initPageData () {
+				let data = uni.getStorageSync('ticketOrder');
+				try{
+					data = JSON.parse(data)
+					this.pInfo = data.pInfo
+					this.sInfo = data.sInfo
+					this.minSeldDate=data.minSeldDate
+					this.maxSeldDate = data.maxSeldDate
+					this.calendarParam = data.calendarParam
+					this.allSeldDate = data.allSeldDate
+					this.seldDateIndex = data.seldDateIndex
+					this.timesArr = data.timesArr
+					this.seldTimeIndex = data.seldTimeIndex 
 					
-					// this.pInfo = data.data.pInfo
-					// this.sInfo = data.data.sInfo
-					// this.minSeldDate=data.data.minSeldDate
-					// this.maxSeldDate = data.data.maxSeldDate
-					// this.calendarParam = data.data.calendarParam
-					// this.allSeldDate = data.data.allSeldDate
-					// this.seldDateIndex = data.data.seldDateIndex
-					// this.timesArr = data.data.timesArr
-					// this.seldTimeIndex = data.data.seldTimeIndex 
+				} catch(e){
+					console.log(e)
 				}
 			},
 			
@@ -199,24 +199,7 @@
 			},
 			
 			
-			handlePageData () {
-				let data = uni.getStorageSync('tempData');
-				try{
-					data = JSON.parse(data)
-					this.pInfo = data.pInfo
-					this.sInfo = data.sInfo
-					this.minSeldDate=data.minSeldDate
-					this.maxSeldDate = data.maxSeldDate
-					this.calendarParam = data.calendarParam
-					this.allSeldDate = data.allSeldDate
-					this.seldDateIndex = data.seldDateIndex
-					this.timesArr = data.timesArr
-					this.seldTimeIndex = data.seldTimeIndex 
-					
-				} catch(e){
-					console.log(e)
-				}
-			},
+			
 			
 			
 			// 减少数量