修复

components/cancelPrompt/cancelPrompt.vue

@@ -142,6 +142,17 @@
 							<text>按标准扣除必要的费用</text>
 						</view>
 						<view class="showModalCTisp">
+							<template v-if="CancelPolicy">
+								<view class="showModalTisp">
+									旅游者在<text>行程开始前提出解除合同，</text>
+									将按下列标准扣除必要的费用：
+								</view>
+								<view class="showModalCTNK column">
+									<Text>行程开始前</Text>
+									<Text>{{ CancelPolicy!='暂无'?CancelPolicy:'以实际退款为准' }}</Text>
+								</view>
+							</template>
+							<template v-else>
 								<view class="showModalTisp">
 									旅游者在<text>行程开始前7日以内提出解除合同，</text>
 									将按下列标准扣除必要的费用：
@@ -158,6 +169,8 @@
 									<Text>行程开始当日</Text>
 									<Text>按旅游费用总额的60%</Text>
 								</view>
+							</template>
+							
 						</view>
 						<view class="showModalTime"
 						:class="[!submitCancel?'active':'']">请仔细阅读条款<template v-if="submitCancel">{{remainingTime}}s</template>后确认</view>
@@ -185,7 +198,7 @@
 </template>
 <script>
 export default {
-    props:['showModal','orderNo','type'], 
+    props:['showModal','orderNo','type','CancelPolicy'], 
     data(){
 			return{
                 Cancelmsg:{
@@ -197,6 +210,15 @@ export default {
 				timerId: null,     // 定时器ID
 				isRunning: false,   // 状态标识（防止重复启动）
             }
+    },
+	watch: {
+		// CancelPolicy: {
+		// 	handler(newVal, oldVal) {
+				
+		// 	},
+		// 	deep: false,
+		// 	immediate: true
+		// }	
 	},
 	created() {
 		this.erpBaseInfo = uni.getStorageSync("b2b_user").erpBaseInfo

pages/bus/busDetails.vue

@@ -184,7 +184,7 @@
 						:scale="scale">
 						</map>
 					</view>
-					<view class="busTispTitle">温馨提示</view>
+					<view class="busTispTitle">取消政策</view>
 					<view class="busTispInfor" style="border: 0;">
 						{{ dataList.CancelPolicy }}
 					</view>

pages/bus/order.vue

@@ -180,7 +180,7 @@
 								</view>
 								<view class="LastNameBox column val" style="width: 1px;flex: 1;">
 									<view class="row items-center">
-										<input type="number" v-model="orderMsg.ChildNum" placeholder="儿童数" />
+										<input type="number" v-model="orderMsg.ChildNum" placeholder="儿童数"  @change="getPeoples"/>
 									</view>
 								</view>
 							</view>
@@ -190,7 +190,7 @@
 								</view>
 								<view class="LastNameBox column val" style="width: 1px;flex: 1;">
 									<view class="row items-center">
-										<input type="number" v-model="orderMsg.BabyNum" placeholder="婴儿数" />
+										<input type="number" v-model="orderMsg.BabyNum" placeholder="婴儿数"  @change="getPeoples"/>
 									</view>
 								</view>
 							</view>
@@ -880,7 +880,6 @@
 						return
 					}
 				// #endif
-				
 				this.submit = true;
 
 				let CouponAllotIds = ''

pages/bus/orderdetails.vue

@@ -257,7 +257,8 @@
 	<cancelPrompt v-if="showModal"
 		:showModal="showModal" 
 		@cancel="cancelModal" 
-		:orderNo="OrderNo"></cancelPrompt>
+		:orderNo="OrderNo"
+		:CancelPolicy="CancelPolicy"></cancelPrompt>
 	</view>
 </template>
 
@@ -358,6 +359,7 @@
 				SalePhone: null,
 				showModal: false,
 				OrderNo: '',
+				CancelPolicy: '',
 			};
 		},
 		created() {
@@ -622,6 +624,7 @@
 						if (res.resultCode == 1) {
 							uni.hideLoading();
 							this.orderData = res.data
+							this.initData(res.data.ProductId)
 							this.OrderNo = res.data.OrderNo
 							this.peopleNum = Number(this.orderData.ManNum) + Number(this.orderData.ChildNum) +Number(this.orderData.BabyNum);
 							// #ifdef MP-AG
@@ -648,17 +651,40 @@
 				const parameter={ErpOrderId:this.id,OrderTypeStr:'Vehicle'}
 				this.apipost("GetDetailsByErpOrderId_post",parameter,res=>{
 					if(res.resultCode==1){
+						this.orderData = {
+							...this.orderData,
+							...res.data,
+						}
 						this.OrderNo = res.data.OrderNo 
 						this.formatStatus(
 							res.data.OrderStatus,
 							null,
 							null
 						);
-					}else{
-						
+						let OrderDate = this.orderData.OrderDate.slice(0, 10);
+						if(OrderDate<=this.$utils.GetDateFewFaysLater(0).date){
+							this.showPayBtn = false
+						}
 					}
+				},err=>{
+					uni.showToast({
+						title: err.message,
+						icon: "none",
+					});
 				})
 			},
+			initData(ProductId) {
+				this.apipost(
+				"CarSingle_post_GetTYCarSingleProductInfo",{
+					ProductId: ProductId,
+				},
+				res => {
+					if (res.resultCode == 1) {
+						this.CancelPolicy = res.data.CancelPolicy!=''?res.data.CancelPolicy:'暂无'
+						console.log(this.CancelPolicy,'==========')
+					}
+				});
+			},
 			//日期格式化
 			getformatDateStr(value) {
 				var dt = new Date(value);