修改包车

pages/guidecar/bookaCarList.vue

@@ -403,7 +403,9 @@
 										<view class='chufatime'>
 											{{x.SiteList[x.SiteList.length-1].AboutTime!=null && x.SiteList[x.SiteList.length-1].AboutTime!=''?x.SiteList[x.SiteList.length-1].AboutTime:''}}
 										</view>
-										<view class="setoutdian" style="background: #DFBE6E;"></view>
+										<view class="setoutdian" v-if="x.SiteList[x.SiteList.length-1].Type==1"></view>
+										<view class="setoutdian" v-if="x.SiteList[x.SiteList.length-1].Type==2" style="background: #DFBE6E;"></view>
+										<view class="setoutdian" v-else style="background: #CCCCCC;"></view>
 										<view class="s-c-place">{{x.SiteList[x.SiteList.length-1].Name}}</view>
 									</view>
 									<view class="s-c-r sold">
@@ -419,8 +421,9 @@
 											<view class='chufatime'>
 												{{item.AboutTime!=null && item.AboutTime!=''?item.AboutTime:''}}
 											</view>
-											<view class="setoutdian" v-if="x.SiteList.length-1 !=index"></view>
-											<view class="setoutdian" v-else style="background: #DFBE6E;"></view>
+											<view class="setoutdian" v-if="item.Type==1"></view>
+											<view class="setoutdian" v-else-if="item.Type==2" style="background: #DFBE6E;"></view>
+											<view class="setoutdian" v-else style="background: #CCCCCC;"></view>
 											<view class="s-c-place">{{item.Name}}</view>
 										</view>
 										<view class="s-c-r prices" v-if="index==0">

pages/guidecar/components/Calendar.vue

@@ -5,7 +5,7 @@
 			<view style="width: 100%;height: 40px;padding:0 15px ;
 				display: flex;align-items: center;justify-content: flex-end;position: relative;
 			">
-				<u-icon name="close" color="#1C75FF" size="48" @click="closeHandler" />
+				<u-icon name="close" color="#111111" size="48" @click="closeHandler" />
 				<!-- //三角形 -->
 				<view class="sjx"></view>
 			</view>
@@ -92,7 +92,7 @@ export default {
     },
     themeColor: {//主题色
         type: [String],
-        default: "#1C75FF"
+        default: "#111111"
     }
   },
   data() {
@@ -442,7 +442,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-@color: #1C75FF;
+@color: #111111;
 .calendar-tz {
     width: 100%;
     height: 100vh;

pages/guidecar/map.vue

@@ -59,7 +59,7 @@
 				this.details.SiteList.forEach(x=>{
 					if(x.Type == 1){
 						this.upcar.push(x)
-					}else{
+					}else if(x.Type == 2){
 						this.downcar.push(x)
 					}
 				})

pages/guidecar/returncarList.vue

@@ -446,8 +446,10 @@
 									<view class="s-c-l">
 										<view class='chufatime'>
 											{{x.SiteList[x.SiteList.length-1].AboutTime!=null && x.SiteList[x.SiteList.length-1].AboutTime!=''?x.SiteList[x.SiteList.length-1].AboutTime:''}}
-										</view>
-										<view class="setoutdian" style="background: #DFBE6E;"></view>
+										</view>
+										<view class="setoutdian" v-if="x.SiteList[x.SiteList.length-1].Type==1"></view>
+										<view class="setoutdian" v-if="x.SiteList[x.SiteList.length-1].Type==2" style="background: #DFBE6E;"></view>
+										<view class="setoutdian" v-else style="background: #CCCCCC;"></view>
 										<view class="s-c-place">{{x.SiteList[x.SiteList.length-1].Name}}</view>
 									</view>
 									<view class="s-c-r sold">
@@ -463,8 +465,9 @@
 											<view class='chufatime'>
 												{{item.AboutTime!=null && item.AboutTime!=''?item.AboutTime:''}}
 											</view>
-											<view class="setoutdian" v-if="x.SiteList.length-1 !=index"></view>
-											<view class="setoutdian" v-else style="background: #DFBE6E;"></view>
+											<view class="setoutdian" v-if="item.Type==1"></view>
+											<view class="setoutdian" v-else-if="item.Type==2" style="background: #DFBE6E;"></view>
+											<view class="setoutdian" v-else style="background: #CCCCCC;"></view>
 											<view class="s-c-place">{{item.Name}}</view>
 										</view>
 										<view class="s-c-r prices" v-if="index==0">
@@ -662,7 +665,7 @@
 					let nowtime = date1.getFullYear() + "-" + carMonth + "-" + carDays;
 					this.msg.Q_Date = nowtime
 				}else{
-					this.msg.Q_Date = this.carMsg.Q_Date;
+					this.msg.Q_Date = this.carMsg.F_Date;
 				}
 				
 			}

pages/guidecar/specialCarReserve.vue

@@ -152,7 +152,7 @@
 				{{GoModel.ArriveCityName}}
 			</div>
 		</view>
-		<view class="box-top" style="height: 130px;" v-if="addMsg.BackPlanId>0">
+		<view class="box-top" style="height: 90px;" v-if="addMsg.BackPlanId>0">
 			<div class='onetext'>
 				{{GoModel.StartCityName}}
 			</div>
@@ -448,6 +448,22 @@
 					})
 					return
 				}
+				if(this.addMsg.BackPlanId && this.addMsg.BackPlanId>0){
+					if(this.addMsg.BackDepartAddress==''){
+						uni.showToast({
+							title:'请选择返程出发地点',
+							icon:'none'
+						})
+						return
+					}
+					if(this.addMsg.BackArriveAddress==''){
+						uni.showToast({
+							title:'请选择返程到达地点',
+							icon:'none'
+						})
+						return
+					}
+				}
 				if((this.addMsg.PeopleNumber+this.addMsg.ChildNumber)<1){
 					uni.showToast({
 						title:'请选择出发人数',

pages/jiuzhai/allorderList.vue

@@ -249,13 +249,18 @@
 						</view>
 						
 					</view>
-					
-					<view style="font-size: 14px;color: #111111;margin-top: 10px;text-align: right;" v-if="item.OrderType == 4">
-						总人数:{{item.CarList[0].PeopleNumber+item.CarList[0].ChildNumber}}人
-					</view>
-					<view style="font-size: 14px;color: #111111;margin-top: 10px;text-align: right;">
-						金额:￥{{item.PreferPrice}}元
+					<view style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin-top: 10px;font-size: 14px;color: #111111;">
+						<view style="" >
+							<span v-if="item.OrderType == 4">
+								人数：{{item.CarList[0].PeopleNumber+item.CarList[0].ChildNumber}}人
+							</span>
+							
+						</view>
+						<view>
+							￥{{item.PreferPrice}}元
+						</view>
 					</view>
+					
 					<view style="display: flex;justify-content: flex-end;margin-top: 5px;">
 						<view class="zailaiyidan" v-if="item.OrderStatus == 3 || item.OrderStatus == 4 || item.OrderStatus == 5" @click.stop="onemoreorder(item)">
 							再来一单