Skip to content

A
Athena
Commit 59362baa authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 6c7da5b6 e5a35ad7
Show whitespace changes
Inline Side-by-side
Showing with 713 additions and 211 deletions
src/App.vue
View file @ 59362baa
......@@ -59,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_luoxdzztue.css';
@import '//at.alicdn.com/t/font_863923_9v70nlynbdt.css';
@import './assets/global/global.css';
body,html{
padding: 0px;
......
src/assets/css/home.css
View file @ 59362baa
......@@ -5,7 +5,7 @@
.Home .ticket .el-form-item {
display: inline-block;
margin-bottom: 0;
width: 185px;
width: 182px;
}
.Home .el-tabs__item:hover {
color: #fd6473;
......@@ -53,12 +53,64 @@
padding: 5px 0;
text-align: center;
font-size: 14px;
font-weight: bold;
float: right;
font-family: "PingFangR"
}
.Home .Home_top .tag_right .el-form-item__label {
color: #666666;
}
/* 选择条件部分 */
.Home .Home_top .tag_right .chooseticketul li{
display: inline-block;
width:182px;
height:32px;
line-height: 32px;
border:1px solid rgba(216,218,220,1);
margin-bottom:10px;
}
.Home .Home_top .tag_right .chooseticketul li span:nth-child(1){
padding-left: 10px;
color:#666666;
}
.Home .Home_top .tag_right .chooseticketul li span .el-input{
width:98px!important;
position: relative;
}
.Home .Home_top .tag_right .chooseticketul .el-input__inner{
border:none;
line-height: 30px;
background: transparent;
padding: 0;
}
.Home .Home_top .tag_right .visaul_li{
width:100%;
height:32px;
border:1px solid rgba(216,218,220,1);
line-height: 32px;
box-sizing: border-box;
}
.Home .Home_top .tag_right .visaul_li li{
float: left;
position: relative;
}
.Home .Home_top .tag_right .visaul_li li:nth-child(1){
padding-left: 10px;
color:#666666;
}
.Home .Home_top .tag_right .visaul_li li .el-input__inner{
border:none;
line-height: 30px;
background: transparent;
padding: 0;
}
.Home .Home_top .tag_right .visaul_li li .el-date-editor.el-input, .el-date-editor.el-input__inner {
width: 100px!important;
position: relative;
}
.Home .el-input__inner {
border-radius: 0px;
}
......@@ -66,6 +118,9 @@
font-size: 20px;
color: #ababab;
}
.Home ul,
p {
padding: 0;
......@@ -118,7 +173,7 @@ p {
font-family: "PingFang";
}
.Home .cztm_item_content p{
padding:1px 0;
padding:2px 0;
}
.Home .cztm_item_content .cztm_title{
color:#333333;
......@@ -155,14 +210,14 @@ p {
}
.Home .cztm .cztm_item{
position: relative;
width:220px;
width:215px;
height:130px;
font-size: 14px;
font-size: 12px;
background:rgba(255,255,255,1);
border:1px solid rgba(220,220,220,1);
display: inline-flex;
align-items:center;
margin:0 0 15px 15px;
margin:0 0 15px 22px;
box-sizing: border-box;
}
.Home #triangle-left{
......@@ -234,7 +289,7 @@ p {
position: relative;
}
.Home .Grouptour .tour_left{
width:220px;
width:216px;
box-sizing: border-box;
position: absolute;
left: 0;
......@@ -674,3 +729,20 @@ p {
height: 1px;
background-color: #d8d8d8;
}
.Home .el-input__inner{
border: 1px solid #d8dadc;
}
.Home .tag_right .hotel_tabcontent .el-form-item {
margin-bottom: 13px;
}
.Home .cztm .el-tabs__item.is-active{
color:#ee4454;
}
.Home .cztm .el-tabs__active-bar{
height: 3px;
background: #ee4454;
}
.Home .cztm .el-tabs__nav-wrap::after{
height: 1px;
background-color: #ededed;
}
\ No newline at end of file
src/components/DependentTravel/CustomizedTourism.vue
View file @ 59362baa
......@@ -4,7 +4,7 @@
<div class="step_head" style="position:relative">
<p class="step_head_title">{{dataInfo.departureName}}-{{dataInfo.destinationNames}}/{{dataInfo.playDays}}天*定制游</p>
<p style="padding:20px 0;color:#333333;font-size:12px">需求编号：{{customId}}</p>
<span class="exitorder" @click="ExitOrder">取消订单{{actice_step}}</span>
<span class="exitorder" @click="ExitOrder" v-if="actice_step<3">取消订单</span>
<el-row class="top" v-if="actice_step!=7">
<el-col :span="4">
......@@ -122,7 +122,7 @@
<div v-show="actice_step==2">
<DesignScheme :customId="customId" :tcid="tcid"></DesignScheme>
</div>
<div class="commonStyle Signcontract" v-if="actice_step==3 || actice_step==4 || actice_step==5 || actice_step==7">
<div class="commonStyle Signcontract" v-if="actice_step==3 || actice_step==4 || actice_step==5 || actice_step==6 || actice_step==7">
<p class="title">订单信息</p>
<ul class="orderinfo">
<li>
......@@ -130,7 +130,7 @@
</li>
<li style="margin-left:25px;">
<p class="pfR" style="font-size:16px;">{{dataInfo.departureName}}-{{dataInfo.destinationNames}}/{{dataInfo.playDays}}天*定制游</p>
<p> 价格：<span class="pfR" style="color:#FB8F0F;font-size:22px">{{dataInfo.budget}}</span>人/起</p>
<p> 价格：<span class="pfR" style="color:#FB8F0F;font-size:22px">{{dataInfo.planPrice}}</span>人/起</p>
<p>
<span><em>行程描述</em>：{{dataInfo.travelSummary}}</span>
<span><em>参团人数</em>：{{dataInfo.childrenNumber+dataInfo.audltNumber}}人（{{dataInfo.audltNumber}}大{{dataInfo.childrenNumber}}小）</span>
......@@ -159,23 +159,54 @@
<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> -->
<span v-if="item.title.childItem">
<span :class="item.title.childItem.title?'daytitle':''">{{item.title.childItem.title}}</span>
</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="common_left">
<!-- 交通 -->
<div v-if="item.trafficList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(traff,index) in item.trafficList" :key="index+70">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape"></span>
<span v-if="index==0" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></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">
<p style="font-size:16px;"><span style="padding-right:10px">交通</span>
<span v-for="(tra,index) in traff.childItem.subTraffic" :key="tra.arrivalCityName">
<span v-if="index==0">{{tra.startCityName}}</span>
<span style="margin:0 5px">
<span v-if="tra.arrivalType==1" class="iconfont icon-Shape1"></span>
<span v-if="tra.arrivalType==2" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
<span v-if="tra.arrivalType==3" class="iconfont icon--lunchuan"></span>
<span v-if="tra.arrivalType==4" class="iconfont icon-huoche"></span>
</span>
<span>{{tra.arrivalCityName}}</span>
</span>
<div style="font-size:14px;margin-top:20px">
<span>{{traff.childItem.descriptionText}}</span>
</div>
</div>
</div>
</div>
<!-- 酒店 -->
<div v-if="item.HotelList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(hotel,index) in item.HotelList" :key="index+50">
<span class="icon_span" style="background:#fff;">
<span v-if="index==0" class="iconfont icon-Shape"></span>
</span>
<p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{hotel.childItem.hotelName}}</span></p>
<div style="font-size:14px;margin-top:20px;width: 942px;">
<div>
<span v-html="hotel.childItem.description"></span>
</div>
</div>
</div>
</div>
</div>
......@@ -216,82 +247,66 @@
</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 v-if="item.ScenicList.length>0" class="commonday">
<div class="commonday_item">
<div style="" v-for="(Scen,index) in item.ScenicList" :key="index+100">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape4"></span>
<span v-if="index==0" 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>
<p v-if="index==0" style="font-size:16px;"><span>景点</span></p>
<div v-if="im==0" v-for="(img,im) in Scen.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<!-- <img :onerror="defaultImg" :src="img.url" style="width:200px;height:133px;float:left;" alt="">
-->
<img v-if="!img.url" src="../../assets/img/default.png" style="width:200px;height:133px;float:left;" alt="">
<img v-else :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div style="float:left;margin-left:20px;width:719px">
<p><span style="color:#5F95E8;font-size:16px;margin-bottom:13px">{{Scen.childItem.couponsName}}</span></p>
<p v-if="Scen.childItem.description" v-html="Scen.childItem.description"></p>
</div>
</div>
</div>
</div>
</div>
<!-- 餐饮 -->
<div v-if="des.type==4" class="commonday commonHover">
<div v-if="item.RestaList.length>0" class="commonday">
<div class="commonday_item">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape5"></span>
<div class="commonHover" v-for="(Res,index) in item.RestaList" :key="index+150">
<span class="icon_span" style="background:#fff">
<span v-if="index==0" 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">
<p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">一{{Res.childItem.dinnerName}}</span></p>
<div v-if="im==0" v-for="(img,im) in Res.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 v-if="Res.childItem.description" style="float:left;margin-left:20px;width:719px">
<p v-html="Res.childItem.description"></p>
</div>
</div>
</div>
</div>
</div>
<!-- 温馨提示 -->
<div v-if="des.type==6" class="commonday">
<div v-if="item.tipList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(tip,index) in item.tipList" :key="index+200">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape6"></span>
<span v-if="index==0" 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 v-if="tip.childItem.description" style="font-size:14px;margin-top:20px">
<div v-html="tip.childItem.description">
</div>
</div>
</div>
</div>
</div>
</div>
......@@ -339,6 +354,8 @@ import DesignScheme from '@/components/DependentTravel/DesignScheme'
export default {
data () {
return {
defaultImg: 'this.src="' + require('assets/img/default.png') + '"',
desshow:false,
desLoad:false,
actice_step:0,
......@@ -363,6 +380,7 @@ export default {
methods: {
GetDes(){
this.desshow=!this.desshow;
if(this.desshow==false){
return;
......@@ -375,8 +393,35 @@ export default {
this.desLoad=false;
if(res.data.resultCode==1){
this.datades=res.data.data;
this.datades.dayList.forEach(dayitem => {
dayitem.trafficList=[];
dayitem.ScenicList=[];
dayitem.HotelList=[];
dayitem.RestaList=[];
dayitem.tipList=[];
dayitem.title={};
dayitem.dayArray.forEach(typeitem=>{
if(typeitem.type==1){
dayitem.trafficList.push(typeitem);
}
if(typeitem.type==2){
dayitem.ScenicList.push(typeitem);
}
if(typeitem.type==3){
dayitem.HotelList.push(typeitem);
}
if(typeitem.type==4){
dayitem.RestaList.push(typeitem);
}
if(typeitem.type==6){
dayitem.tipList.push(typeitem);
}
if(typeitem.type==6){
dayitem.title=typeitem;
}
})
});
console.log("this.datades",this.datades)
}else{}
},err=>{})
},
......@@ -418,6 +463,9 @@ export default {
</script>
<style>
.CustomizedTourism .desstatus .icon-more{
transform:rotateX(180deg);
}
.CustomizedTourism .cutomdes{
transition: all linear 0.5s;
}
......
src/components/DependentTravel/DesignScheme.vue
View file @ 59362baa
......@@ -49,23 +49,53 @@
<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> -->
<span v-if="item.title.childItem">
<span :class="item.title.childItem.title?'daytitle':''">{{item.title.childItem.title}}</span>
</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="common_left">
<!-- 交通 -->
<div v-if="item.trafficList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(traff,index) in item.trafficList" :key="index+70">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape"></span>
<span v-if="index==0" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></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">
<p style="font-size:16px;"><span style="padding-right:10px">交通</span>
<span v-for="(tra,index) in traff.childItem.subTraffic" :key="tra.arrivalCityName">
<span v-if="index==0">{{tra.startCityName}}</span>
<span style="margin:0 5px">
<span v-if="tra.arrivalType==1" class="iconfont icon-Shape1"></span>
<span v-if="tra.arrivalType==2" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
<span v-if="tra.arrivalType==3" class="iconfont icon--lunchuan"></span>
<span v-if="tra.arrivalType==4" class="iconfont icon-huoche"></span>
</span>
<span>{{tra.arrivalCityName}}</span>
</span>
<div style="font-size:14px;margin-top:20px">
<span>{{traff.childItem.descriptionText}}</span>
</div>
</div>
</div>
</div>
<!-- 酒店 -->
<div v-if="item.HotelList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(hotel,index) in item.HotelList" :key="index+50">
<span class="icon_span" style="background:#fff;">
<span v-if="index==0" class="iconfont icon-Shape"></span>
</span>
<p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{hotel.childItem.hotelName}}</span></p>
<div style="font-size:14px;margin-top:20px;width: 942px;">
<div>
<span v-html="hotel.childItem.description"></span>
</div>
</div>
</div>
</div>
</div>
......@@ -106,82 +136,67 @@
</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 v-if="item.ScenicList.length>0" class="commonday">
<div class="commonday_item">
<div style="" v-for="(Scen,index) in item.ScenicList" :key="index+100">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape4"></span>
<span v-if="index==0" 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>
<p v-if="index==0" style="font-size:16px;"><span>景点</span></p>
<div v-if="im==0" v-for="(img,im) in Scen.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<!-- <img :onerror="defaultImg" :src="img.url" style="width:200px;height:133px;float:left;" alt=""> -->
<img v-if="!img.url" src="../../assets/img/default.png" style="width:200px;height:133px;float:left;" alt="">
<img v-else :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div style="float:left;margin-left:20px;width:719px">
<p><span style="color:#5F95E8;font-size:16px;margin-bottom:13px">{{Scen.childItem.couponsName}}</span></p>
<p v-if="Scen.childItem.description" v-html="Scen.childItem.description"></p>
</div>
</div>
</div>
</div>
</div>
<!-- 餐饮 -->
<div v-if="des.type==4" class="commonday commonHover">
<div v-if="item.RestaList.length>0" class="commonday">
<div class="commonday_item">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape5"></span>
<div class="commonHover" v-for="(Res,index) in item.RestaList" :key="index+150">
<span class="icon_span" style="background:#fff">
<span v-if="index==0" 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">
<p style="font-size:16px;"><span>餐饮</span><span style="color:#5F95E8;margin-left:5px">一{{Res.childItem.dinnerName}}</span></p>
<div v-if="im==0" v-for="(img,im) in Res.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 v-if="Res.childItem.description" style="float:left;margin-left:20px;width:719px">
<p v-html="Res.childItem.description"></p>
</div>
</div>
</div>
</div>
</div>
<!-- 温馨提示 -->
<div v-if="des.type==6" class="commonday">
<div v-if="item.tipList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(tip,index) in item.tipList" :key="index+200">
<span class="icon_span" style="background:#fff;">
<span class="iconfont icon-Shape6"></span>
<span v-if="index==0" 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 v-if="tip.childItem.description" style="font-size:14px;margin-top:20px">
<div v-html="tip.childItem.description">
</div>
</div>
</div>
</div>
</div>
</div>
......@@ -195,7 +210,9 @@
价格：<span style="color:#FB8F0F;font-size:18px;">￥{{item.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>
<p style="color:#333;font-size:14px;padding:10px 0 5px 0">费用包含：
<span v-if="datades.feature" v-html="datades.feature.feeInclude"></span>
</p>
</div>
</div>
......@@ -209,6 +226,7 @@
export default {
data () {
return {
defaultImg: 'this.src="' + require('../../assets/img/default.png') + '"',
desshow:-1,
msg:{
pageIndex:1,
......@@ -268,6 +286,10 @@ export default {
},
showStatus(index,item){
if(this.desshow==index){
this.desshow=-1;
return;
}
this.desshow=index;
let msg={};
msg.configId=item.configId;
......@@ -279,13 +301,41 @@ export default {
this.datades=res.data.data;
this.datades.dayList.forEach(dayitem => {
dayitem.trafficList=[];
dayitem.ScenicList=[];
dayitem.HotelList=[];
dayitem.RestaList=[];
dayitem.tipList=[];
dayitem.title={};
dayitem.dayArray.forEach(typeitem=>{
if(typeitem.type==1){
dayitem.trafficList.push(typeitem);
}
if(typeitem.type==2){
dayitem.ScenicList.push(typeitem);
}
if(typeitem.type==3){
dayitem.HotelList.push(typeitem);
}
if(typeitem.type==4){
dayitem.RestaList.push(typeitem);
}
if(typeitem.type==6){
dayitem.tipList.push(typeitem);
}
if(typeitem.type==7){
dayitem.title=typeitem;
}
})
});
console.log("this.datades",this.datades);
}else{}
},err=>{})
},
GetData(){
this.apiJavaPost('/api/b2b/free/getTravelCoupomPlanList',this.msg,res=>{
// console.log(res)
if(res.data.resultCode==1){
this.dataList=res.data.data.pageData;
......@@ -315,6 +365,24 @@ export default {
.DesignScheme .desstatus{
color: #EE4454!important;
}
.DesignScheme .desstatus .icon-more{
transform:rotateX(180deg);
}
.DesignScheme .commonHover{
padding:10px;
position: relative;
left: -10px;
}
/* .DesignScheme .commonHover{
width: 1199px;
position: relative;
left: -120px;
padding-left: 120px;
box-sizing: border-box;
}*/
.DesignScheme .commonday_item .commonHover .icon_span{
left: -60px;
}
.DesignScheme .commonHover:hover{
background: #EDF4FF;
cursor: pointer;
......@@ -357,7 +425,7 @@ export default {
z-index: 2;
}
.DesignScheme .common_left:last-child .commonday_item{
.DesignScheme .commonday:last-child .commonday_item{
border-left: none;
}
.DesignScheme .commonday_item{
......@@ -387,9 +455,7 @@ export default {
background:#5F95E8;
border-radius:50%;
}
.DesignScheme .daylist{
}
.DesignScheme .ygbj:before{
position: absolute; /*必须*/
z-index: 1;
......@@ -420,8 +486,8 @@ export default {
.DesignScheme .icon-more{
display: inline-block;
cursor: pointer;
transform:rotateX(180deg);
}
.DesignScheme .choose_span span:hover{
background: #EE4454;
color: #fff;
......
src/components/DependentTravel/IndependentList.vue
View file @ 59362baa
......@@ -227,7 +227,10 @@ export default {
}
},
created(){
if(this.$route.query.lineteamId){
this.listmsg.lineId=this.$route.query.lineteamId;
console.log("this.listmsg.lineId",this.listmsg.lineId)
}
},
mounted() {
// this.GetVisaCountry();
......@@ -350,6 +353,7 @@ export default {
if(this.companyId!=-1){
this.apipost('b2b_get_GetFreeSearchItem',{'companyId':this.companyId},r=>{
this.linesList=r.data.data.lineTeam;
console.log("this.linesList",this.linesList)
this.startCityList=r.data.data.startCity;
this.tripDayList=r.data.data.tripDay;
},null)
......@@ -381,8 +385,13 @@ export default {
this.total=res.data.data.count;
this.datalist.forEach(item=>{
item.imgCover=JSON.parse(item.imgCover)
item.imgCover=JSON.parse(item.imgCover);
if(item.priceTags){
item.priceTags=item.priceTags.split(",");
}
})
console.log(this.datalist)
}else{
this.Error(res.data.message);
}
......
src/components/Home.vue
View file @ 59362baa
......@@ -38,12 +38,19 @@
</ul>
<div class="tag_right">
<!-- 签证 -->
<div v-show="tag=='visa'" class="visa">
<div style="width:394px" v-show="tag=='visa'" class="visa">
<el-form ref="visa_form" :model="visa_form" label-width="90px">
<el-form-item label="国家/地区" style="margin-bottom:10px">
<!-- <el-form-item label="国家/地区" style="margin-bottom:10px">
<el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input>
</el-form-item>
<div style="overflow:auto">
</el-form-item> -->
<ul class="visaul_li">
<li>国家/地区</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-input size="small" v-model="visa_form.name" placeholder="国家或者地区名字"></el-input>
</li>
</ul>
<div style="overflow:auto;margin-top:10px">
<span class="form_btn">立即搜索</span>
</div>
......@@ -63,10 +70,11 @@
</el-form>
</div>
<!-- 机票 -->
<div v-show="tag=='ticket'" class="ticket">
<div style="width:394px;margin-top: -15px;" v-show="tag=='ticket'" class="ticket">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="国际机票" name="first">
<el-form ref="ticket_form" :model="ticket_form" label-width="70px">
<!-- <el-form ref="ticket_form" :model="ticket_form" label-width="70px">
<p style="margin-bottom:5px">
<el-radio v-model="ticket_form.radio" label="1">单程</el-radio>
<el-radio v-model="ticket_form.radio" label="2">往返</el-radio>
......@@ -74,14 +82,14 @@
<el-form-item label="出发地">
<el-input size="small" v-model="ticket_form.name" placeholder="出发地"></el-input>
</el-form-item>
<span style=";margin-left:12px;display:inline-block;width:20px;height:20px;background:#15B6A1;border-radius:50%;text-align:center;color:#fff">换</span>
<el-form-item label="目的地">
<span style=";margin-left:5px;display:inline-block;width:20px;height:20px;background:#15B6A1;border-radius:50%;text-align:center;color:#fff">换</span>
<el-form-item label="目的地" style="margin-left:5px;">
<el-input size="small" v-model="ticket_form.name" placeholder="目的地"></el-input>
</el-form-item>
<el-form-item label="出发日期">
<el-input size="small" v-model="ticket_form.name" placeholder="出发日期"></el-input>
</el-form-item>
<el-form-item style="margin-left:32px;" label="返回日期">
<el-form-item style="margin-left:30px;" label="返回日期">
<el-input size="small" v-model="ticket_form.name" placeholder="返回日期"></el-input>
</el-form-item>
<el-form-item label="成人">
......@@ -94,7 +102,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="儿童" style="margin-left:32px;">
<el-form-item label="儿童" style="margin-left:30px;">
<el-select size="small" v-model="ticket_form.value" placeholder="请选择">
<el-option
v-for="item in person"
......@@ -105,17 +113,97 @@
</el-select>
</el-form-item>
<span class="form_btn" style="padding:6px 0">立即搜索</span>
</el-form>
</el-form> -->
<p style="margin-bottom:5px">
<el-radio v-model="ticket_form.radio" label="1">单程</el-radio>
<el-radio v-model="ticket_form.radio" label="2">往返</el-radio>
</p>
<div style="margin-top:15px;">
<ul class="chooseticketul">
<li>
<span>出发地</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-input size="small" v-model="visa_form.name" placeholder="出发地"></el-input>
</span>
</li>
<span style="margin:0 3px;display:inline-block;width:20px;height:20px;background:#15B6A1;border-radius:50%;text-align:center;color:#fff">换</span>
<li>
<span>目的地</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input>
</span>
</li>
<li>
<span>出发日期</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</span>
</li>
<li style="margin-left:26px;">
<span>返回日期</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</span>
</li>
<li>
<span>成人</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-select size="small" v-model="ticket_form.value" placeholder="请选择">
<el-option
v-for="item in person"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</span>
</li>
<li style="margin-left:26px;">
<span>儿童</span>
<span class="iconfont icon-vertical_line"></span>
<span>
<el-select size="small" v-model="ticket_form.value" placeholder="请选择">
<el-option
v-for="item in person"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</span>
</li>
</ul>
</div>
<div style="overflow:auto;">
<span class="form_btn">立即搜索</span>
</div>
</el-tab-pane>
<el-tab-pane label="国内机票" name="second">国内机票</el-tab-pane>
</el-tabs>
</div>
<!-- 酒店 -->
<div v-show="tag=='hotel'" class="visa">
<div style="width:394px;margin-top: -15px;" v-show="tag=='hotel'" class="visa hotel_tabcontent">
<el-tabs v-model="hotel_tab" @tab-click="handleClick">
<el-tab-pane label="国际酒店" name="gjjd">
<el-form ref="visa_form" :model="visa_form" label-width="60px">
<el-form-item label="目的地">
<!-- <el-form-item label="目的地">
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input>
</el-form-item>
<el-form-item style="display:inline-block;width:50%;" label="入住日">
......@@ -133,8 +221,48 @@
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<div style="overflow:auto">
</el-form-item> -->
<ul class="visaul_li">
<li>目的地</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input>
</li>
</ul>
<div style="margin-top:16px;overflow:auto">
<div style="float:left;width:182px">
<ul class="visaul_li">
<li>入住日</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</li>
</ul>
</div>
<div style="float:right;width:182px">
<ul class="visaul_li">
<li>离店日</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</li>
</ul>
</div>
</div>
<div style="overflow:auto;margin-top:10px">
<span class="form_btn">立即搜索</span>
</div>
......@@ -144,12 +272,19 @@
</div>
<!-- 门票 -->
<div v-show="tag=='admticket'" class="visa">
<div style="width:394px" v-show="tag=='admticket'" class="visa">
<el-form ref="visa_form" :model="visa_form" label-width="90px">
<el-form-item label="关键词搜索" style="margin-bottom:10px">
<!-- <el-form-item label="关键词搜索" style="margin-bottom:10px">
<el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input>
</el-form-item>
<div style="overflow:auto">
</el-form-item> -->
<ul class="visaul_li">
<li>关键词搜索</li>
<li><span class="iconfont icon-vertical_line"></span></li>
<li>
<el-input size="small" v-model="visa_form.name" placeholder="输入景点名称、城市或主题"></el-input>
</li>
</ul>
<div style="overflow:auto;margin-top:10px">
<span class="form_btn">立即搜索</span>
</div>
......@@ -184,7 +319,7 @@
<div class="cztm">
<el-tabs v-model="activecontent1" @tab-click="handleClick">
<el-tab-pane label="超值特卖" name="first">
<div style="margin-left:-17px">
<div style="margin-left:-25px">
<div class="cztm_item">
<img src="//dimg07.c-ctrip.com/images/100j0y000000m0bhg78DC_C_221_166.jpg" alt="" class="">
<div class="cztm_item_content">
......@@ -994,7 +1129,7 @@ export default {
banner_height: "0px",
visa_form: {},
ticket_form: {},
tag: "visa",
tag: "ticket",
activecontent1: "first",
activeName: "first",
hotel_tab: "gjjd",
......
src/components/mall/detailThree.vue
View file @ 59362baa
......@@ -81,8 +81,8 @@
<el-col :span='12'>
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/heel',query:{} }">自由行</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineName} }">{{dataList.lineName}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineName,'lineteamId':dataList.ltName} }">{{dataList.ltName}}</el-breadcrumb-item>
<!-- <el-breadcrumb-item :to="{ path: '/search',query:{'keywords':'','lineId':dataList.lineName} }">{{dataList.lineName}}</el-breadcrumb-item> -->
<el-breadcrumb-item :to="{ path: '/IndependentList',query:{'lineteamId':dataList.lineteamId} }">{{dataList.ltName}}</el-breadcrumb-item>
<el-breadcrumb-item>{{dataList.title}}</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
......@@ -898,7 +898,6 @@ export default {
getData: function (msg) {
this.loadingDataList=true
this.apipost('b2b_get_GetB2BFreeInfo',msg,r=>{
if(r.data.resultCode==1){
let data = (r.data.data);
this.sonData = data;
......@@ -936,6 +935,7 @@ export default {
this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : '';
this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : '';
this.dataList = data;
// console.log("deThree",this.dataList)
this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null;
this.imgCover = JSON.parse(this.dataList.imgCover);
this.showType = this.feature.featureType;
......
src/components/newPersonalCenter/block/CustomizedList.vue
View file @ 59362baa
<template>
<div class="CustomizedList">
<el-form class="choose_form" ref="form" :model="form" label-width="80px">
<el-form-item label="订单信息">
<el-form-item label="订单状态">
<el-select size="small" v-model="form.orderStatus" placeholder="请订单信息">
<el-option label="不限" :value="-1"></el-option>
<el-option label="已提交" :value="1"></el-option>
......@@ -10,7 +10,7 @@
<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-option label="已取消" :value="7"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出发日期">
......@@ -57,12 +57,15 @@
label="人均预算">
</el-table-column>
<el-table-column
label="处理状态">
label="订单状态">
<template slot-scope="scope">
<span v-if="scope.row.orderStatus==1">未分配</span>
<span v-if="scope.row.orderStatus==2">处理中</span>
<span v-if="scope.row.orderStatus==3">处理完成</span>
<span v-if="scope.row.orderStatus==4">处理失败</span>
<span v-if="scope.row.orderStatus==1">已提交</span>
<span v-if="scope.row.orderStatus==2">方案设计</span>
<span v-if="scope.row.orderStatus==3">合同签订</span>
<span v-if="scope.row.orderStatus==4">下单</span>
<span v-if="scope.row.orderStatus==5">已成团</span>
<span v-if="scope.row.orderStatus==6">已关团</span>
<span v-if="scope.row.orderStatus==7">已取消</span>
</template>
</el-table-column>
<el-table-column
......@@ -131,7 +134,6 @@ export default {
getList(){
this.apiJavaPost('/api/b2b/free/getTravelCoupomList',this.form,res=>{
this.loading=false;
console.log(res);
if(res.data.resultCode==1){
this.tableData=res.data.data.pageData;
this.totalCount=res.data.data.count;
......
src/components/newPersonalCenter/block/OrderCenter.vue
View file @ 59362baa
......@@ -7,8 +7,10 @@
<div>
<!-- 团订单 -->
<TcOrder v-if="data === '8-1'"/>
<!-- 自由行订单 -->
<TzOrder v-if="data === '8-2'"/>
<!-- 定制游订单 -->
<TdOrder v-if="data === '8-2'"/>
<TdOrder v-if="data === '8-7'"/>
<!-- 机票订单 -->
<TkOrder v-if="data === '8-5'"/>
</div>
......@@ -16,6 +18,7 @@
<script>
import TcOrder from './model/TcOrder'
import TdOrder from './model/TdOrder'
import TzOrder from './model/TzOrder'
import TkOrder from './model/TkOrder'
export default {
props:{
......@@ -25,6 +28,7 @@ export default {
TcOrder: TcOrder,
TdOrder: TdOrder,
TkOrder: TkOrder,
TzOrder: TzOrder,
},
data() {
return {
......
src/components/newPersonalCenter/block/model/TdOrder.vue
View file @ 59362baa
......@@ -14,7 +14,7 @@
</template>
</ul>
<!-- 表格 -->
<TKTable :tableData="tableData"/>
<TCTable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
......@@ -32,10 +32,10 @@
</el-row>
</template>
<script>
import TKTable from "./OrderInfoModel/TKTable";
import TCTable from "./OrderInfoModel/TCTable";
export default {
components: {
TKTable: TKTable
TCTable: TCTable
},
data() {
return {
......@@ -48,7 +48,7 @@ export default {
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 2,
orderType: 7,
queryDays: 0,
orderState: -1,
CustomerId: ""
......
src/components/newPersonalCenter/block/model/TzOrder.vue 0 → 100644
View file @ 59362baa
<style>
@import "../../../../assets/css/newPersonalCenter/block/OrderCenter.css";
</style>
<template>
<el-row class="OrderCenter">
<!-- 条件 -->
<ul class="clearfix">
<template v-for="item in TitList">
<li
class="__cp"
@click="handleClick(item)"
:class="{_active: activeName === item.ID}"
>{{item.Type}}</li>
</template>
</ul>
<!-- 表格 -->
<TCTable :tableData="tableData"/>
<div class="empty-data" v-if="tableData.length<1">
<i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
<!-- 分页 -->
<el-row class="_pagination" v-if="totalCount > 1 && tableData.length>0">
<el-pagination
:current-page.sync="currentPage"
:page-size="getOrderMsg.pageSize"
layout="total, prev, pager, next"
:total="Count"
@current-change="handleCurrentChange"
></el-pagination>
</el-row>
</el-row>
</template>
<script>
import TCTable from "./OrderInfoModel/TCTable";
export default {
components: {
TCTable: TCTable
},
data() {
return {
activeName: -1,
currentPage: 1,
rderLoading: false,
totalCount: 1,
Count: 1,
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
orderType: 2,
queryDays: 0,
orderState: -1,
CustomerId: ""
},
TitList: [
{
Type: "全部",
ID: -1
},
{
Type: "待付定金",
ID: 1
},
{
Type: "待付尾款",
ID: 2
},
{
Type: "待发团",
ID: 3
},
{
Type: "交易完成",
ID: 4
},
{
Type: "取消",
ID: 5
}
// {
// val: 6,
// lable: '等待商家确认'
// },
// {
// val: 7,
// lable: '退款中'
// },
// {
// val: 8,
// lable: '退款成功'
// },
// {
// val: 9,
// lable: '交易完成'
// },
],
tableData: []
};
},
computed: {},
created() {
console.log("定制游订单");
},
mounted() {
let userInfo = localStorage.userInfo
? JSON.parse(localStorage.userInfo)
: "";
this.getOrderMsg.CustomerId = userInfo.customerId;
this.gerOrderList();
this.b2b_get_GetWaitDealOrderPageList();
},
methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
gerOrderList: function() {
this.orderLoading = true;
this.apiJavaPost(
"/api/b2b/user/getrecentorder",
this.getOrderMsg,
res => {
console.log("自由行订单",res);
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.totalCount = res.data.data.pageCount;
this.Count = res.data.data.count;
this.orderLoading = false;
} else {
this.Error(res.data.message);
this.orderLoading = false;
}
},
null
);
},
handleClick(item) {
this.activeName = item.ID;
this.getOrderMsg.orderState = item.ID;
this.gerOrderList();
},
handleCurrentChange(val) {
// 翻页
this.getOrderMsg.pageIndex = parseInt(val);
this.gerOrderList();
}
}
};
</script>
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ 59362baa
......@@ -63,7 +63,8 @@
<span>订单中心</span>
</template>
<el-menu-item index="8-1" @click="clickMenu('8-1')">跟团游订单</el-menu-item>
<el-menu-item index="8-2" @click="clickMenu('8-2')">定制游订单</el-menu-item>
<el-menu-item index="8-2" @click="clickMenu('8-2')">自由行订单</el-menu-item>
<el-menu-item index="8-7" @click="clickMenu('8-7')">定制游订单</el-menu-item>
<el-menu-item index="8-3" @click="clickMenu('8-3')">当地游订单</el-menu-item>
<el-menu-item index="8-4" @click="clickMenu('8-4')">签证订单</el-menu-item>
<el-menu-item index="8-5" @click="clickMenu('8-5')">机票订单</el-menu-item>
......
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