From 82b7b7a60f4b2c291c26e31105a87983625c9e1d Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 2 Sep 2024 14:57:58 +0800
Subject: [PATCH] fix

---
 subPackages/eventCalendar/detail.vue | 13 +++++++++++--
 subPackages/hotelHomestay/order.vue  | 14 +++++++++++---
 subPackages/techan/order.vue         |  8 +++++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/subPackages/eventCalendar/detail.vue b/subPackages/eventCalendar/detail.vue
index d2508b4..39d9f9f 100644
--- a/subPackages/eventCalendar/detail.vue
+++ b/subPackages/eventCalendar/detail.vue
@@ -19,7 +19,8 @@
 				<image src="https://tongli.sz-trip.com/uploads/20240826/564af778708591f5de29174d3b14bbff.png" v-else></image>
 			</view>
 			
-			<view class="collect" @click.stop="share()">
+			<view class="collect" >
+				<button open-type="share" @click="share" class="share-btn"></button>
 				<image src="https://tongli.sz-trip.com/uploads/20240902/8eb614e4ea41db655a4e6da2cc0ca954.png"></image>
 			</view>
 		</view>
@@ -27,7 +28,7 @@
 	
 			<view class="common-container info-container">
 				<view class="info-title text-overflowRows">{{info.title}}</view>
-				<view class="text-overflow" style="padding: 40rpx 0 16rpx;">{{info.address}}</view>
+				<view class="text-overflow" style="padding: 40rpx 0 16rpx;">地址：{{info.address}}</view>
 				<view class="text-overflow" v-if="info.start_time && info.end_time">时间：{{info.start_time}} - {{info.end_time}}</view>
 			</view>
 			<view class="common-container detail-container">
@@ -145,6 +146,14 @@
 				width: 36rpx;
 				height: 36rpx;
 			}
+			.share-btn{
+				position: absolute;
+				top: 0;
+				left: 0;
+				bottom: 0;
+				right: 0;
+				opacity: 0;
+			}
 		}
 		.swiper-pointer{
 			position: absolute;
diff --git a/subPackages/hotelHomestay/order.vue b/subPackages/hotelHomestay/order.vue
index 0bf6ef4..3153603 100644
--- a/subPackages/hotelHomestay/order.vue
+++ b/subPackages/hotelHomestay/order.vue
@@ -211,6 +211,7 @@
 			},
 			
 			order () {
+				this.roomUser.forEach(v=>v.name = v.name.trim())
 				// 校验
 				if (!this.isTel(this.phone)){
 					uni.showToast({
@@ -219,13 +220,20 @@
 					});
 					return;
 				}
-				if (this.roomUser.some(v=>v.trim().length<0)) {
+				if (this.roomUser.some(v=>v.name.length<0)) {
 					uni.showToast({
 						title: '请输入住客姓名',
 						icon: 'none'
 					});
 					return;
 				}
+				if (this.roomUser.length != new Set(this.roomUser).length) {
+					uni.showToast({
+						title: '住客姓名不能相同',
+						icon: 'none'
+					});
+					return;
+				}
 				
 				let goods = []
 				let	goodsItem = {
@@ -234,7 +242,7 @@
 					start_date: this.selectDate.startDay,
 					end_date: this.selectDate.endDay,
 					customer_name: this.roomUser.map(v=>v.name).join('、'),
-					reserve_mobile: this.phone,
+					// reserve_mobile: this.phone,
 				}
 				goods.push(goodsItem)
 				
@@ -249,7 +257,7 @@
 					data: JSON.stringify(data)
 				},'/api/order/place').then(res => {
 					console.log('成功');
-					if(res.code == 200){
+					if(res.code == 1){
 						uni.removeStorageSync('hotelOrderInfo')
 						this.Post({
 							order_id: res.data.order_id,
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index 04d00ae..2dcf995 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -144,7 +144,7 @@
 				<view class="price">{{ total() }}</view>
 				<view class="post-text" v-if="sendType==1&&post">含邮费:¥{{ post / 100 }}</view>
 			</view>
-			<view class="btn" @click="order()">立即购买</view>
+			<view class="btn" @click="order()">提交订单</view>
 		</view>
 
 		<!-- 选择收货地址弹窗 -->
@@ -1154,7 +1154,7 @@ view {
 	.flex-c{
 		display: flex;
 		flex-direction: column;
-		justify-content: space-between;
+		// justify-content: space-between;
 	}
 	.new-box{
 		background: #fff;
@@ -1185,11 +1185,13 @@ view {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
+		font-size: 32rpx;
 		&:last-child{
-			font-size: 28rpx;
+			font-size: 24rpx;
 			font-family: PingFang SC;
 			font-weight: 400;
 			color: #666666;
+			padding-top: 20rpx;
 		}
 		.commodity-price{
 			&:before{