From f38abca2f7b734cea885275be88da6abd2b2a447 Mon Sep 17 00:00:00 2001
From: han <151435705@qq.com>
Date: Tue, 3 Dec 2024 19:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E9=A2=91=E8=A7=86=E9=A2=91=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/dc-calendar/dc-calendar.vue        |  5 +-
 components/mescroll-diy/mescroll-xinlang.vue  | 19 +-----
 pages/index/index.vue                         | 27 ++++++--
 static/css/common.scss                        |  4 ++
 .../homestaydetail/homestaydetail.vue         | 27 ++++----
 subPageC/bookHomestay/bookHomestay.vue        | 14 ++--
 subPageC/orderHomestay/orderCancel.vue        |  4 +-
 subPageC/orderHomestay/orderDetail.vue        | 14 ++--
 subPageC/orderHomestay/orderList.vue          | 68 ++++++++++++-------
 9 files changed, 100 insertions(+), 82 deletions(-)

diff --git a/components/dc-calendar/dc-calendar.vue b/components/dc-calendar/dc-calendar.vue
index a29673e..b4f9f29 100644
--- a/components/dc-calendar/dc-calendar.vue
+++ b/components/dc-calendar/dc-calendar.vue
@@ -1170,13 +1170,14 @@
 
 		// 周容器  周日-周六
 		.week {
-
+margin-top: -50rpx;
 			display: flex;
 			align-items: center;
 			border-bottom: 1rpx solid #ededed;
 			padding-bottom: 20rpx;
 			margin-bottom: 30rpx;
 			color: #cecece;
+			font-size: 28rpx;
 
 			view {
 				width: 14.2857%;
@@ -1193,7 +1194,7 @@
 		// 日期视口容器
 		.dateView {
 			position: absolute; //绝对定位
-			top: 120rpx; //头部操作区域以及想要的margin-bottomm
+			top: 240rpx; //头部操作区域以及想要的margin-bottomm
 			bottom: 112rpx; //底部操作区域高度
 			left: 32rpx;
 			right: 32rpx;
diff --git a/components/mescroll-diy/mescroll-xinlang.vue b/components/mescroll-diy/mescroll-xinlang.vue
index bf5ff4c..edc40e6 100644
--- a/components/mescroll-diy/mescroll-xinlang.vue
+++ b/components/mescroll-diy/mescroll-xinlang.vue
@@ -369,22 +369,5 @@
 		-webkit-animation: progressRotate .6s steps(6,start) infinite;
 		animation: progressRotate .6s steps(6,start) infinite;
 	}
-	@-webkit-keyframes progressRotate {
-		0% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress1.png)}
-		16% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress2.png)}
-		32% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress3.png)}
-		48% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress4.png)}
-		64% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress5.png)}
-		80% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress6.png)}
-		100% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress1.png)}
-	}
-	@keyframes progressRotate {
-		0% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress1.png)}
-		16% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress2.png)}
-		32% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress3.png)}
-		48% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress4.png)}
-		64% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress5.png)}
-		80% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress6.png)}
-		100% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress1.png)}
-	}
+	
 </style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f00122b..c30e12e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -72,11 +72,17 @@
 							</view>
 						</view>
 						<view class="w_20" hover-class="checkActive">
-							<view class="kua_nav" @click="goToPages('youji')">
+							<view class="kua_nav" @click="goQuanyi">
 								<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-12.png" class="at_size_2"></image>
 								<view class="at_t">文旅攻略</view>
 							</view>
 						</view>
+					<!-- 	<view class="w_20" hover-class="checkActive">
+							<view class="kua_nav" @click="goToPages('youji')">
+								<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-12.png" class="at_size_2"></image>
+								<view class="at_t">文旅攻略</view>
+							</view>
+						</view> -->
 						<view class="w_20" hover-class="checkActive">
 							<view class="kua_nav" @click="goQuanyi">
 								<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-13.png" class="at_size_2"></image>
@@ -90,11 +96,17 @@
 							</view>
 						</view>
 						<view class="w_20" hover-class="checkActive">
-							<view class="kua_nav" @click="goToPages('Audiovisual')">
+							<view class="kua_nav" @click="goQuanyi">
 								<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-15.png" class="at_size_2"></image>
 								<view class="at_t">影音世界</view>
 							</view>
 						</view>
+						<!-- <view class="w_20" hover-class="checkActive">
+							<view class="kua_nav" @click="goToPages('Audiovisual')">
+								<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-15.png" class="at_size_2"></image>
+								<view class="at_t">影音世界</view>
+							</view>
+						</view> -->
 					</view>
 				</view>
 
@@ -389,11 +401,14 @@
 		},
 		methods: {
 			clickSwiper(e) {
-				uni.showToast({
-					title: "功能正在开发中~",
-					icon: "none",
-					duration: 2000,
+				uni.navigateTo({
+					url: "/subPageB/Homestay/homestaylist/homestaylist",
 				});
+				// uni.showToast({
+				// 	title: "功能正在开发中~",
+				// 	icon: "none",
+				// 	duration: 2000,
+				// });
 			},
 			goQuanyi() {
 				uni.showToast({
diff --git a/static/css/common.scss b/static/css/common.scss
index 46619f4..3b56e63 100644
--- a/static/css/common.scss
+++ b/static/css/common.scss
@@ -1012,3 +1012,7 @@ page {
 .p-r-24 {
 	padding-right: 24rpx !important;
 }
+
+.v-detail-content{
+	img{width: 100%;}
+}
\ No newline at end of file
diff --git a/subPageB/Homestay/homestaydetail/homestaydetail.vue b/subPageB/Homestay/homestaydetail/homestaydetail.vue
index 0c0ba55..10bfeb3 100644
--- a/subPageB/Homestay/homestaydetail/homestaydetail.vue
+++ b/subPageB/Homestay/homestaydetail/homestaydetail.vue
@@ -69,25 +69,25 @@
 			</view>
 		</view> -->
 
-		<view class="v-card detail small container-fluid m-t-24" v-if="info.hotelBedInfoVos.length>0">
+		<view class="v-card detail small container-fluid m-t-24" v-if="info&&info.hotelBedInfoVos.length>0">
 			<view class="v-pages-list">
-				<view class="list_item row">
+				<view class="list_item row" v-for="(item,index) in info.hotelBedInfoVos" :key="item.id">
 					<view class="item_image hotel">
-						<image class="img" :src="info.hotelBedInfoVos[0].hotelPhoto" mode="aspectFill"></image>
+						<image class="img" :src="item.hotelPhoto" mode="aspectFill"></image>
 					</view>
 					<view class="item_content col">
-						<view class="content-name">{{info.hotelBedInfoVos[0].houseName}}</view>
+						<view class="content-name">{{item.houseName}}</view>
 						<view class="v-order-tip">
-							<text v-if="info.hotelBedInfoVos[0].guest">{{info.hotelBedInfoVos[0].guest}}人入住</text>
+							<text v-if="item.guest">{{item.guest}}人入住</text>
 							<text class="m-l-10"
-								v-if="info.hotelBedInfoVos[0].houseArea">{{info.hotelBedInfoVos[0].houseArea}}㎡</text>
+								v-if="item.houseArea">{{item.houseArea}}㎡</text>
 						</view>
 						<view class="content-wait m-t-12">需等待商家确认</view>
 					</view>
 					<view class="item-price row flex-align-center">
-						<text class="num_pr">¥</text><text class="num_jd">{{info.hotelBedInfoVos[0].housePrice}}</text>
+						<text class="num_pr">¥</text><text class="num_jd">{{item.housePrice}}</text>
 						<text class="num_qi">起</text>
-						<view class="btn m-l-24" @click="bookIt(info.hotelBedInfoVos[0])">预定</view>
+						<view class="btn m-l-24" @click="bookIt(item)">预定</view>
 					</view>
 				</view>
 			</view>
@@ -105,15 +105,16 @@
 			<view class="v-detail-title">
 				<view class="text"><text>民宿介绍</text></view>
 			</view>
-			<view class="v-detail-content m-t-24" v-html="info.hcontent"></view>
+			<view class="v-detail-content m-t-24">
+				<u-parse :content="info.hcontent" v-if="info"/>	
+			</view>
 		</view>
-
 		<f-login></f-login>
 	</view>
 </template>
 
 <script>
-	import uParse from '@/components/gaoyia-parse/parse.vue'
+	import uParse from '@/uni_modules/uview-ui/components/u-parse/u-parse.vue'
 	import calendar from '@/components/dc-calendar/dc-calendar.vue'
 	import {
 		mapState,
@@ -240,8 +241,6 @@
 
 			bookIt(val) {
 				this.judgeLogin((resa) => {
-					console.log('asdfasdf====', this.userInfo)
-
 
 					var data = {
 						mobile: this.userInfo.phone,
@@ -252,7 +251,7 @@
 					};
 
 					const parame = {
-						...this.info.hotelBedInfoVos[0], //民宿整套
+						...val, //民宿整套
 						...data,
 						...this.infoData
 					}
diff --git a/subPageC/bookHomestay/bookHomestay.vue b/subPageC/bookHomestay/bookHomestay.vue
index ce272ff..9d00024 100644
--- a/subPageC/bookHomestay/bookHomestay.vue
+++ b/subPageC/bookHomestay/bookHomestay.vue
@@ -213,12 +213,12 @@
 					uni.showToast({
 						title: '支付成功',
 						icon: 'none'
-					});
-					this.isPayPopup = false
+					});					
 					setTimeout(() => {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: "/subPageC/orderHomestay/orderList"
 						});
+						this.isPayPopup = false
 					}, 1000)
 				} else {
 					uni.showToast({
@@ -226,9 +226,10 @@
 						icon: 'none'
 					});
 					setTimeout(() => {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: "/subPageC/orderHomestay/orderList"
 						});
+						this.isPayPopup = false
 					}, 1000)
 				}
 				//uni.showToast({title: data.detail.errMsg,icon:'none'});
@@ -242,15 +243,16 @@
 					cancelText: '再想想',
 					showCancel: true,
 					success: function(res) {
-						if (res.confirm) {
-							that.isPayPopup = false
+						if (res.confirm) {							
 							setTimeout(() => {
 								uni.redirectTo({
 									url: "/subPageC/orderHomestay/orderList"
 								});
+								that.isPayPopup = false
 							}, 500)
 						} else if (res.cancel) {
 							console.log('用户点击取消');
+							that.isPayPopup = false
 						}
 					}
 				})
diff --git a/subPageC/orderHomestay/orderCancel.vue b/subPageC/orderHomestay/orderCancel.vue
index 2c0c586..df940ff 100644
--- a/subPageC/orderHomestay/orderCancel.vue
+++ b/subPageC/orderHomestay/orderCancel.vue
@@ -66,8 +66,8 @@
 							icon: 'none'
 						});
 						setTimeout(() => {
-							uni.navigateTo({
-								url: "/subPageC/orderHomestay/orderList"
+							uni.navigateBack({
+								delta: 2
 							});
 						}, 1000)
 					} else {
diff --git a/subPageC/orderHomestay/orderDetail.vue b/subPageC/orderHomestay/orderDetail.vue
index 0a0b4f7..10426be 100644
--- a/subPageC/orderHomestay/orderDetail.vue
+++ b/subPageC/orderHomestay/orderDetail.vue
@@ -187,11 +187,7 @@
 				}
 			}
 		},
-		onUnload: function() {
-			uni.navigateBack({
-				delta: 1
-			});
-		},
+	
 		onLoad(options) {
 			this.getHomestayOrderDetail(options.id)
 		},
@@ -326,8 +322,8 @@
 					});
 					this.isPayPopup = false
 					setTimeout(() => {
-						uni.navigateTo({
-							url: "/subPageC/orderHomestay/orderList"
+						uni.navigateBack({
+							delta: 1
 						});
 					}, 1000)
 				} else {
@@ -335,6 +331,7 @@
 						title: '支付失败',
 						icon: 'none'
 					});
+					this.isPayPopup=false
 				}
 				//uni.showToast({title: data.detail.errMsg,icon:'none'});
 			},
@@ -351,9 +348,10 @@
 							that.isPayPopup = false
 						} else if (res.cancel) {
 							console.log('用户点击取消');
+							this.isPayPopup=false
 						}
 					}
-				})
+				})				
 			},
 
 			stateImg: function(val) {
diff --git a/subPageC/orderHomestay/orderList.vue b/subPageC/orderHomestay/orderList.vue
index f7bfb1c..4651c93 100644
--- a/subPageC/orderHomestay/orderList.vue
+++ b/subPageC/orderHomestay/orderList.vue
@@ -2,9 +2,9 @@
 	<view class="v-order-list">
 		<mescroll-uni :up="upOption" @down="downCallback" @up="upCallback" :fixed="false">
 			<view class="list_item container-fluid m-b-24" v-for="(item,index) in orderList"
-				@click="toHomeStayDetailPage(item.id)">
+				>
 				<view class="item_title">{{item.hotelName}}</view>
-				<view class="row">
+				<view class="row" @click="toHomeStayDetailPage(item.id)">
 					<view class="item_image">
 						<image class="img" :src="item.hotelLogo" mode="widthFix"></image>
 					</view>
@@ -17,12 +17,14 @@
 							{{item.checkOutTime}}
 						</view>
 						<view class="content-price">总价：¥{{item.orderAmount}}</view>
-						<view class="content-bottom">
-							<view class="btn" v-if="item.orderStatus=='0'" @click="payOrder(item)">去支付</view>
-							<view class="btn" v-if="item.orderStatus !='0' && item.orderStatus !='1'"
-								@click="toHomeStayBookingPage(item.hotelId)">再次预定</view>
-							<view class="btn" v-if="item.refundDisplay =='1'" @click="toRefundPage(item.id)">退款进度</view>
-						</view>
+					</view>	
+				</view>
+				<view class="item_content">
+					<view class="content-bottom">
+						<view class="btn" v-if="item.orderStatus=='0'" @click="payOrder(item)">去支付</view>
+						<view class="btn" v-if="item.orderStatus !='0' && item.orderStatus !='1'"
+							@click="toHomeStayBookingPage(item.hotelId)">再次预定</view>
+						<view class="btn" v-if="item.refundDisplay =='1'" @click="toRefundPage(item.id)">退款进度</view>
 					</view>
 				</view>
 				<view class="tip-bage"></view>
@@ -30,7 +32,7 @@
 				<view class="state" :class="'type'+item.orderStatus">{{stateMessage(item.orderStatus)}}</view>
 			</view>
 		</mescroll-uni>
-		<u-popup :show="isPayPopup" mode="bottom" @close="isPayPopup = false" round="10">
+		<u-popup :show="isPayPopup" mode="bottom" @close="closePay" round="10">
 			<f-pay :show-title="false" :show="isPayPopup" :order="orderInfo" :payMoney="orderInfo.orderAmount"
 				:tradeNo="orderInfo.orderNumber" @payResult="payResult"></f-pay>
 		</u-popup>
@@ -80,10 +82,9 @@
 			//TODO:
 			this.judgeLogin()
 		},
-		onUnload: function() {
-			uni.navigateTo({
-				url: '/pages/personcenter/personcenter'
-			});
+		onShow() {			
+			this.param.pageNo = 1
+			this.loadData()
 		},
 		methods: {
 			stateMessage: function(val) {
@@ -121,8 +122,8 @@
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			/*下拉刷新的回调 */
 			downCallback(mescroll) {
-        this.param.pageNo = 1
-        this.loadData();
+				this.param.pageNo = 1
+				this.loadData();
 				// #ifdef H5
 				this.top = uni.upx2px(100 + 88) + 'px'; // H5的高度需加上 88的标题栏
 				// #endif
@@ -145,18 +146,18 @@
 					uni.showToast({
 						title: '支付成功',
 						icon: 'none'
-					});
-					this.isPayPopup = false
+					});					
 					setTimeout(() => {
-						uni.navigateTo({
-							url: "/subPageC/orderHomestay/orderList"
-						});
+						this.isPayPopup = false
+						this.param.pageNo = 1
+						this.loadData()
 					}, 1000)
 				} else {
 					uni.showToast({
 						title: '支付失败',
 						icon: 'none'
 					});
+					this.isPayPopup = false
 				}
 				//uni.showToast({title: data.detail.errMsg,icon:'none'});
 			},
@@ -164,15 +165,13 @@
 			loadData() {
 				// TODO: 需从缓存获取appId openId
 				const userInfo = uni.getStorageSync("userInfo");
-				const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
-				console.log(uni.getExtConfigSync(), 'extConfigextConfigextConfig')
+				const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};				
 				let appId = extConfig.app_id
 
 				this.param.openid = userInfo.openid
 				this.param.appid = appId
 
-				this.$Request.get(this.$config.getHomestayOrderList, this.param, null, null, false, true).then((res) => {
-					console.log("bbbbb")
+				this.$Request.get(this.$config.getHomestayOrderList, this.param, null, null, false, true).then((res) => {					
 					const curPageData = res.data.list || [] // 当前页数据
 					if (this.mescroll.num == 1) this.orderList = []; // 第一页需手动制空列表
 					curPageData.forEach((item, index) => {
@@ -192,6 +191,23 @@
 				console.log("订单==========", this.orderInfo)
 				this.isPayPopup = true
 			},
+			closePay() {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定取消支付？',
+					cancelText: '再想想',
+					showCancel: true,
+					success: function(res) {
+						if (res.confirm) {
+							that.isPayPopup = false
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+							this.isPayPopup=false
+						}
+					}
+				})				
+			},
 			// 跳转民宿订单详情页
 			toHomeStayDetailPage(id) {
 				uni.navigateTo({
@@ -241,7 +257,7 @@
 
 			.item_image {
 				width: 180rpx;
-				height: 200rpx;
+				height: 150rpx;
 				margin-right: 20rpx;
 				overflow: hidden;
 
@@ -350,4 +366,4 @@
 
 		}
 	}
-</style>
+</style>
\ No newline at end of file