From 5fa9839b70eba7de90b4d2d43467ee51b7372403 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Thu, 12 Sep 2024 17:57:56 +0800
Subject: [PATCH] 1

---
 subPackages/hotelHomestay/hotelHomestay.vue |  7 ++----
 subPackages/techan/detail.vue               |  7 ++----
 subPackages/ticketBooking/order.vue         | 26 ++++++++++++---------
 subPackages/ticketBooking/ticketBooking.vue |  9 +------
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/subPackages/hotelHomestay/hotelHomestay.vue b/subPackages/hotelHomestay/hotelHomestay.vue
index 074b851..db2811d 100644
--- a/subPackages/hotelHomestay/hotelHomestay.vue
+++ b/subPackages/hotelHomestay/hotelHomestay.vue
@@ -32,7 +32,7 @@
 					<view class="flex-between">
 						<view class="distance">距您约602m</view>
 						<view class="priceBox flex-shrink-0">
-							<view class="price">{{showPrice(item.price)}}</view>
+							<view class="price">{{item.price/100}}</view>
 						</view>
 					</view>
 
@@ -87,10 +87,7 @@
 		},
 		  
 		methods: {
-			// 价格显示
-			showPrice(price) {
-				return (price && price != 0) ? (price / 100).toFixed(0) : '0'
-			},
+
 			getHeadImg(type){
 				this.headImg = null
 				this.Post(
diff --git a/subPackages/techan/detail.vue b/subPackages/techan/detail.vue
index bebee17..bdfdbc9 100644
--- a/subPackages/techan/detail.vue
+++ b/subPackages/techan/detail.vue
@@ -91,7 +91,7 @@
 				<view class="bottom-productImg">
 					<img :src="showImg(sku[productIndex].image)" alt="">
 					<view class="right-content">
-						<view class="bottom-productPrice com-price">{{showPrice(sku[productIndex].money)}}</view>
+						<view class="bottom-productPrice com-price">{{(sku[productIndex].money||0)/100}}</view>
 						<view class="bottom-content text-overflow">已选择：{{sku[productIndex].title}}</view>
 					</view>
 				</view>
@@ -159,10 +159,7 @@
 			changPopShow (e) {
 				this.popShow = e.show
 			},
-			// 价格显示
-			showPrice(price) {
-				return (price && price != 0) ? (price / 100).toFixed(2) : '0.00'
-			},
+	
 			
 
 			getInfo() {
diff --git a/subPackages/ticketBooking/order.vue b/subPackages/ticketBooking/order.vue
index 4031290..ef4cd70 100644
--- a/subPackages/ticketBooking/order.vue
+++ b/subPackages/ticketBooking/order.vue
@@ -72,7 +72,7 @@
 						</view>
 						</view>
 						<view class="h-1rpx flex-shrink-0" style="width: 110rpx;"></view>
-						<view class="person-item-more" @click.stop="showAddressPopUp({},[],true)">
+						<view class="person-item-more" @click.stop="showAddressPopUp({},[],true)" v-if="addressList.length>0">
 							<view>更多></view>
 						</view>
 					</view>
@@ -130,7 +130,7 @@
 									<view>身份证 {{skuItem.selPerson.id_number}}</view>
 								</view>
 								
-								<img @click.stop="changeAddressAddPopup('open',person)" v-if="!skuBuyMultiple" style="width: 32rpx;height: 32rpx;" 
+								<img @click.stop="changeAddressAddPopup('open',skuItem.selPerson)" v-if="!skuBuyMultiple" style="width: 32rpx;height: 32rpx;" 
 								:src="showImg('/uploads/20240827/337cf610ce5924c2a65b7a28b6a4891e.png')" alt="" />
 								<uni-icons v-else type="right" size="16"></uni-icons>
 							</view>
@@ -395,7 +395,7 @@
 					start_date:date
 				}, '/api/goods/getPriceCalendarListBySpecifications')
 				if (res.code == 1) {
-					return {code:1,money: res.data[0].money}
+					return {code:1,money: res.data[0].money, store: ''}
 				}
 				return {code:2}
 			},
@@ -434,6 +434,7 @@
 					let is_price_calendar = data.sInfo.is_price_calendar
 					data.pInfo.specifications = data.pInfo.specifications.filter(v=>v.is_time_stock==is_time_stock && v.is_price_calendar==is_price_calendar)
 					let date = data.allSeldDate[data.seldDateIndex].date
+					let time = data.timesArr[data.seldTimeIndex]
 					
 					for(let sku of data.pInfo.specifications) {
 						let res = await this.initPriceCal(sku.id, sku.goods_id, date)
@@ -887,15 +888,16 @@
 				
 				
 				// 设置参数
-				console.log(this.pInfo)
-				this.pInfo.specifications.forEach(sku=>{
+				let canSubmit = true
+				this.pInfo.specifications.filter(v=>v.buyNum>0).forEach(sku=>{
+					debugger
 					if (!sku.is_card) {
-						if (this.isTel(sku.selPerson.tel)) {
+						if (!this.IsTel(sku.selPerson.tel)) {
 							uni.showToast({
 								title:'请输入正确的手机号',
 								icon:'none'
 							})
-							return
+							canSubmit = false
 						}
 						let param = {
 							specifications_id: sku.id,
@@ -915,7 +917,7 @@
 									title:'请选择出行人',
 									icon:'none'
 								})
-								return
+								canSubmit = false
 							}
 							let param = {
 								specifications_id: sku.id,
@@ -927,12 +929,12 @@
 							}
 							goods.push(param)
 						} else {
-							if (sku.selPerson.id) {
+							if (!sku.selPerson.id) {
 								uni.showToast({
 									title:'请选择出行人',
 									icon:'none'
 								})
-								return
+								canSubmit = false
 							}
 							let param = {
 								specifications_id: sku.id,
@@ -948,7 +950,9 @@
 
 				})
 				console.log(goods)
-
+				if (!canSubmit) {
+					return
+				}
 			
 				let data = {
 					goods: goods,
diff --git a/subPackages/ticketBooking/ticketBooking.vue b/subPackages/ticketBooking/ticketBooking.vue
index 53acfd2..4fb2750 100644
--- a/subPackages/ticketBooking/ticketBooking.vue
+++ b/subPackages/ticketBooking/ticketBooking.vue
@@ -18,11 +18,8 @@
 						<view class="text-overflow">{{item.address}}</view>
 					</view>
 					<view class="priceBox">
-						<!-- <view :class="['price',item.price>0?'price-money':'']">
-							{{item.price>0?showPrice(item.price):'免费'}}
-						</view> -->
 						<view class="price price-money">
-							{{showPrice(item.price)}}
+							{{item.price/100}}
 						</view>
 					</view>
 				</view>
@@ -74,10 +71,6 @@
 		},
 		  
 		methods: {
-			// 价格显示
-			showPrice(price) {
-				return (price && price != 0) ? (price / 100).toFixed(0) : '0'
-			},
 			getHeadImg(type){
 				this.headImg = null
 				this.Post(