Skip to content

J
jz_Travel
Commit 3ee9aaed authored by Mac's avatar Mac
Browse files
Options

包车的修改

parent 5225039d
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 61 deletions
pages/guidecar/map.vue
View file @ 3ee9aaed
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
let that = this let that = this
uni.navigateBack({ uni.navigateBack({
success: function() { success: function() {
beforePage.$vm.getbackData(that.details.type,x.Id); // 执行前一个页面的方法 beforePage.$vm.getbackData(that.details.type,x.Id,that.details.goback); // 执行前一个页面的方法
} }
}); });
} }
......
pages/guidecar/specialCarReserve.vue
View file @ 3ee9aaed
...@@ -169,40 +169,40 @@ ...@@ -169,40 +169,40 @@
{{GoModel.ArriveCityName}} {{GoModel.ArriveCityName}}
</div> </div>
</view> </view>
<view class="addresStyle" style="padding: 0 15px;height: 40px;"> <view class="addresStyle" style="padding: 0 15px;height: 40px;" v-if="addMsg.BackPlanId>0">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/gocar.png" mode="aspectFill" style="width: 20px;height: 20px;"></image> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/gocar.png" mode="aspectFill" style="width: 20px;height: 20px;"></image>
<span>去程</span> <span style='margin-left: 5px;font-size: 14px;font-family: PingFang SC;font-weight: 800;color: #1B1D1E;'>去程</span>
</view> </view>
<view class="addresStyle"> <view class="addresStyle">
<view class="address-l-h"></view> <view class="address-l-h"></view>
<view class="addresStyle-text" @click="shijiup(1)"> <view class="addresStyle-text" @click="shijiup(1,1)">
<span v-if="addMsg.DepartAddress==''">请选择实际上车点</span> <span v-if="addMsg.DepartAddress==''">请选择实际上车点</span>
<span v-else style='color: #111;'>{{addMsg.DepartAddress}}</span> <span v-else style='color: #111;'>{{addMsg.DepartAddress}}</span>
</view> </view>
</view> </view>
<view class="addresStyle"> <view class="addresStyle">
<view class="address-l-h2"></view> <view class="address-l-h2"></view>
<view class="addresStyle-text" @click="shijiup(2)"> <view class="addresStyle-text" @click="shijiup(2,1)">
<span v-if="addMsg.ArriveAddress==''">请选择实际下车点</span> <span v-if="addMsg.ArriveAddress==''">请选择实际下车点</span>
<span v-else style='color: #111;'>{{addMsg.ArriveAddress}}</span> <span v-else style='color: #111;'>{{addMsg.ArriveAddress}}</span>
</view> </view>
</view> </view>
<view class="addresStyle" style="padding: 0 15px;height: 40px;"> <view class="addresStyle" style="padding: 0 15px;height: 40px;" v-if="addMsg.BackPlanId>0">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/returncar.png" mode="aspectFill" style="width: 20px;height: 20px;"></image> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/returncar2.png" mode="aspectFill" style="width: 20px;height: 20px;"></image>
<span>返程</span> <span style='margin-left: 5px;font-size: 14px;font-family: PingFang SC;font-weight: 800;color: #1B1D1E;'>返程</span>
</view> </view>
<view class="addresStyle"> <view class="addresStyle" v-if="addMsg.BackPlanId>0">
<view class="address-l-h"></view> <view class="address-l-h"></view>
<view class="addresStyle-text" @click="shijiup(1)"> <view class="addresStyle-text" @click="shijiup(1,2)">
<span v-if="addMsg.DepartAddress==''">请选择实际上车点</span> <span v-if="addMsg.BackDepartAddress==''">请选择实际上车点</span>
<span v-else style='color: #111;'>{{addMsg.DepartAddress}}</span> <span v-else style='color: #111;'>{{addMsg.BackDepartAddress}}</span>
</view> </view>
</view> </view>
<view class="addresStyle"> <view class="addresStyle" v-if="addMsg.BackPlanId>0">
<view class="address-l-h2"></view> <view class="address-l-h2"></view>
<view class="addresStyle-text" @click="shijiup(2)"> <view class="addresStyle-text" @click="shijiup(2,2)">
<span v-if="addMsg.ArriveAddress==''">请选择实际下车点</span> <span v-if="addMsg.BackArriveAddress==''">请选择实际下车点</span>
<span v-else style='color: #111;'>{{addMsg.ArriveAddress}}</span> <span v-else style='color: #111;'>{{addMsg.BackArriveAddress}}</span>
</view> </view>
</view> </view>
<view class="item-s"> <view class="item-s">
...@@ -314,6 +314,8 @@ ...@@ -314,6 +314,8 @@
Backdowncar:[], Backdowncar:[],
upid:0, upid:0,
downid:0, downid:0,
Backupid:0,
Backdownid:0,
orderInfo:{}, orderInfo:{},
showtime2:'', showtime2:'',
backtime:'', backtime:'',
...@@ -349,25 +351,38 @@ ...@@ -349,25 +351,38 @@
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
methods:{ methods:{
shijiup(type){ shijiup(type,goback){
let SelectID = 0 let SelectID = 0 ;
let SiteList = []
if(goback==1){//去程
if(type==1){ if(type==1){
SelectID = this.upid; SelectID = this.upid;
}else{ }else{
SelectID = this.downid; SelectID = this.downid;
} }
SiteList = this.GoModel.SiteList
}else{//返程
if(type==1){
SelectID = this.Backupid;
}else{
SelectID = this.Backdownid;
}
SiteList = this.BackModel.SiteList
}
let obj = { let obj = {
type:type,//上车点 type:type,//上车点或者下车点
SiteList:this.GoModel.SiteList, goback:goback,//去程还是返程
SelectID:SelectID SiteList:SiteList,
SelectID:SelectID,
} }
obj = encodeURIComponent(JSON.stringify(obj)) obj = encodeURIComponent(JSON.stringify(obj))
uni.navigateTo({ uni.navigateTo({
url: '/pages/guidecar/map?obj='+ obj url: '/pages/guidecar/map?obj='+ obj
}) })
}, },
getbackData(type,ID){//地图选择返回参数 getbackData(type,ID,goback){//地图选择返回参数
console.log(type,ID) console.log(type,ID,goback)
if(goback == 1){//去程的情况
if(type==1){ if(type==1){
this.upcar.map(x=>{ this.upcar.map(x=>{
if(x.Id == ID){ if(x.Id == ID){
...@@ -386,6 +401,27 @@ ...@@ -386,6 +401,27 @@
} }
}) })
} }
}else{//返程的情况
if(type==1){
this.Backupcar.map(x=>{
if(x.Id == ID){
this.addMsg.BackDepartAddress = x.Name;
this.Backupid = x.Id;
this.addMsg.BackDepartureTime = x.AboutTime;//出发时间的赋值
return
}
})
}else{
this.Backdowncar.map(x=>{
if(x.Id == ID){
this.addMsg.BackArriveAddress = x.Name;
this.Backdownid = x.Id;
return
}
})
}
}
}, },
valChange(val){//数值改变更改总价 valChange(val){//数值改变更改总价
let value = val.value; let value = val.value;
...@@ -443,7 +479,7 @@ ...@@ -443,7 +479,7 @@
title: '下单中...' title: '下单中...'
}) })
that.request2({ that.request2({
url: '/api/AppletCar/SetAppletCarOrderInfo', url: '/api/AppletCar/SetAppletCarOrderInfo_V2',
data: that.addMsg data: that.addMsg
}, },
res => { res => {
...@@ -531,11 +567,13 @@ ...@@ -531,11 +567,13 @@
uni.hideLoading() uni.hideLoading()
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.GoModel = res.data.GoModel this.GoModel = res.data.GoModel
this.BackModel = res.data.BackModel this.BackModel = res.data.BackModel;
let BackPrice = (this.$utils.getretailer()==true ? this.BackModel.Price?this.BackModel.Price:0 :this.BackModel.B2CPrice?this.BackModel.B2CPrice:0)
this.addMsg.Unit_Price = (this.$utils.getretailer()==true ? this.GoModel.Price :this.GoModel.B2CPrice) + Number(BackPrice)
console.log(this.addMsg.Unit_Price)
this.addMsg.DepartureTime = this.GoModel.StartDate; this.addMsg.DepartureTime = this.GoModel.StartDate;
this.addMsg.Unit_Price = (this.$utils.getretailer()==true ? this.GoModel.Price :this.GoModel.B2CPrice) ;
this.addMsg.BackDepartureTime = this.BackModel.StartDate?this.BackModel.StartDate:''; this.addMsg.BackDepartureTime = this.BackModel.StartDate?this.BackModel.StartDate:'';
// this.addMsg.Unit_Price = (this.$utils.getretailer()==true ? this.GoModel.Price :this.GoModel.B2CPrice) ;
this.upcar = []; this.upcar = [];
this.downcar = [] this.downcar = []
......
pages/jiuzhai/allorderList.vue
View file @ 3ee9aaed
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
overflow: hidden;white-space: nowrap;text-overflow: ellipsis; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
margin-top: 15px;
} }
.car-w{ .car-w{
width: 100%; width: 100%;
...@@ -43,6 +44,7 @@ ...@@ -43,6 +44,7 @@
} }
.hotelbox{ .hotelbox{
display: flex; display: flex;
margin-top: 15px;
.hotelbox-r{ .hotelbox-r{
width: calc(100vw - 40px - 60px); width: calc(100vw - 40px - 60px);
font-size: 12px; font-size: 12px;
...@@ -84,6 +86,61 @@ ...@@ -84,6 +86,61 @@
margin-left: 10px; margin-left: 10px;
border: 1px solid #111111; border: 1px solid #111111;
} }
.s-c-o {
display: flex;
align-items: center;
justify-content: space-between;
}
.s-c-l {
flex: 1;
width: 1px;
display: flex;
align-items: flex-start;
margin-left: 28px;
}
.s-c-r {
width: 100px;
}
.chufatime {
width: 44px;
font-size: 11px;
font-weight: 500;
color: #111111;
line-height: 25px;
}
.setoutdian {
width: 5px;
height: 5px;
border-radius: 50%;
background: #111111;
margin-top: 10px;
margin-right: 2px;
}
.s-c-place {
font-size: 12px;
color: #333333;
line-height: 25px;
width: calc(100vw - 60px - 44px - 5px - 100px - 2px);
}
.shuxian {
width: 1px;
height: 10px;
background: #111111;
margin-left: 29px;
}
.prices {
color: #111111;
font-size: 14px;
display: flex;
align-items: center;
justify-content: flex-end;
}
} }
</style> </style>
<template> <template>
...@@ -143,12 +200,40 @@ ...@@ -143,12 +200,40 @@
<view class="order_center" v-if="item.OrderType == 4"> <view class="order_center" v-if="item.OrderType == 4">
<view v-for="(x,y) in item.CarList" :key='y' > <view v-for="(x,y) in item.CarList" :key='y' >
<view class="car-o" > <view class="car-o" >
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zhuanghuan.png" mode="aspectFill" style="width: 18px;height: 18px;"></image> <image v-if="item.IsGoBack == 2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zhuanghuan.png" mode="aspectFill" style="width: 18px;height: 18px;"></image>
<image v-if="item.IsGoBack == 1 && y==0" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/gocar.png" mode="aspectFill" style="width: 18px;height: 18px;"></image>
<image v-if="item.IsGoBack == 1 && y==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/returncar2.png" mode="aspectFill" style="width: 18px;height: 18px;"></image>
<span style='margin-left: 10px;'>{{x.StartCityName}}</span> <span style='margin-left: 10px;'>{{x.StartCityName}}</span>
<span style='margin: 0 3px;'>-</span> <span style='margin: 0 3px;'>-</span>
<span>{{x.ArriveCityName}}</span> <span>{{x.ArriveCityName}}</span>
</view> </view>
<view class="car-w"> <view class="car-w" style="margin-left: 28px;font-weight: bold;line-height: 24px;color: #111111;">
出发日期:{{x.Date}} {{x.DepartureTime}}
</view>
<view class="s-c-box">
<view class="s-c-o">
<view class="s-c-l">
<view class="setoutdian"></view>
<view class="s-c-place">{{x.DepartAddress}}</view>
</view>
<view class="s-c-r prices">
<span style='margin-top: 3px;font-size: 11px;'>单价￥</span>
<span style='font-weight: bold;'>{{x.Unit_Price}}</span>
</view>
</view>
<view class="shuxian"></view>
<view class="s-c-o">
<view class="s-c-l">
<view class="setoutdian" style="background: #DFBE6E;"></view>
<view class="s-c-place">{{x.ArriveAddress}}</view>
</view>
</view>
</view>
<!-- <view class="car-w">
上车地点:{{x.DepartAddress}} 上车地点:{{x.DepartAddress}}
</view> </view>
<view class="car-w"> <view class="car-w">
...@@ -159,11 +244,15 @@ ...@@ -159,11 +244,15 @@
</view> </view>
<view class="car-w"> <view class="car-w">
总数:{{x.PeopleNumber+x.ChildNumber}}人 单价:￥{{x.Unit_Price.toFixed(2)}}元 总数:{{x.PeopleNumber+x.ChildNumber}}人 单价:￥{{x.Unit_Price.toFixed(2)}}元
</view> </view> -->
<view class="order_xu"></view> <view class="order_xu"></view>
</view> </view>
</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;"> <view style="font-size: 14px;color: #111111;margin-top: 10px;text-align: right;">
金额:￥{{item.PreferPrice}}元 金额:￥{{item.PreferPrice}}元
</view> </view>
......
pages/jiuzhai/allorderdetails.vue
View file @ 3ee9aaed
...@@ -247,7 +247,10 @@ ...@@ -247,7 +247,10 @@
<view class="box-top-car"> <view class="box-top-car">
<div class='onetext'>{{x.StartCityName}}</div> <div class='onetext'>{{x.StartCityName}}</div>
<view class="box-top-c"> <view class="box-top-c">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622098352000_930.png" mode="widthFix" style="width: 30px;height: auto;"></image> <!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622098352000_930.png" mode="widthFix" style="width: 30px;height: auto;"></image> -->
<image v-if="OrderInfo.IsGoBack == 2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zhuanghuan.png" mode="aspectFill" style="width: 18px;height: 18px;"></image>
<image v-if="OrderInfo.IsGoBack == 1 && y==0" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/gocar.png" mode="aspectFill" style="width: 18px;height: 18px;"></image>
<image v-if="OrderInfo.IsGoBack == 1 && y==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/returncar.png" mode="aspectFill" style="width: 18px;height: 18px;"></image>
</view> </view>
<div class='onetext'>{{x.ArriveCityName}}</div> <div class='onetext'>{{x.ArriveCityName}}</div>
</view> </view>
...@@ -272,14 +275,6 @@ ...@@ -272,14 +275,6 @@
<view class="box-c-caritem-l">出行时间</view> <view class="box-c-caritem-l">出行时间</view>
<view class="box-c-caritem-r">{{x.Date}} {{x.DepartureTime}}</view> <view class="box-c-caritem-r">{{x.Date}} {{x.DepartureTime}}</view>
</view> </view>
<view class="box-c-caritem" v-if="x.PeopleNumber>0">
<view class="box-c-caritem-l">成人</view>
<view class="box-c-caritem-r">{{x.PeopleNumber}}人</view>
</view>
<view class="box-c-caritem" v-if="x.ChildNumber>0">
<view class="box-c-caritem-l">儿童</view>
<view class="box-c-caritem-r">{{x.ChildNumber}}人</view>
</view>
<view class="box-c-caritem" > <view class="box-c-caritem" >
<view class="box-c-caritem-l">单价</view> <view class="box-c-caritem-l">单价</view>
<view class="box-c-caritem-r">￥{{x.Unit_Price}}元</view> <view class="box-c-caritem-r">￥{{x.Unit_Price}}元</view>
...@@ -287,6 +282,19 @@ ...@@ -287,6 +282,19 @@
</view> </view>
</view> </view>
</view>
<view class="box-center" v-if="OrderInfo.OrderType == 4">
<view class="box-c-car">
<view class="box-c-caritem" v-if="OrderInfo.CarList[0].PeopleNumber>0">
<view class="box-c-caritem-l">成人</view>
<view class="box-c-caritem-r">{{OrderInfo.CarList[0].PeopleNumber}}人</view>
</view>
<view class="box-c-caritem" v-if="OrderInfo.CarList[0].ChildNumber>0">
<view class="box-c-caritem-l">儿童</view>
<view class="box-c-caritem-r">{{OrderInfo.CarList[0].ChildNumber}}人</view>
</view>
</view>
</view> </view>
<view class="box-center"> <view class="box-center">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment