no message

pages/AggregateOrders/components/orders.vue

@@ -124,11 +124,20 @@
 					this.g = JSON.parse(JSON.stringify(newVal))
 					this.g.forEach(x => {
 						let goodsTypeHotel = 0
+						let Time = 5
 						// #ifdef MP-DI
 							goodsTypeHotel = x.goodsType==9?1:0
+							if(x.goodsType==1||x.goodsType==2||x.goodsType==3||x.goodsType==15||x.goodsType==12||x.goodsType==13||x.goodsType==14) {
+								Time = 30
+								goodsTypeHotel = 1
+							}
 						// #endif
 						// #ifdef MP-AG
 							goodsTypeHotel = x.goodsType==7?1:0
+							if(this.b2b_user.isGuideOrLeader==1&&(x.goodsType==2||x.goodsType==5||x.goodsType==6)) {
+								Time = 30
+								goodsTypeHotel = 1
+							}
 						// #endif
 						if(x.orderStatus!=1) x.isExpired = true
 						if (x.orderStatus==1&&goodsTypeHotel>0) {
@@ -140,7 +149,7 @@
 							const [hours, minutes, seconds] = time.split(':')
 							const parsedDate = new Date(year, month-1, day, hours, minutes, seconds)
 							x.orderTime = parsedDate.getTime()
-							const diff = x.orderTime + 5 * 60 * 1000 - now; // 5分钟倒计时
+							const diff = x.orderTime + Time * 60 * 1000 - now; // 5分钟倒计时
 							let remainingSeconds = Math.max(diff, 0); // 确保不出现负数
 							x.remainingSeconds = Math.floor(remainingSeconds/1000)
 							if(x.remainingSeconds<=0) {

pages/bus/order.vue

@@ -341,7 +341,7 @@
 		<u-modal :border-radius="16" 
 		@confirm="nativageToOrderHandle" 
 		title="订单提醒" 
-		content="订单创建成功,请您在6小时内完成付款,否则将会被取消." 
+		content="订单创建成功,请您在30分钟内完成付款,否则将会被取消." 
 		@cancel="navigatorToHomeHandle" 
 		v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页' 
 		confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>

pages/jiuzhai/jz_Reserve.vue

@@ -589,7 +589,7 @@
 		<u-modal :border-radius="16" 
 		@confirm="nativageToOrderHandle" 
 		title="订单提醒" 
-		content="订单创建成功,请您在6小时内完成付款,否则将会被取消." 
+		content="订单创建成功,请您在30分钟内完成付款,否则将会被取消." 
 		@cancel="navigatorToHomeHandle" 
 		v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页' 
 		confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>

pages/visa/visa_Reserve.vue

@@ -784,7 +784,7 @@
 		<u-modal :border-radius="16" 
 		@confirm="nativageToOrderHandle" 
 		title="订单提醒" 
-		content="订单创建成功,请您在6小时内完成付款,否则将会被取消." 
+		content="订单创建成功,请您在30分钟内完成付款,否则将会被取消." 
 		@cancel="navigatorToHomeHandle" 
 		v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页' 
 		confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>