优化

pages/bus/busDetails.vue

@@ -146,16 +146,18 @@
 				</view>
 				<!-- #endif -->
 				<view class="busTispBox" style="margin-top: 20rpx;">
+					<template v-if="(dataList.PriceIncludeList&&dataList.PriceIncludeList.length>0)||
+						(dataList.PriceNotIncludeList&&dataList.PriceNotIncludeList.length>0)">
 					<view class="busTispTitle">费用说明</view>
 					<view class="busTispInfor">
-						<view class="busTispFY">
+						<view class="busTispFY" v-if="dataList.PriceIncludeList&&dataList.PriceIncludeList.length>0">
 							费用包含：
 							<text class="bus-tagText" v-for="(item,index) in dataList.PriceIncludeList"
 							:key="index">
 								{{ item }}
 							</text>
 						</view>
-						<view class="busTispFY">
+						<view class="busTispFY" v-if="dataList.PriceNotIncludeList&&dataList.PriceNotIncludeList.length>0">
 							费用不包含：
 							<text class="bus-tagText active" v-for="(item,index) in dataList.PriceNotIncludeList"
 							:key="index">
@@ -163,10 +165,13 @@
 							</text>
 						</view>
 					</view>
-					<view class="busTispTitle">购买须知</view>
-					<view class="busTispInfor">
-						{{ dataList.BuyNotes }}	
-					</view>
+					</template>
+					<template v-if="dataList.BuyNotes">
+						<view class="busTispTitle">购买须知</view>
+						<view class="busTispInfor">
+							{{ dataList.BuyNotes }}	
+						</view>
+					</template>
 					<view class="busTispTitle">
 						<view>接送点范围</view>	
 						<view v-for="(item,index) in dataList.PlaceList"
@@ -184,10 +189,13 @@
 						:scale="scale">
 						</map>
 					</view>
-					<view class="busTispTitle">取消政策</view>
-					<view class="busTispInfor" style="border: 0;">
-						{{ dataList.CancelPolicy }}
-					</view>
+					<template v-if="dataList.CancelPolicy">
+						<view class="busTispTitle">取消政策</view>
+						<view class="busTispInfor" style="border: 0;">
+							{{ dataList.CancelPolicy }}
+						</view>
+					</template>
+					
 				</view>
 			</view>
 
@@ -626,9 +634,19 @@
 						this.includePoints = []
 						this.dataList = res.data;
 						if(!this.orderMsg.CarId) {
-							this.orderMsg.CarId = this.dataList.CarTypeList[0].Id
-							this.orderMsg.CarName = this.dataList.CarTypeList[0].CarName
-							this.orderMsg.PeopleNum = this.dataList.CarTypeList[0].PeopleNum
+							if(this.busInfor.CarType!=3&&this.busInfor.peopleNum){
+								let i = this.dataList.CarTypeList.findIndex(item=>{
+									return item.PeopleNum>=this.busInfor.peopleNum
+								})
+								let item = this.dataList.CarTypeList[i]
+								this.orderMsg.CarId = item.Id
+								this.orderMsg.CarName = item.CarName
+								this.orderMsg.PeopleNum = item.PeopleNum
+							}else{
+								this.orderMsg.CarId = this.dataList.CarTypeList[0].Id
+								this.orderMsg.CarName = this.dataList.CarTypeList[0].CarName
+								this.orderMsg.PeopleNum = this.dataList.CarTypeList[0].PeopleNum
+							}
 						}
 						this.getPrices()
 						for (let i = 0; i < res.data.ImageList.length; i++) {

pages/bus/index.vue

@@ -272,6 +272,18 @@
                 startYear: 2025,
 			}
 		},
+        onLoad(options) {
+            
+        },
+        onShow() {
+            // uni.getStorage({
+			// 	key: "busInfor",
+			// 	success: (res) => {
+			// 		let obj = JSON.parse(res.data);
+			// 		this.busInfor = obj;
+			// 	},
+			// });
+        },
 		created() {
             this.startYear = this.$utils.GetDateFewFaysLater(0).year
 		},

pages/bus/order.vue

@@ -290,7 +290,7 @@
 					</view>
 
 				</view>
-				<view class="buyTispBox">
+				<view class="buyTispBox" v-if="dataList.BuyNotes">
 					<view class="big-title">
 						<text class="">购买说明</text>
 					</view>

pages/bus/orderInfor.vue

@@ -89,7 +89,7 @@
                 <view class="ResInforL">人数</view>
                 <view class="ResInforR">最多坐{{ orderInfor.PeopleNum}}人</view>
             </view>
-            <view class="ResInforText row">
+            <view class="ResInforText row" v-if="dataList.CancelPolicy">
                 <view class="ResInforL">取消政策</view>
                 <view class="ResInforR">
                   <text>