Skip to content

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

update

parent b0682bdb
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 18 deletions
src/assets/css/home.css
View file @ 3341b495
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
background: transparent; background: transparent;
padding: 0; padding: 0;
} }
.Home .Home_top .tag_right .visaul_li li .el-date-editor.el-input, .el-date-editor.el-input__inner { .Home .Home_top .tag_right .visaul_li li .el-date-editor.el-input,.Home .Home_top .tag_right .visaul_li li .el-date-editor.el-input__inner {
width: 100px!important; width: 100px!important;
position: relative; position: relative;
} }
......
src/components/GroupTour/index.vue
View file @ 3341b495
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<li v-if="item.sbuItem.placeNames.length>0" style="margin-top:15px;"> <li v-if="item.sbuItem.placeNames.length>0" style="margin-top:15px;">
<p style="color:#111111;font-family:'PingFangR'">热门目的地</p> <p style="color:#111111;font-family:'PingFangR'">热门目的地</p>
<div style="margin-top:6px"> <div style="margin-top:6px">
<span v-for="(place,index) in item.sbuItem.placeNames" :key="index"> <span @click="GostartCity(place)" v-for="(place,index) in item.sbuItem.placeNames" :key="index">
<span>{{place}}</span> <span>{{place}}</span>
<span v-if="index!=item.sbuItem.placeNames.length-1" style="padding:0 6px">|</span> <span v-if="index!=item.sbuItem.placeNames.length-1" style="padding:0 6px">|</span>
</span> </span>
...@@ -108,6 +108,11 @@ export default { ...@@ -108,6 +108,11 @@ export default {
} }
}, },
methods: { methods: {
// 系列
GostartCity(place){
this.$router.push({ path:'/search',
query:{tab:2,keywords:"",startCityId:place} })
},
// 系列 // 系列
GoLine(item,line){ GoLine(item,line){
this.$router.push({ path:'/search', this.$router.push({ path:'/search',
......
src/components/Home.vue
View file @ 3341b495
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
<el-tabs v-model="activecontent1" @tab-click="handleClick"> <el-tabs v-model="activecontent1" @tab-click="handleClick">
<el-tab-pane label="超值特卖" name="first"> <el-tab-pane label="超值特卖" name="first">
<div style="margin-left:-25px"> <div style="margin-left:-25px">
<div v-if="index<5" :key="index+700" v-for="(item,index) in homeTravelSpecialSale" class="cztm_item"> <div @click="goLocalDes(item.idDes, item)" v-if="index<5" :key="index+700" v-for="(item,index) in homeTravelSpecialSale" class="cztm_item">
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt=""> <img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="//dimg07.c-ctrip.com/images/100j0y000000m0bhg78DC_C_221_166.jpg" alt=""> <img v-else src="//dimg07.c-ctrip.com/images/100j0y000000m0bhg78DC_C_221_166.jpg" alt="">
<div class="cztm_item_content"> <div class="cztm_item_content">
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
<span @click="GoMore('heel')" style="float:right;color:#999999;font-size:12px">查看更多</span> <span @click="GoMore('heel')" style="float:right;color:#999999;font-size:12px">查看更多</span>
</ul> </ul>
<div v-loading="Travelload" class="tour_right_content" style="height:342px"> <div v-loading="Travelload" class="tour_right_content" style="height:342px">
<div v-if="index<8" v-for="(item,index) in TravelPriceList" :key="index+100" class="tour_right_item"> <div @click="goLocalDes(item.idDes, item)" v-if="index<8" v-for="(item,index) in TravelPriceList" :key="index+100" class="tour_right_item">
<div style="position:relative;height:127px"> <div style="position:relative;height:127px">
<!-- <img v-if="item.imgCover[0].url" :src='item.imgCover[0].url' alt=""> --> <!-- <img v-if="item.imgCover[0].url" :src='item.imgCover[0].url' alt=""> -->
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt=""> <img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
<span @click="GoMore('IndependentList')" style="float:right;color:#999999;font-size:12px">查看更多</span> <span @click="GoMore('IndependentList')" style="float:right;color:#999999;font-size:12px">查看更多</span>
</ul> </ul>
<div class="travel_right_content"> <div class="travel_right_content">
<div @click="goUrl('detailThree',item.id,item.tcid)" v-if="index==0" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_big"> <div @click="goUrl('detailThree',item.idDes,item.tcid)" v-if="index==0" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_big">
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt=""> <img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="../assets/img/home/tour4.png" alt=""> <img v-else src="../assets/img/home/tour4.png" alt="">
<div class="Remarks"> <div class="Remarks">
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
</div> </div>
</div> </div>
<div class="travel_samll_div"> <div class="travel_samll_div">
<div @click="goUrl('detailThree',item.id,item.tcid)" v-if="index>0 && index<5" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_small"> <div @click="goUrl('detailThree',item.idDes,item.tcid)" v-if="index>0 && index<5" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_small">
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt=""> <img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="../assets/img/home/tour4.png" alt=""> <img v-else src="../assets/img/home/tour4.png" alt="">
<div class="Remarks"> <div class="Remarks">
...@@ -419,7 +419,7 @@ ...@@ -419,7 +419,7 @@
</div> </div>
</div> </div>
</div> </div>
<div @click="goUrl('detailThree',item.id,item.tcid)" v-if="index==5" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_big"> <div @click="goUrl('detailThree',item.idDes,item.tcid)" v-if="index==5" v-for="(item,index) in freePriceList" :key="index+150" class="travel_right_item travel_right_item_big">
<img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt=""> <img v-if="item.imgCover[0].url" :src='compressImg(item.imgCover[0].url, "filt", 245, "")' alt="">
<img v-else src="../assets/img/home/tour4.png" alt=""> <img v-else src="../assets/img/home/tour4.png" alt="">
<div class="Remarks"> <div class="Remarks">
...@@ -884,6 +884,14 @@ export default { ...@@ -884,6 +884,14 @@ export default {
this.isLogin=this.$store.state.isLogin; this.isLogin=this.$store.state.isLogin;
}, },
methods: { methods: {
goLocalDes(idDes,obj){
// console.log(idDes);
// console.log(obj);
// return;
let path = 'detailTwo'
path=`${path}/${encodeURIComponent(idDes)}/${obj.tcid}`;
this.$router.push({ path })
},
// 机票购买 // 机票购买
Purchase(item) { Purchase(item) {
let isLogin = this.$store.state.isLogin; let isLogin = this.$store.state.isLogin;
...@@ -1010,9 +1018,9 @@ export default { ...@@ -1010,9 +1018,9 @@ export default {
query:{idDes:encodeURIComponent(item.idDes)} }) query:{idDes:encodeURIComponent(item.idDes)} })
}, },
// 跳转自由行详情 // 跳转自由行详情
goUrl(path,id,tcid){ goUrl(path,idDes,tcid){
path = 'detailThree' path = 'detailThree'
path=`${path}/${encodeURIComponent(id)}/`+tcid path=`${path}/${encodeURIComponent(idDes)}/`+tcid
this.$router.push({ path }) this.$router.push({ path })
}, },
ClickTicket(item){ ClickTicket(item){
...@@ -1145,12 +1153,13 @@ export default { ...@@ -1145,12 +1153,13 @@ export default {
if (days > 0) { if (days > 0) {
returnStr += "<span class='bg'>"+days+"</span>" + "天"; returnStr += "<span class='bg'>"+days+"</span>" + "天";
} }
if (minutes > 0) {
returnStr += "<span class='bg'>"+minutes+"</span>" + "分";
}
if (hours > 0) { if (hours > 0) {
returnStr += "<span class='bg'>"+hours+"</span>" + "时"; returnStr += "<span class='bg'>"+hours+"</span>" + "时";
} }
if (minutes > 0) {
returnStr += "<span class='bg'>"+minutes+"</span>" + "分";
}
return returnStr return returnStr
}, },
......
src/components/mall/search.vue
View file @ 3341b495
...@@ -415,6 +415,8 @@ export default { ...@@ -415,6 +415,8 @@ export default {
if(this.companyId!=-1){ if(this.companyId!=-1){
this.apipost('b2b_get_GetGroupSearchItem',{'companyId':this.companyId},r=>{ this.apipost('b2b_get_GetGroupSearchItem',{'companyId':this.companyId},r=>{
this.lines=r.data.data.line this.lines=r.data.data.line
if(this.$route.query.lineId&&this.$route.query.lineteamId){ if(this.$route.query.lineId&&this.$route.query.lineteamId){
this.searchItem[0]=this.$route.query.lineId this.searchItem[0]=this.$route.query.lineId
this.searchItem[1]=this.$route.query.lineteamId this.searchItem[1]=this.$route.query.lineteamId
...@@ -423,7 +425,12 @@ export default { ...@@ -423,7 +425,12 @@ export default {
}else if(this.$route.query.lineId){ }else if(this.$route.query.lineId){
this.searchItem[0]=this.$route.query.lineId this.searchItem[0]=this.$route.query.lineId
this.changeXilie() this.changeXilie()
}else{ }else if(this.$route.query.startCityId){
this.searchItem[3]=this.$route.query.startCityId;
this.loadTeamDataInit()
}
else{
this.loadTeamDataInit() this.loadTeamDataInit()
} }
this.startCitys=r.data.data.startCity this.startCitys=r.data.data.startCity
......
src/components/visa/Visaitemsdetails.vue
View file @ 3341b495
...@@ -53,12 +53,12 @@ ...@@ -53,12 +53,12 @@
v-model="peopleform.startdate" v-model="peopleform.startdate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:picker-options="pickerOptions0" :picker-options="pickerEnd"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="成人"> <el-form-item label="成人">
<el-select size="small" style="width:100px" v-model="peopleform.man" clearable placeholder="请选择"> <el-select size="small" @change="ManNum" style="width:100px" v-model="peopleform.man" clearable placeholder="请选择">
<el-option v-for="item in personSelectnum" <el-option v-for="item in personSelectnum"
:key="item" :key="item"
:label="item" :label="item"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<!-- <el-input size="small" v-model.number="peopleform.man"></el-input> --> <!-- <el-input size="small" v-model.number="peopleform.man"></el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="儿童"> <el-form-item label="儿童">
<el-select size="small" style="width:100px" v-model="peopleform.child" clearable placeholder="请选择"> <el-select @change="ChildNum" size="small" style="width:100px" v-model="peopleform.child" clearable placeholder="请选择">
<el-option v-for="item in personSelectnum" <el-option v-for="item in personSelectnum"
:key="item" :key="item"
:label="item" :label="item"
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
&nbsp; &nbsp;
</el-form-item> </el-form-item>
<el-form-item style="float:right"> <el-form-item style="float:right">
<span style="font-size:12px;margin:0 35px">价格：￥<span style="color:#FF680B;font-size:18px">{{visadeatils.visaPrice | priceFormat}}</span><span style="color:#FF680B;font-size:12px">起</span></span> <span style="font-size:12px;margin:0 35px">价格：￥<span style="color:#FF680B;font-size:18px">{{perferPrice | priceFormat}}</span><span style="color:#FF680B;font-size:12px">起</span></span>
<el-button @click="Gourl" size="small" style="border:none;background:#EE4454;color:#fff;">立即购买</el-button> <el-button @click="Gourl" size="small" style="border:none;background:#EE4454;color:#fff;">立即购买</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -268,6 +268,12 @@ ...@@ -268,6 +268,12 @@
export default { export default {
data() { data() {
return { return {
pickerEnd: {
disabledDate: time => {
let startTime = new Date(this.visadeatils.sendVisaDate)
return startTime.getTime() < time.getTime() || time.getTime() < Date.now() - 8.64e7
}
},
scrollobj: null, scrollobj: null,
personSelectnum:[0,1,2,3,4,5,6,7,8,9,10], personSelectnum:[0,1,2,3,4,5,6,7,8,9,10],
navs: [ "fysm", "qzcl", "wxts", "ydlc"], navs: [ "fysm", "qzcl", "wxts", "ydlc"],
...@@ -285,6 +291,8 @@ export default { ...@@ -285,6 +291,8 @@ export default {
productId:0, productId:0,
visadeatils:{}, visadeatils:{},
ProductInfo:{}, ProductInfo:{},
visaPrice:0,
perferPrice:0,
}; };
}, },
created(){ created(){
...@@ -298,14 +306,33 @@ export default { ...@@ -298,14 +306,33 @@ export default {
this.scrollobj.addEventListener("scroll", this.handleScroll); this.scrollobj.addEventListener("scroll", this.handleScroll);
}, },
methods: { methods: {
ManNum(val){
if(val==""){
val==0
}
this.peopleform.man=val;
let personnum=this.peopleform.man+this.peopleform.child;
this.perferPrice=personnum*this.visaPrice;
},
ChildNum(val){
if(val==""){
val==0
}
this.peopleform.child=val;
let personnum=this.peopleform.man+this.peopleform.child;
this.perferPrice=personnum*this.visaPrice;
},
GetDetails(){ GetDetails(){
this.apipost( this.apipost(
"b2b_get_GetVisaProductInfo", "b2b_get_GetVisaProductInfo",
{ productId: this.productId }, { productId: this.productId },
res => { res => {
// console.log(res); console.log(res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.visadeatils=res.data.data; this.visadeatils=res.data.data;
this.visaPrice=this.visadeatils.visaPrice;
this.ProductInfo=res.data.data.visaProductInfo; this.ProductInfo=res.data.data.visaProductInfo;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
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