Skip to content

A
Athena
Commit 4756507a authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

下单添加交通列表判断和行动装置判断

parent 0fdb1b72
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 15 deletions
src/components/FreeTravel/FreeDetail.vue
View file @ 4756507a
...@@ -19,9 +19,10 @@ ...@@ -19,9 +19,10 @@
<img src="../../assets/img/free/xc.png" alt=""> <img src="../../assets/img/free/xc.png" alt="">
<span>行程时间{{dataDetail.hours}}小时</span> <span>行程时间{{dataDetail.hours}}小时</span>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6" v-if="dataDetail.guide_lang_list">
<img src="../../assets/img/free/yy.png" alt=""> <img src="../../assets/img/free/yy.png" alt="">
<span v-for="(item, index) in dataDetail.guide_lang_list">{{item.lang_name}} <span v-show="dataDetail.guide_lang_list.length==0">暂无</span>
<span v-for="(item, index) in dataDetail.guide_lang_list" :key="index+5000">{{item.lang_name}}
<span v-if="index != dataDetail.guide_lang_list.length -1 ">/</span> </span> <span v-if="index != dataDetail.guide_lang_list.length -1 ">/</span> </span>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -467,7 +468,9 @@ export default { ...@@ -467,7 +468,9 @@ export default {
this.mealType=res.data.data; this.mealType=res.data.data;
this.msgObj.guid=this.mealType.guid; this.msgObj.guid=this.mealType.guid;
this.dateList=this.mealType.sale_dates.saleDt; if(this.mealType.sale_dates.saleDt){
this.dateList=this.mealType.sale_dates.saleDt;
}
this.dateList.forEach(item=>{ this.dateList.forEach(item=>{
item.YM=item.sale_day.substring(0,4)+"-"+item.sale_day.substring(4,6); item.YM=item.sale_day.substring(0,4)+"-"+item.sale_day.substring(4,6);
item.dateStr=item.sale_day.substring(0,4)+"-"+item.sale_day.substring(4,6)+"-"+item.sale_day.substring(6,8); item.dateStr=item.sale_day.substring(0,4)+"-"+item.sale_day.substring(4,6)+"-"+item.sale_day.substring(6,8);
......
src/components/FreeTravel/OrderConfirmation.vue
View file @ 4756507a
...@@ -128,7 +128,84 @@ ...@@ -128,7 +128,84 @@
</div> </div>
</el-form> </el-form>
<!--车 -->
<el-form class="OrderConForm" :model="traffic" ref="traffic" label-width="100px">
<div v-show="traffic.car.length>0" class="commomStyle">
<div class="titleDiv">
<span class="redSpan"></span>
<span class="f18 pfR">交通列表</span>
</div>
<el-row class="trafficList" v-for="(item,index) in traffic.car" :key="index+100">
<el-col :span="2" class="c88" style="text-align:center;padding-top:27px">{{index+1}}</el-col>
<el-col :span="20">
<div class="f12" style="padding:20px;padding-left:80px">
<el-form-item label="出发地" :prop="'car.'+index+'.s_location'" :rules="[{ required: true, message: '请填写出发地', trigger: 'blur' }]">
<el-input placeholder="请填写出发地" size="mini" style="width:220px" v-model="item.s_location"></el-input>
</el-form-item>
<el-form-item label="目的地" :prop="'car.'+index+'.e_location'" :rules="[{ required: true, message: '请填写目的地', trigger: 'blur' }]">
<el-input placeholder="请填写目的地" size="mini" style="width:220px" v-model="item.e_location"></el-input>
</el-form-item>
<el-form-item label="出发地址" :prop="'car.'+index+'.s_address'" :rules="[{ required: true, message: '请填写出发地址', trigger: 'blur' }]">
<el-input placeholder="请填写出发地址" size="mini" style="width:220px" v-model="item.s_address"></el-input>
</el-form-item>
<el-form-item label="目的地址" :prop="'car.'+index+'.e_address'" :rules="[{ required: true, message: '请填写目的地址', trigger: 'blur' }]">
<el-input placeholder="请填写目的地址" size="mini" style="width:220px" v-model="item.e_address"></el-input>
</el-form-item>
<el-form-item label="出发日" :prop="'car.'+index+'.s_date'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]">
<el-date-picker
size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
v-model="item.s_date"></el-date-picker>
</el-form-item>
<el-form-item label="抵达日" :prop="'car.'+index+'.e_date'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]">
<el-date-picker
size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
v-model="item.e_date"></el-date-picker>
</el-form-item>
<el-form-item label="出发时间">
<el-time-picker
v-model="item.s_time"
value-format="HH:mm:ss"
placeholder="请选择">
</el-time-picker>
</el-form-item>
<el-form-item label="到达时间">
<el-time-picker
v-model="item.e_time"
value-format="HH:mm:ss"
placeholder="请选择">
</el-time-picker>
</el-form-item>
</div>
</el-col>
</el-row>
</div>
</el-form>
<!-- 行动装置 -->
<el-form class="OrderConForm" :model="mobile_device" label-width="100px">
<div v-show="mobile_deviceStatus" class="commomStyle">
<div class="titleDiv">
<span class="redSpan"></span>
<span class="f18 pfR">行动装置</span>
</div>
<div class="f12" style="padding:20px;padding-left:80px">
<el-form-item label="手机型号">
<el-input placeholder="请输入手机型号" size="mini" style="width:220px" v-model="mobile_device.mobile_model_no"></el-input>
</el-form-item>
<el-form-item label="手机IMEI">
<el-input placeholder="手机IMEI" size="mini" style="width:220px" v-model="mobile_device.IMEI"></el-input>
</el-form-item>
<el-form-item label="启用日">
<el-date-picker
size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
v-model="mobile_device.active_date"></el-date-picker>
</el-form-item>
</div>
</div>
</el-form>
<el-form class="OrderConForm" :model="freeMsg" label-width="100px"> <el-form class="OrderConForm" :model="freeMsg" label-width="100px">
<div v-show="payObj.type=='01'" class="commomStyle"> <div v-show="payObj.type=='01'" class="commomStyle">
<div class="titleDiv"> <div class="titleDiv">
...@@ -157,10 +234,10 @@ ...@@ -157,10 +234,10 @@
</div> </div>
</div> </div>
</el-form> </el-form>
<!-- <el-button :loading="BtnLoading" @click="PayBtn" class="OrderConBtn"> <el-button :loading="BtnLoading" @click="PayBtn" class="OrderConBtn">
下一步，支付 下一步，支付
</el-button> --> </el-button>
</div> </div>
</div> </div>
<div class="right" style="width:388px;box-sizing:border-box"> <div class="right" style="width:388px;box-sizing:border-box">
...@@ -269,14 +346,19 @@ export default { ...@@ -269,14 +346,19 @@ export default {
customNew:[], customNew:[],
}, },
picUrl:"", picUrl:"",
trafficState:false,
traffic:{
car:[],
},
mobile_device:{},
mobile_deviceStatus:false,
} }
}, },
created(){ created(){
this.freeMsg = JSON.parse(sessionStorage.getItem("freeMsg")); this.freeMsg = JSON.parse(sessionStorage.getItem("freeMsg"));
let id = this.$route.query.id; let id = this.$route.query.id;
this.freeMsg.buyer_country="CN"; this.freeMsg.buyer_country="CN";
this.freeMsg.guide_lang="zh-cn"; this.freeMsg.guide_lang="";
this.freeMsg.custom=[]; this.freeMsg.custom=[];
this.freeMsg.pay={}; this.freeMsg.pay={};
this.freeMsg.buyer_tel_country_code="86"; this.freeMsg.buyer_tel_country_code="86";
...@@ -310,6 +392,7 @@ export default { ...@@ -310,6 +392,7 @@ export default {
PayBtn(){ PayBtn(){
let freeformval=false; let freeformval=false;
let listformval=false; let listformval=false;
let trafficval=false;
this.$refs.freeMsg.validate((valid) => { this.$refs.freeMsg.validate((valid) => {
if (valid) { if (valid) {
freeformval=true; freeformval=true;
...@@ -320,15 +403,16 @@ export default { ...@@ -320,15 +403,16 @@ export default {
listformval=true; listformval=true;
} }
}); });
if(!freeformval&&!listformval){ this.$refs.traffic.validate((valid) => {
if (valid) {
trafficval=true;
}
});
if(!freeformval || !listformval || !trafficval){
return; return;
} }
// if(this.guide_langList.length>0){
// if(this.freeMsg.guide_lang==""){
// this.Error("导览语系不能为空！");
// return;
// }
// }
if(this.freeMsg.buyer_last_name==""||!this.freeMsg.buyer_last_name){ if(this.freeMsg.buyer_last_name==""||!this.freeMsg.buyer_last_name){
this.Error("请输入预订人的名"); this.Error("请输入预订人的名");
return; return;
...@@ -353,6 +437,29 @@ export default { ...@@ -353,6 +437,29 @@ export default {
msg.cus_type="contact"; msg.cus_type="contact";
this.listform.customNew.push(msg); this.listform.customNew.push(msg);
} }
}
if(this.trafficState){
this.freeMsg.traffic=this.traffic;
}
if(this.guide_langList.length==0){
this.freeMsg.guide_lang="zh-cn";
}
// 行动装置
if(this.mobile_deviceStatus){
if(this.mobile_device.mobile_model_no=="" || !this.mobile_device.mobile_model_no){
this.Error("请输入手机型号！");
return;
}
if(this.mobile_device.IMEI=="" || !this.mobile_device.IMEI){
this.Error("请输入IMEI！");
return;
}
if(this.mobile_device.active_date=="" || !this.mobile_device.active_date){
this.Error("请选择启用日！");
return;
}
this.freeMsg.mobile_device=this.mobile_device;
} }
this.freeMsg.custom=this.listform.customNew; this.freeMsg.custom=this.listform.customNew;
if(this.payObj.type=='01'){ if(this.payObj.type=='01'){
...@@ -380,7 +487,10 @@ export default { ...@@ -380,7 +487,10 @@ export default {
this.freeMsg.pay=this.payObj; this.freeMsg.pay=this.payObj;
} }
// console.log("可以下单")
// return;
this.BtnLoading=true; this.BtnLoading=true;
this.apipost('dmc_post_Get_KKDayOrderBooking',this.freeMsg,res=>{ this.apipost('dmc_post_Get_KKDayOrderBooking',this.freeMsg,res=>{
this.BtnLoading=false; this.BtnLoading=false;
...@@ -507,6 +617,43 @@ export default { ...@@ -507,6 +617,43 @@ export default {
this.markMsg.guide_lang=true; this.markMsg.guide_lang=true;
this.guide_langList=customObj.guide_lang.list_option; this.guide_langList=customObj.guide_lang.list_option;
} }
// 车
if(this.booking_field.traffic){
if(this.booking_field.traffic.car){
this.trafficState=true;
if(this.booking_field.traffic.car.traffic_type.list_option){
let list=this.booking_field.traffic.car.traffic_type.list_option;
list.forEach(item=>{
let obj={
traffic_type:item,
s_location:"",
e_location:'',
s_address:'',
e_address:'',
s_date:'',
e_date:'',
s_time:'',
e_time:'',
}
this.traffic.car.push(obj)
})
}
console.log("this.traffic.car",this.traffic.car)
}
}
// 行动装置
if(this.booking_field.mobile_device){
this.mobile_device={
mobile_model_no:'',
IMEI:'',
active_date:'',
};
this.mobile_deviceStatus=true;
}
} }
...@@ -536,6 +683,12 @@ export default { ...@@ -536,6 +683,12 @@ export default {
<style> <style>
@import '../../assets/css/common.css'; @import '../../assets/css/common.css';
.OrderCon .trafficList{
border-bottom:1px solid rgba(224, 224, 224, 1)
}
.OrderCon .trafficList:last-child{
border: none;
}
.OrderCon .OrderConBtn{ .OrderCon .OrderConBtn{
width:100%; width:100%;
height:66px; height:66px;
......
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