Skip to content

A
Athena
Commit 12ace2e5 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 75e778a5 607a0613
Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 100 deletions
src/assets/css/home.css
View file @ 12ace2e5
...@@ -627,7 +627,7 @@ p { ...@@ -627,7 +627,7 @@ p {
color: #666666; color: #666666;
} }
.Home .home_footer .float .iconfont{ .Home .home_footer .float .iconfont{
font-size: 30px; font-size: 32px;
margin: 15px 10px; margin: 15px 10px;
} }
.Home .home_footer .float ul li{ .Home .home_footer .float ul li{
...@@ -635,10 +635,10 @@ p { ...@@ -635,10 +635,10 @@ p {
font-size: 12px; font-size: 12px;
color:#666666; color:#666666;
width: 50%; width: 50%;
padding:1px 0; padding:5px 0;
} }
.Home .home_footer .float p{ .Home .home_footer .float p{
padding:1px 0; padding:5px 0;
} }
.Home .home_footer .el-col-6{ .Home .home_footer .el-col-6{
padding-left: 40px; padding-left: 40px;
...@@ -655,8 +655,8 @@ p { ...@@ -655,8 +655,8 @@ p {
top: -2px; top: -2px;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
height: 34px; height: 36px;
width: 50px; width: 54px;
text-align: center; text-align: center;
line-height: 34px; line-height: 34px;
background: url('../img/home/qipao.png') no-repeat; background: url('../img/home/qipao.png') no-repeat;
......
src/components/DependentTravel/IndependentList.vue
View file @ 12ace2e5
...@@ -25,24 +25,26 @@ ...@@ -25,24 +25,26 @@
<div> <div>
<div class="select_title" style="top:15px">线路</div> <div class="select_title" style="top:15px">线路</div>
<ul class="select_ul" :class="lineselect?'':'select_ul_height'"> <ul class="select_ul" :class="lineselect?'':'select_ul_height'">
<li @click="ChangeLine(item)" :class="listmsg.lineId==item.id?'visa_active':''" v-for="item in linesList" :key="item.id">{{item.name}}</li> <li @click="ChangeLine(0)" :class="listmsg.lineId==0?'visa_active':''">不限</li>
<li @click="ChangeLine(item.id)" :class="listmsg.lineId==item.id?'visa_active':''" v-for="item in linesList" :key="item.id">{{item.name}}</li>
</ul> </ul>
<span class="czd" @click="ChangeSelect(2)">{{lineselecttext}}<i :class="lineselect?'rolate':''" class="iconfont icon-moban"></i></span> <span class="czd" @click="ChangeSelect(2)">{{lineselecttext}}<i :class="lineselect?'rolate':''" class="iconfont icon-moban"></i></span>
</div> </div>
<div v-if="seriesList.length>0"> <!-- <div v-if="seriesList.length>0">
<div class="select_title" style="top:15px">系列</div> <div class="select_title" style="top:15px">系列</div>
<ul class="select_ul" :class="seriesn?'':'select_ul_height'"> <ul class="select_ul" :class="seriesn?'':'select_ul_height'">
<li @click="Selectseries(item)" :class="listmsg.lineTeamId==item.id?'visa_active':''" v-for="item in seriesList" :key="item.id">{{item.name}}</li> <li @click="Selectseries(item)" :class="listmsg.lineTeamId==item.id?'visa_active':''" v-for="item in seriesList" :key="item.id">{{item.name}}</li>
</ul> </ul>
<span class="czd" @click="ChangeSelect(1)">{{seriescontext}}<i :class="seriesn?'rolate':''" class="iconfont icon-moban"></i></span> <span class="czd" @click="ChangeSelect(1)">{{seriescontext}}<i :class="seriesn?'rolate':''" class="iconfont icon-moban"></i></span>
</div> </div> -->
<!-- 行程天数 --> <!-- 行程天数 -->
<div> <div>
<div class="select_title" style="top:15px">行程天数</div> <div class="select_title" style="top:15px">行程天数</div>
<ul class="select_ul"> <ul class="select_ul">
<li @click="SelectDay(item)" :class="listmsg.dayNum==item.id?'visa_active':''" v-for="item in tripDayList" :key="item.id">{{item.name}}</li> <li @click="SelectDay(-1)" :class="listmsg.dayNum==-1?'visa_active':''">不限</li>
<li @click="SelectDay(item.id)" :class="listmsg.dayNum==item.id?'visa_active':''" v-for="item in tripDayList" :key="item.id">{{item.name}}</li>
</ul> </ul>
<!-- <span class="czd" @click="ChangeSelect(1)">{{seriescontext}}<i :class="seriesn?'rolate':''" class="iconfont icon-moban"></i></span> --> <!-- <span class="czd" @click="ChangeSelect(1)">{{seriescontext}}<i :class="seriesn?'rolate':''" class="iconfont icon-moban"></i></span> -->
...@@ -51,9 +53,11 @@ ...@@ -51,9 +53,11 @@
<div> <div>
<div class="select_title" style="top:19px">出发日期</div> <div class="select_title" style="top:19px">出发日期</div>
<ul class="select_ul"> <ul class="select_ul">
<li @click="SelectMonth(item)" :class="monthid==item.month?'visa_active':''" v-for="item in MonthDateList" :key="item.month">{{item.month}}月</li> <li @click="SelectMonth(0,'null')" :class="monthid==0?'visa_active':''">不限</li>
<li @click="SelectMonth(item.month,item)" :class="monthid==item.month?'visa_active':''" v-for="item in MonthDateList" :key="item.month">{{item.month}}月</li>
<el-date-picker size="mini" @change="ChangeDate" <el-date-picker size="mini" @change="ChangeDate"
v-model="listmsg.monthdate" v-model="listmsg.monthdate"
:picker-options="pickerOptions0"
value-format='yyyy-MM-dd' value-format='yyyy-MM-dd'
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -67,8 +71,8 @@ ...@@ -67,8 +71,8 @@
<div> <div>
<div class="select_title" style="top:15px">出发城市</div> <div class="select_title" style="top:15px">出发城市</div>
<ul class="select_ul" :class="selectcon?'':'select_ul_height'"> <ul class="select_ul" :class="selectcon?'':'select_ul_height'">
<!-- <li @click="SelectCity(0)" :class="listmsg.companyId==0?'visa_active':''">不限</li> --> <li @click="SelectCity(0)" :class="listmsg.startCityId==0?'visa_active':''">不限</li>
<li @click="SelectCity(item.id)" :class="listmsg.id==item.id?'visa_active':''" v-for="item in startCityList" :key="item.id">{{item.startCityName}}</li> <li @click="SelectCity(item.id)" :class="listmsg.startCityId==item.id?'visa_active':''" v-for="item in startCityList" :key="item.id">{{item.startCityName}}</li>
</ul> </ul>
<span class="czd" @click="ChangeSelect(3)">{{selectcontext}}<i :class="selectcon?'rolate':''" class="iconfont icon-moban"></i></span> <span class="czd" @click="ChangeSelect(3)">{{selectcontext}}<i :class="selectcon?'rolate':''" class="iconfont icon-moban"></i></span>
...@@ -77,12 +81,8 @@ ...@@ -77,12 +81,8 @@
<div> <div>
<div class="select_title" style="top:15px">定制主题</div> <div class="select_title" style="top:15px">定制主题</div>
<ul class="select_ul"> <ul class="select_ul">
<li>团队建设</li> <li @click="SelectThemeTag(0,'null')" :class="listmsg.priceTag.length==0?'visa_active':''">不限</li>
<li>团队建设</li> <li @click="SelectThemeTag(1,item)" :class="item.SNO==-1?'visa_active':''" v-for="item in ThemeTagList" :key="item.ID">{{item.Content}}</li>
<li>团队建设</li>
<li>团队建设</li>
<li>团队建设</li>
<li>团队建设</li>
</ul> </ul>
<!-- <span class="czd" @click="ChangeSelect(1)">{{seriescontext}}<i :class="seriesn?'rolate':''" class="iconfont icon-moban"></i></span> --> <!-- <span class="czd" @click="ChangeSelect(1)">{{seriescontext}}<i :class="seriesn?'rolate':''" class="iconfont icon-moban"></i></span> -->
...@@ -91,13 +91,12 @@ ...@@ -91,13 +91,12 @@
</div> </div>
<!-- 列表 --> <!-- 列表 -->
<div class="datalist" v-loading="loading"> <div class="datalist" v-loading="loading">
<p style="padding:0 8px;background:#DDDDDD;font-size:12px"> <!-- <p style="padding:0 8px;background:#DDDDDD;font-size:12px">
<span style="display:inline-block;">时间最近 <span style="display:inline-block;">时间最近
<span class="caret-wrapper"> <span class="caret-wrapper">
<i @click="OrderByPrice(1)" :class="listmsg.orderByPrice==1?'borderbottom':''" class="sort-caret ascending"></i> <i @click="OrderByPrice(1)" :class="listmsg.orderByPrice==1?'borderbottom':''" class="sort-caret ascending"></i>
<i @click="OrderByPrice(2)" :class="listmsg.orderByPrice==2?'bordertop':''" class="sort-caret descending"></i> <i @click="OrderByPrice(2)" :class="listmsg.orderByPrice==2?'bordertop':''" class="sort-caret descending"></i>
</span> </span>
<!-- <span class="noben_span"><i class="iconfont icon-moban" :class="listmsg.orderByPrice==2?'rolate':''"></i></span> -->
</span> </span>
<span style="display:inline-block;margin-left:15px">价格 <span style="display:inline-block;margin-left:15px">价格
<span class="caret-wrapper"> <span class="caret-wrapper">
...@@ -105,23 +104,41 @@ ...@@ -105,23 +104,41 @@
<i @click="OrderByBookAdvance(2)" :class="listmsg.orderByBookAdvance==2?'bordertop':''" class="sort-caret descending"></i> <i @click="OrderByBookAdvance(2)" :class="listmsg.orderByBookAdvance==2?'bordertop':''" class="sort-caret descending"></i>
</span> </span>
</span> </span>
</p> </p> -->
<div class="orderbyitem" style="overflow:auto">
<el-button-group class="orderby-group">
<el-button size='mini' :type="orderindex==0?'danger':''" @click="changeOrderType(0)">综合</el-button>
<el-button size='mini' :type="orderindex==1?'danger':''" @click="changeOrderType(1)">团期 <i :class="ordertype==0||orderindex!=1?'el-icon-arrow-down':'el-icon-arrow-up'"></i></el-button>
<el-button size='mini' :type="orderindex==2?'danger':''" @click="changeOrderType(2)">价格 <i :class="ordertype==0||orderindex!=2?'el-icon-arrow-down':'el-icon-arrow-up'"></i></el-button>
<el-button size='mini' :type="orderindex==3?'danger':''" @click="changeOrderType(3)">销量 <i :class="ordertype==0||orderindex!=3?'el-icon-arrow-down':'el-icon-arrow-up'"></i></el-button>
<el-button size='mini' :type="orderindex==4?'danger':''" @click="changeOrderType(4)">评论数 <i :class="ordertype==0||orderindex!=4?'el-icon-arrow-down':'el-icon-arrow-up'"></i></el-button>
</el-button-group>
<div class="pirce">
<span>价格区间</span>
<el-input size="mini" v-model="minPrice" @keyup.native="proving" @keyup.enter='GetList' maxlength='6' style="width:80px;display:inline-block;margin:0 6px"></el-input>
<strong>~</strong>
<el-input size="mini" v-model="maxPrice" @keyup.native="proving" @keyup.enter='GetList' maxlength='6' style="width:80px;display:inline-block;margin:0 6px"></el-input>
<el-button size='mini' @click="GetList">确认</el-button>
</div>
</div>
<div class="content_list" v-if="datalist.length>0"> <div class="content_list" v-if="datalist.length>0">
<el-row class="row_content" v-for="item in datalist" :key="item.id"> <el-row class="row_content" v-for="item in datalist" :key="item.id">
<el-col :span="3"> <el-col :span="3">
<img :src="item.coverImage[0].url" alt="" :onerror="errorImg"> <img :src="item.imgCover[0].Url" alt="" :onerror="errorImg">
</el-col> </el-col>
<el-col class="div_2" :span="14" style="font-size:12px"> <el-col class="div_2" :span="14" style="font-size:12px">
<p @click="GourlItem(item)" class="visa_title" style="font-size:16px;color:#000000">{{item.name}}</p> <p @click="goUrl('detail',item.id,item.tcid)" class="visa_title" style="font-size:16px;color:#000000">
<p><span v-for="(tag,index) in item.tagList" :key="index+100" class=tag>{{tag}}</span></p> {{item.lineName}}+{{item.ltName}}+{{item.productRecommend}}
</p>
<p v-if="item.priceTags"><span v-for="(tag,index) in item.priceTags" :key="index+100" class=tag>{{tag}}</span></p>
<p>{{item.startCityName}}出发</p>
<p>出发日期：最早{{item.startDate}}出发</p> <p>出发日期：最早{{item.startDate}}出发</p>
<p>提前预定：{{item.bookAdvance}}个工作日</p>
</el-col> </el-col>
<el-col :span="4" style="color:#FF680B;font-size:16px;"> <el-col :span="4" style="color:#FF680B;font-size:16px;">
￥<span style="font-weight:700">{{item.visaPrice | priceFormat}}</span><span style="font-size:12px">起</span> ￥<span style="font-weight:700">{{item.b2BPrice | priceFormat}}</span><span style="font-size:12px">起</span>
</el-col> </el-col>
<el-col :span="3" style="text-align:right"> <el-col :span="3" style="text-align:right">
<el-button @click="GourlItem(item)" size="small" style="border:1px solid #FF6633;color:#FF6633;">立即预定</el-button> <el-button @click="goUrl('detail',item.id,item.tcid)" size="small" style="border:1px solid #FF6633;color:#FF6633;">立即预定</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-pagination style="margin:15px;text-align:right" <el-pagination style="margin:15px;text-align:right"
...@@ -161,13 +178,26 @@ export default { ...@@ -161,13 +178,26 @@ export default {
}, },
hotcountry:[], hotcountry:[],
listmsg:{ listmsg:{
minTripDay:-1,
maxTripDay:-1,
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:10,
lineId:0, lineId:0,
lineTeamId:0, lineTeamId:0,
dayNum:0, dayNum:-1,
monthdate:[], monthdate:[],
priceTag:[],
startCityId:0,
cityId:parseInt(localStorage.site),
startDate:'',
endDate:'',
minPrice:'',
maxPrice:'',
companyId:parseInt(localStorage.site),
priceOrderByField:4,
}, },
minPrice:'',
maxPrice:'',
total:0, total:0,
datalist:[], datalist:[],
pageCount:0, pageCount:0,
...@@ -178,6 +208,19 @@ export default { ...@@ -178,6 +208,19 @@ export default {
tripDayList:[], tripDayList:[],
MonthDateList:[], MonthDateList:[],
monthid:0, monthid:0,
ThemeTagList:[],
tagmsg:{
name:'theme',
code:1,
},
orderindex:1,
ordertype:0,
pickerOptions0: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
}
} }
}, },
...@@ -192,18 +235,94 @@ export default { ...@@ -192,18 +235,94 @@ export default {
// this.GetVisaCountry(); // this.GetVisaCountry();
this.LoadMonth(); this.LoadMonth();
this.loadRecoItems() this.loadRecoItems()
this.getThemeTag()
this.GetList();
}, },
methods: { methods: {
SelectMonth(item){ goUrl(path,id,tcid){
// detailTwo
path = 'detailThree'
path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path })
},
proving(){
this.minPrice=this.minPrice.replace(/[^\.\d]/g,'')
this.minPrice=this.minPrice.replace('.','')
this.maxPrice=this.maxPrice.replace(/[^\.\d]/g,'')
this.maxPrice=this.maxPrice.replace('.','')
},
changeOrderType(i){
if(this.orderindex==i){
this.ordertype=this.ordertype==0?1:0
}else{
this.orderindex=i
this.ordertype=0
}
this.listmsg.orderByDate=this.orderindex==1?(this.ordertype==0?2:1):0;
this.listmsg.orderByPrice=this.orderindex==2?(this.ordertype==0?2:1):0;
this.listmsg.orderBySales=this.orderindex==3?(this.ordertype==0?2:1):0;
this.GetList()
},
SelectThemeTag(num,item){
this.listmsg.priceTag=[];
this.ThemeTagList.forEach(item=>{
item.SNO=0;
})
if(num!=0){
this.listmsg.priceTag.push(item.ID);
this.listmsg.priceTag.forEach(tag=>{
this.ThemeTagList.forEach(item=>{
if(tag==item.ID){
item.SNO=-1;
}
})
})
}
this.GetList();
},
// 获取主题标签
getThemeTag(){
this.apipost('travel_get_GetTravelPriceTag',this.tagmsg,res=>{
if(res.data.resultCode==1){
this.ThemeTagList=res.data.data;
this.ThemeTagList.forEach(item=>{
// if(tag==item.ID){
item.show=0;
// }
})
}else{}
},err=>{})
},
SelectMonth(num,item){
this.listmsg.monthdate=[]; this.listmsg.monthdate=[];
this.monthid=item.month; this.monthid=num;
this.listmsg.monthdate.push(item.startDate); if(num==0){
this.listmsg.monthdate.push(item.endDate);
console.log(this.listmsg) this.listmsg.startDate="";
this.listmsg.endDate="";
}else{
this.listmsg.monthdate.push(item.startDate);
this.listmsg.monthdate.push(item.endDate);
this.listmsg.startDate=item.startDate;
this.listmsg.endDate=item.endDate;
}
this.GetList();
}, },
ChangeDate(){ ChangeDate(){
console.log("sdff",this.listmsg.monthdate)
this.monthid=0; this.monthid=0;
this.listmsg.startDate="";
this.listmsg.endDate="";
if(this.listmsg.monthdate){
this.monthid=-1;
this.listmsg.startDate=this.listmsg.monthdate[0];
this.listmsg.endDate=this.listmsg.monthdate[1];
}
this.GetList();
}, },
LoadMonth(){ LoadMonth(){
const currentmonth = moment().month(); const currentmonth = moment().month();
...@@ -219,58 +338,58 @@ export default { ...@@ -219,58 +338,58 @@ export default {
// console.log("MonthDateList",this.MonthDateList) // console.log("MonthDateList",this.MonthDateList)
}, },
// 选择天数 // 选择天数
SelectDay(item){ SelectDay(id){
this.listmsg.dayNum=item.id; this.listmsg.dayNum=id;
}, this.GetList();
// 选择系列
Selectseries(item){
this.listmsg.lineTeamId=item.id;
}, },
// 选择线路 // 选择线路
ChangeLine(item){ ChangeLine(id){
this.listmsg.lineId=item.id; this.listmsg.lineId=id;
this.seriesList=item.lineTeam; this.GetList();
}, },
loadRecoItems(){ loadRecoItems(){
if(this.companyId!=-1){ if(this.companyId!=-1){
this.apipost('b2b_get_GetGroupSearchItem',{'companyId':this.companyId},r=>{ this.apipost('b2b_get_GetFreeSearchItem',{'companyId':this.companyId},r=>{
this.linesList=r.data.data.line; this.linesList=r.data.data.lineTeam;
this.startCityList=r.data.data.startCity; this.startCityList=r.data.data.startCity;
this.tripDayList=r.data.data.tripDay; this.tripDayList=r.data.data.tripDay;
},null) },null)
} }
}, },
SelectCountry(id){
this.listmsg.visaCountryId=id;
this.GetVisaProListChoose();
this.GetList();
},
CurrentChange(val){ CurrentChange(val){
this.listmsg.pageIndex=val; this.listmsg.pageIndex=val;
this.GetList(); this.GetList();
}, },
GetList(){ GetList(){
this.listmsg.minPrice=-1;
this.listmsg.maxPrice=-1;
if(this.minPrice!=''){
this.listmsg.minPrice=parseFloat(this.minPrice)
}
if(this.maxPrice!=''){
this.listmsg.maxPrice=parseFloat(this.maxPrice)
if(this.listmsg.minPrice>this.listmsg.maxPrice){
this.Error('价格区间的最低价格不能低于最大价格')
return false
}
}
this.loading=true; this.loading=true;
let arr= this.tagType1.concat(this.tagType2); this.apipost('b2b_get_GetB2BFreePageList',this.listmsg,res=>{
this.listmsg.tags=arr.concat(this.tagType3); // console.log("res",res);
this.apiJavaPost(
"/api/b2b/visa/getVisaProductList",
this.listmsg,
res => {
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if(res.data.resultCode==1){
this.datalist=res.data.data.pageData; this.datalist=res.data.data.pageData;
this.total=res.data.data.count;
this.datalist.forEach(item=>{ this.total=res.data.data.count;
item.tagList=item.tagTames.split(","); this.datalist.forEach(item=>{
}) item.imgCover=JSON.parse(item.imgCover)
})
} else { }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },null)
null
);
}, },
OrderByPrice(num){ OrderByPrice(num){
this.listmsg.orderByPrice=num; this.listmsg.orderByPrice=num;
...@@ -280,8 +399,8 @@ export default { ...@@ -280,8 +399,8 @@ export default {
this.listmsg.orderByBookAdvance=num; this.listmsg.orderByBookAdvance=num;
this.GetList(); this.GetList();
}, },
SelectCity(companyId){ SelectCity(id){
this.listmsg.companyId=companyId; this.listmsg.startCityId=id;
this.GetList(); this.GetList();
}, },
...@@ -337,6 +456,16 @@ export default { ...@@ -337,6 +456,16 @@ export default {
<style> <style>
@import "../../assets/css/reset.css"; @import "../../assets/css/reset.css";
.visaList .orderbyitem .orderby-group{
float: left;
}
.visaList .orderbyitem .pirce{
float: right;
text-align: right;
font-size: 12px;
height: 28px;
line-height: 28px;
}
.visaList .top_ul .el-carousel__arrow--left{ .visaList .top_ul .el-carousel__arrow--left{
left: -30px; left: -30px;
top: 25px; top: 25px;
...@@ -450,6 +579,7 @@ export default { ...@@ -450,6 +579,7 @@ export default {
} }
.visaList .datalist{ .visaList .datalist{
background: #fff; background: #fff;
margin-top:20px;
} }
.visaList .rolate{ .visaList .rolate{
transform:rotateX(180deg); transform:rotateX(180deg);
......
src/components/DependentTravel/IndependentTravel.vue
View file @ 12ace2e5
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</div> </div>
<div class="Season_content"> <div class="Season_content">
<div v-for="(item,index) in TreatmentList" :key="index+100" v-if="index<3"> <div v-for="(item,index) in TreatmentList" :key="index+100" v-if="index<3">
<div class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}"> <div @click="goUrl('detail',item.id,item.tcid)" class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div style="position:relative;height: 35px;background-color: white;bottom: -5px;"> <div style="position:relative;height: 35px;background-color: white;bottom: -5px;">
<!-- <img ref="img0" id="img0" src="../../assets/img/visa/country1.png" alt=""> --> <!-- <img ref="img0" id="img0" src="../../assets/img/visa/country1.png" alt=""> -->
<div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money"> <div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money">
...@@ -90,14 +90,14 @@ ...@@ -90,14 +90,14 @@
<div style="padding: 3px 10px 10px;"> <div style="padding: 3px 10px 10px;">
<p <p
style="font-size:16px;font-weight:600;text-align:center;background-color: white;" style="font-size:16px;font-weight:600;text-align:center;background-color: white;"
>{{item.title}}</p> >{{item.lineName}}</p>
<div class="text"> <div class="text">
<p>{{item.lineName}}</p> <p>{{item.title}}</p>
<p>{{item.ltName}}</p> <p>{{item.ltName}}</p>
</div> </div>
</div> </div>
<div> <div>
<el-button size="mini" class="btn">立即购买</el-button> <el-button size="mini" class="btn" @click="goUrl('detail',item.id,item.tcid)">立即购买</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<div v-if="TreatmentList.length>3" class="Season_content" style="padding: 0px 120px;"> <div v-if="TreatmentList.length>3" class="Season_content" style="padding: 0px 120px;">
<div v-for="(item,index) in TreatmentList" :key="index" v-if="index>2 && index<5"> <div v-for="(item,index) in TreatmentList" :key="index" v-if="index>2 && index<5">
<div class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}"> <div @click="goUrl('detail',item.id,item.tcid)" class="Season_content_list" :style="{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div style="position:relative;height: 35px;background-color: white;bottom: -5px;"> <div style="position:relative;height: 35px;background-color: white;bottom: -5px;">
<div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money"> <div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money">
<p style="font-size:12px;padding-top:10px">RMB</p> <p style="font-size:12px;padding-top:10px">RMB</p>
...@@ -118,9 +118,9 @@ ...@@ -118,9 +118,9 @@
<div style="padding: 3px 10px 10px;"> <div style="padding: 3px 10px 10px;">
<p <p
style="font-size:16px;font-weight:600;text-align:center;background-color: white;" style="font-size:16px;font-weight:600;text-align:center;background-color: white;"
>{{item.title}}</p> >{{item.lineName}}</p>
<div class="text"> <div class="text">
<p>{{item.lineName}}</p> <p>{{item.title}}</p>
<p>{{item.ltName}}</p> <p>{{item.ltName}}</p>
</div> </div>
</div> </div>
...@@ -157,12 +157,12 @@ ...@@ -157,12 +157,12 @@
<el-col :span="10"> <el-col :span="10">
<div> <div>
<p class="zyx_title"> <p class="zyx_title">
{{item.title}} {{item.lineName}}
<span class="persontravel">{{item.totalPosition}}人成行</span> <span class="persontravel">{{item.totalPosition}}人成行</span>
</p> </p>
<div class="zyx_content"> <div class="zyx_content">
<p>余位 {{item.surplus}}</p> <p>余位 {{item.surplus}}</p>
<p>{{item.lineName}}</p> <p>{{item.title}}</p>
<p>{{item.ltName}}</p> <p>{{item.ltName}}</p>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
</span> </span>
<span style="font-size:12px">{{item.startCityName}}出发</span> <span style="font-size:12px">{{item.startCityName}}出发</span>
</div> </div>
<el-button <el-button @click="goUrl('detail',item.id,item.tcid)"
size="mini" size="mini"
style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top" style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>立即抢购</el-button> >立即抢购</el-button>
...@@ -189,12 +189,12 @@ ...@@ -189,12 +189,12 @@
<el-col :span="10"> <el-col :span="10">
<div> <div>
<p class="zyx_title"> <p class="zyx_title">
{{item.title}} {{item.lineName}}
<span class="persontravel">{{item.totalPosition}}人成行</span> <span class="persontravel">{{item.totalPosition}}人成行</span>
</p> </p>
<div class="zyx_content"> <div class="zyx_content">
<p>余位 {{item.surplus}}</p> <p>余位 {{item.surplus}}</p>
<p>{{item.lineName}}</p> <p>{{item.title}}</p>
<p>{{item.ltName}}</p> <p>{{item.ltName}}</p>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
</span> </span>
<span style="font-size:12px">{{item.startCityName}}出发</span> <span style="font-size:12px">{{item.startCityName}}出发</span>
</div> </div>
<el-button <el-button @click="goUrl('detail',item.id,item.tcid)"
size="mini" size="mini"
style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top" style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>立即抢购</el-button> >立即抢购</el-button>
...@@ -233,12 +233,12 @@ ...@@ -233,12 +233,12 @@
<el-col :span="10"> <el-col :span="10">
<div> <div>
<p class="zyx_title"> <p class="zyx_title">
{{item.title}} {{item.lineName}}
<span class="persontravel">{{item.totalPosition}}人成行</span> <span class="persontravel">{{item.totalPosition}}人成行</span>
</p> </p>
<div class="zyx_content"> <div class="zyx_content">
<p>余位 {{item.surplus}}</p> <p>余位 {{item.surplus}}</p>
<p>{{item.lineName}}</p> <p>{{item.title}}</p>
<p>{{item.ltName}}</p> <p>{{item.ltName}}</p>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</span> </span>
<span style="font-size:12px">{{item.startCityName}}出发</span> <span style="font-size:12px">{{item.startCityName}}出发</span>
</div> </div>
<el-button <el-button @click="goUrl('detail',item.id,item.tcid)"
size="mini" size="mini"
style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top" style="background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>立即抢购</el-button> >立即抢购</el-button>
...@@ -385,6 +385,13 @@ export default { ...@@ -385,6 +385,13 @@ export default {
}, },
}, },
methods: { methods: {
//
goUrl(path,id,tcid){
// detailTwo
path = 'detailThree'
path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path })
},
HotCrash(){ HotCrash(){
this.apipost('b2b_get_GetB2BFreeRecommendPageList', this.apipost('b2b_get_GetB2BFreeRecommendPageList',
this.commonmsg2, this.commonmsg2,
......
src/components/Home.vue
View file @ 12ace2e5
...@@ -910,7 +910,7 @@ ...@@ -910,7 +910,7 @@
<el-row class="home_footer"> <el-row class="home_footer">
<el-col :span="6"> <el-col :span="6">
<div class="float"><i class="iconfont icon-icon-test6"></i></div> <div class="float"><i class="iconfont icon-icon-test6"></i></div>
<div class="float" style="width:200px"> <div class="float" style="width:198px">
<p class="color_33">印象之旅</p> <p class="color_33">印象之旅</p>
<ul> <ul>
<li>跟团游</li> <li>跟团游</li>
...@@ -926,7 +926,7 @@ ...@@ -926,7 +926,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<div class="float"><i class="iconfont icon-icon-test7"></i></div> <div class="float"><i class="iconfont icon-icon-test7"></i></div>
<div class="float"> <div class="float">
<p class="color_33">优惠渠道</p> <p class="color_33">优惠渠道</p>
...@@ -939,7 +939,7 @@ ...@@ -939,7 +939,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<div class="float"><i class="iconfont icon-cailiao"></i></div> <div class="float"><i class="iconfont icon-cailiao"></i></div>
<div class="float"> <div class="float">
<p class="color_33">定制旅游</p> <p class="color_33">定制旅游</p>
...@@ -951,7 +951,7 @@ ...@@ -951,7 +951,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<div class="float"><i class="iconfont icon-putonghuiyuan"></i></div> <div class="float"><i class="iconfont icon-putonghuiyuan"></i></div>
<div class="float"> <div class="float">
<p class="color_33">个人中心</p> <p class="color_33">个人中心</p>
...@@ -964,23 +964,26 @@ ...@@ -964,23 +964,26 @@
</div> </div>
</el-col> </el-col>
<el-col :span="3" style="text-align:center">
<p style="color:#666666;font-size:14px;">微信扫描小程序</p>
<div style="width:118px;height:118px;border:1px dashed #eeeeee;display: inline-block;margin-top:5px"><img src="../assets/img/xiaocx.png" alt=""></div>
</el-col>
</el-row> </el-row>
</div> </div>
<div class="phone"> <!-- <div class="phone">
<div style="width:1180px;height:100%;margin:0 auto;display:flex;align-items:center;justify-content: flex-end;"> <div style="width:1180px;height:100%;margin:0 auto;display:flex;align-items:center;justify-content: flex-end;">
<el-col :span="1"><i class="iconfont icon-Shape2" style="color:#fff;font-size:30px"></i></el-col> <el-col :span="1"><i class="iconfont icon-Shape2" style="color:#fff;font-size:30px"></i></el-col>
<el-col :span="4" style="color:#fff"> <el-col :span="4" style="color:#fff">
<p>客服服务电话 <p>客服服务电话
<!-- <img src="../assets/img/home/qipao.png" alt=""> -->
<span class="qipao">24小时</span> <span class="qipao">24小时</span>
</p> </p>
<p style="font-size:18px;font-weight:700">028-88888888</p> <p style="font-size:18px;font-weight:700">028-62051755</p>
</el-col> </el-col>
</div> </div>
</div> </div> -->
</div> </div>
</template> </template>
......
src/components/Ticket/TicketHome.vue
View file @ 12ace2e5
...@@ -449,6 +449,9 @@ export default { ...@@ -449,6 +449,9 @@ export default {
@import "//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css"; @import "//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css";
@import "../../assets/global/global.css"; @import "../../assets/global/global.css";
@import "../../assets/css/reset.css"; @import "../../assets/css/reset.css";
.ticket_home .ch{
font-weight: 700;
}
.choose_form .el-input__inner { .choose_form .el-input__inner {
border-radius: 0; border-radius: 0;
} }
......
src/components/Ticket/TicketList.vue
View file @ 12ace2e5
...@@ -405,10 +405,10 @@ export default { ...@@ -405,10 +405,10 @@ export default {
mounted() {}, mounted() {},
created() { created() {
this.loading = true; this.loading = true;
if(sessionStorage.getItem("ChooseInfo")){
this.choose_info = JSON.parse(sessionStorage.getItem("ChooseInfo")); this.choose_info = JSON.parse(sessionStorage.getItem("ChooseInfo"));
this.datainfo = JSON.parse(sessionStorage.getItem("ChooseInfo")); this.datainfo = JSON.parse(sessionStorage.getItem("ChooseInfo"));
}
this.choose_info.priceSort = 0; this.choose_info.priceSort = 0;
this.choose_info.timeSort = 0; this.choose_info.timeSort = 0;
if ( if (
......
src/router.js
View file @ 12ace2e5
...@@ -57,6 +57,16 @@ export default new Router({ ...@@ -57,6 +57,16 @@ export default new Router({
title: '团队详情-印象之旅~感动与世界同步' title: '团队详情-印象之旅~感动与世界同步'
} }
}, },
// 自由行详情
{
path: "/detailThree/:id/:tcid",
name: "detailThree",
component: resolve =>
require(["@/components/mall/detailThree"], resolve),
meta: {
title: "团队详情-印象之旅~感动与世界同步"
}
},
{ {
path: "/OneDayDetailTwo/:id/:tcid", path: "/OneDayDetailTwo/:id/:tcid",
name: "OneDayDetailTwo", name: "OneDayDetailTwo",
......
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