Skip to content

A
Athena
Commit c3c76787 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

添加详情。修改定制游列表选择条件

parent d231fc66
Hide whitespace changes
Inline Side-by-side
Showing with 218 additions and 11 deletions
src/assets/css/home.css
View file @ c3c76787
......@@ -666,4 +666,11 @@ p {
line-height: 34px;
background: url('../img/home/qipao.png') no-repeat;
background-size:100% 100%;
}
/* 修改样式 */
.Home .visa .el-tabs__nav-wrap::after{
height: 1px;
background-color: #d8d8d8;
}
\ No newline at end of file
src/components/DependentTravel/CustomizedTourism.vue
View file @ c3c76787
<template>
<div class="CustomizedTourism">
<div class="CustomizedTourism DesignScheme">
<div class="w1200" v-loading="loading">
<div class="step_head" style="position:relative">
<p class="step_head_title">{{dataInfo.departureName}}-{{dataInfo.destinationNames}}/{{dataInfo.playDays}}天*定制游</p>
......@@ -139,13 +139,177 @@
<span><em>需求包含</em>：{{dataInfo.provideItem}}</span>
<span><em>游玩天数</em>：{{dataInfo.playDays}}天</span>
</p>
<p><em>放完日期</em>：出发日期（{{dataInfo.startDate | YMD}}）</p>
<p><em>往返日期</em>：出发日期（{{dataInfo.startDate | YMD}}）</p>
</li>
<li style="text-align:right;float:right">
<img style="width:50px;height:50px;border-radius:50%" :src="dataInfo.salesPhoto" alt="">
<p style="text-align:center">{{dataInfo.salesName}}</p>
</li>
<p style="margin-top:15px;font-size:12px;text-align:center;position:absolute;bottom:40px;right:60px">
<span @click="GetDes" :class="desshow?'desstatus':''" style="color:#666666;cursor:pointer">查看行程详情 <i class="iconfont icon-more"></i></span>
</p>
</ul>
<!-- 查看详情 -->
<div v-loading="desLoad" v-show="desshow" class="cutomdes">
<p class="title"> {{dataInfo.salesName}}——定制游详情</p>
<div style="position:relative;">
<p class="xcap"></p>
<div style="padding-top: 80px;">
<div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100">
<div style="padding-left:36px;margin-bottom:30px;">
<span class="dayindex">D{{item.dayNum}}</span>
<!-- <span class="daytitle">出发东京迪士尼，探寻梦幻王国（专车送去迪士尼）</span> -->
</div>
<div class="common_left" v-for="(des,index) in item.dayArray" :key="index+2000">
<!-- 酒店 -->
<div v-if="des.type==3" class="commonday">
<div class="commonday_item">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape"></span>
</span>
<p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{des.childItem.hotelName}}</span></p>
<div v-if="des.childItem.description" style="font-size:14px;margin-top:20px">
<div v-html="des.childItem.description">
</div>
</div>
</div>
</div>
<!-- 航班信息 -->
<!-- <div class="commonday" >
<div class="commonday_item">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape1"></span>
</span>
<p style="font-size:16px;"><span>航班</span><span style="font-size:12px;color:#666666;">（参考）</span></p>
<div style="font-size:14px;margin-top:20px">
<ul class="hbxf">
<li>
<p>田间航空公司</p>
<p>Gs7979</p>
</li>
<li>
<p class="pfR font16">13:15</p>
<p>国际机场</p>
</li>
<li>
. . . . . .
</li>
<li>
<p class="pfR font16">13:15</p>
<p>国际机场</p>
</li>
<li>
<p>经济舱</p>
</li>
</ul>
</div>
</div>
</div> -->
<!-- 交通 -->
<div v-if="des.type==1" class="commonday">
<div class="commonday_item">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
</span>
<p style="font-size:16px;"><span>交通</span></p>
<div style="font-size:14px;margin-top:20px">
<span v-if="des.childItem.trafficIntroduce">{{des.childItem.trafficIntroduce.introduceDetail}}</span>
</div>
</div>
</div>
<!-- 景点 -->
<div v-if="des.type==2" class="commonday">
<div class="commonday_item">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape4"></span>
</span>
<p style="font-size:16px;"><span>景点</span></p>
<div v-if="index==0" v-for="(img,index) in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div v-if="des.childItem.description" style="float:left;margin-left:20px;width:719px">
<p v-html="des.childItem.description"></p>
</div>
</div>
</div>
</div>
<!-- 餐饮 -->
<div v-if="des.type==4" class="commonday commonHover">
<div class="commonday_item">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape5"></span>
</span>
<p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">一{{des.childItem.dinnerName}}</span></p>
<div v-if="index==0" v-for="(img,index) in des.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div v-if="des.childItem.description" style="float:left;margin-left:20px;width:719px">
<p v-html="des.childItem.description"></p>
</div>
</div>
</div>
</div>
<!-- 温馨提示 -->
<div v-if="des.type==6" class="commonday">
<div class="commonday_item">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape6"></span>
</span>
<p style="font-size:16px;"><span>温馨提示</span></p>
<div v-if="des.childItem.description" style="font-size:14px;margin-top:20px">
<div v-html="des.childItem.description">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div style="position:relative;margin-top:30px;padding:0 0 30px 60px">
<p class="ygbj"></p>
<p style="font-size:14px;padding-top:60px">
价格：<span style="color:#FB8F0F;font-size:18px;">￥{{dataInfo.planPrice}}</span>人/起
</p>
<p style="color:#666666;font-size:12px;padding-top:10px">该价格为案例参考报价，最终价格以实际合同为准</p>
<p style="color:#333;font-size:14px;padding-top:10px">费用包含：酒店；签证；机票</p>
</div>
</div>
</div>
<p class="title">合同签订</p>
<div class="htqd">
<div v-for="(item,index) in dataInfo.contractFile" :key="index+200">
......@@ -175,11 +339,15 @@ import DesignScheme from '@/components/DependentTravel/DesignScheme'
export default {
data () {
return {
desshow:false,
desLoad:false,
actice_step:0,
customId:0,
loading:false,
dataInfo:{},
tcid:0,
configId:0,
datades:{},
}
},
components:{
......@@ -193,6 +361,25 @@ export default {
},
methods: {
GetDes(){
this.desshow=!this.desshow;
if(this.desshow==false){
return;
}
this.desLoad=true;
let msg={};
msg.configId=this.configId;
msg.tcid=this.tcid;
this.apipost('b2b_get_GetB2BFreeTravelCustomPlanInfo',msg,res=>{
this.desLoad=false;
if(res.data.resultCode==1){
this.datades=res.data.data;
}else{}
},err=>{})
},
ExitOrder(){
this.$confirm("确认取消订单?", '提示', {
confirmButtonText: '确定',
......@@ -215,9 +402,11 @@ export default {
this.apiJavaPost('/api/b2b/free/getTravelCustomOrderInfo',{customId: this.customId},res=>{
this.loading=false;
// console.log("GetStatus父组件");
console.log(res);
if(res.data.resultCode==1){
this.dataInfo=res.data.data;
this.tcid=this.dataInfo.tcid;
this.configId=this.dataInfo.configId;
this.actice_step=this.dataInfo.orderStatus;
}else{
this.Error(res.data.message);
......@@ -229,14 +418,21 @@ export default {
</script>
<style>
.stepHalf{
.CustomizedTourism .cutomdes{
transition: all linear 0.5s;
}
.CustomizedTourism .commonday{
padding:0 60px;
box-sizing: border-box;
}
.CustomizedTourism .stepHalf{
width: 100%;
height: 4px;
position: absolute;
top: 22px;
left:0;
}
.stepHalf i{
.CustomizedTourism .stepHalf i{
display: inline-block;
width: 50%;
height: 100%;
......@@ -244,11 +440,11 @@ export default {
top: 0;
}
.stepHalf i:nth-child(1){
.CustomizedTourism .stepHalf i:nth-child(1){
background: #409EFF;
left: 0;
}
.stepHalf i:nth-child(2){
.CustomizedTourism .stepHalf i:nth-child(2){
background: #CCCCCC;
left: 50%;
}
......@@ -374,6 +570,7 @@ export default {
overflow: auto;
padding: 30px 60px;
box-sizing: border-box;
position: relative;
}
.CustomizedTourism .Signcontract .orderinfo li{
float: left;
......
src/components/newPersonalCenter/block/CustomizedList.vue
View file @ c3c76787
......@@ -2,12 +2,15 @@
<div class="CustomizedList">
<el-form class="choose_form" ref="form" :model="form" label-width="80px">
<el-form-item label="订单信息">
<el-select size="small" v-model="form.dealStatus" placeholder="请订单信息">
<el-select size="small" v-model="form.orderStatus" placeholder="请订单信息">
<el-option label="不限" :value="-1"></el-option>
<el-option label="未分配" :value="1"></el-option>
<el-option label="处理中" :value="2"></el-option>
<el-option label="处理完成" :value="3"></el-option>
<el-option label="处理失败" :value="4"></el-option>
<el-option label="已提交" :value="1"></el-option>
<el-option label="方案设计" :value="2"></el-option>
<el-option label="合同签订" :value="3"></el-option>
<el-option label="下单" :value="4"></el-option>
<el-option label="已成团" :value="5"></el-option>
<el-option label="已关团" :value="6"></el-option>
<el-option label="已取消" :value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出发日期">
......
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