Commit 2a792a43 authored by huangyuanyuan's avatar huangyuanyuan

update

parent 8a2121c8
...@@ -254,7 +254,7 @@ export default { ...@@ -254,7 +254,7 @@ export default {
// detailTwo // detailTwo
path = 'detailTwo' path = 'detailTwo'
path=`${path}/${encodeURIComponent(id)}/`+tcid path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path,query:{teamType:1}}) this.$router.push({ path,query:{teamType:1,free:'free'}})
}, },
proving(){ proving(){
this.minPrice=this.minPrice.replace(/[^\.\d]/g,'') this.minPrice=this.minPrice.replace(/[^\.\d]/g,'')
......
...@@ -395,7 +395,7 @@ export default { ...@@ -395,7 +395,7 @@ export default {
// //
goUrl(path,id,tcid){ goUrl(path,id,tcid){
path=`${path}/${encodeURIComponent(id)}/`+tcid path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path,query:{teamType:1}}) this.$router.push({ path,query:{teamType:1,free:'free'}})
}, },
HotCrash(){ HotCrash(){
this.apipost('b2b_get_GetB2BFreeRecommendPageList', this.apipost('b2b_get_GetB2BFreeRecommendPageList',
......
...@@ -442,7 +442,7 @@ export default { ...@@ -442,7 +442,7 @@ export default {
let path = 'OneDayDetailTwo'; let path = 'OneDayDetailTwo';
path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`; path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`;
this.$router.push({ path }) this.$router.push({ path ,query:{local:'local'}})
}, },
GoFoodDes(item){ GoFoodDes(item){
this.$router.push({ this.$router.push({
......
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
goOneDayDetail(item){ goOneDayDetail(item){
let path = 'OneDayDetailTwo'; let path = 'OneDayDetailTwo';
path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`; path=`${path}/${encodeURIComponent(item.idDes)}/${item.tcid}`;
this.$router.push({ path }) this.$router.push({ path ,query:{local:'local'}})
if(this.Historylist.length>4 || this.Historylist.length==4){ if(this.Historylist.length>4 || this.Historylist.length==4){
this.Historylist.pop(); this.Historylist.pop();
} }
......
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
<p class="des" style="padding-top:26px;"> <p class="des" style="padding-top:26px;">
<!-- --> <!-- -->
<span>{{item.flightList[0].departureName}} - {{item.flightList[item.flightList.length-1].arrivalCityName}} </span> <span>{{item.flightList[0].departureName}} - {{item.flightList[item.flightList.length-1].arrivalCityName}} </span>
<span class="money">{{item.scatterB2BPrice | priceFormat}}</span> <span class="money">{{(isLogin!=1 ? item.scatterB2CPrice : item.scatterB2BPrice) | priceFormat}}</span>
</p> </p>
<p style="display:flex;align-items:center"> <p style="display:flex;align-items:center">
<img style="width:20px;height:20px" :src="item.airlineUrl" alt=""> <img style="width:20px;height:20px" :src="item.airlineUrl" alt="">
...@@ -352,12 +352,14 @@ export default { ...@@ -352,12 +352,14 @@ export default {
platformType:1 platformType:1
}, },
slideList:[], slideList:[],
isLogin:0,
}; };
}, },
mounted() { mounted() {
this.loadSize(); this.loadSize();
}, },
created() { created() {
this.isLogin=this.$store.state.isLogin;
this.JXYH(); this.JXYH();
this.initAirlines(); this.initAirlines();
this.CFD(); this.CFD();
......
...@@ -874,7 +874,7 @@ export default { ...@@ -874,7 +874,7 @@ export default {
this.htmlTitle = this.dataList.ltName; this.htmlTitle = this.dataList.ltName;
this.showFlight = true this.showFlight = true
this.$forceUpdate() this.$forceUpdate()
console.log("dataList",this.dataList); // console.log("dataList",this.dataList);
}else{ }else{
this.$message.error(r.data.message) this.$message.error(r.data.message)
} }
......
...@@ -89,9 +89,8 @@ ...@@ -89,9 +89,8 @@
<el-col :span="20" :offset="2" class="topic" v-if="free==1"> <el-col :span="20" :offset="2" class="topic" v-if="free==1">
<el-col :span='12'> <el-col :span='12'>
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/heel',query:{} }">自由行</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/IndependentTravel',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: '/IndependentList',query:{'lineteamId':dataList.lineteamId} }">{{dataList.ltName}}</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>{{dataList.title}}</el-breadcrumb-item> <el-breadcrumb-item>{{dataList.title}}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</el-col> </el-col>
...@@ -908,11 +907,9 @@ export default { ...@@ -908,11 +907,9 @@ export default {
}, },
getData: function (msg) { getData: function (msg) {
this.loadingDataList=true this.loadingDataList=true
console.log('api',msg)
this.apipost('b2b_get_GetB2BTravelInfoV1',msg,r=>{ this.apipost('b2b_get_GetB2BTravelInfoV1',msg,r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
let data = (r.data.data); let data = (r.data.data);
console.log("data",data)
this.sonData = data; this.sonData = data;
this.dayList = data.dayList; this.dayList = data.dayList;
this.feature = data.feature; this.feature = data.feature;
...@@ -978,6 +975,7 @@ export default { ...@@ -978,6 +975,7 @@ export default {
this.htmlTitle = this.dataList.ltName; this.htmlTitle = this.dataList.ltName;
this.showFlight = true this.showFlight = true
this.$forceUpdate() this.$forceUpdate()
// console.log("dataList",this.dataList)
}else{ }else{
this.$message.error(r.data.message) this.$message.error(r.data.message)
} }
...@@ -985,7 +983,6 @@ export default { ...@@ -985,7 +983,6 @@ export default {
},null) },null)
}, },
creatCalendar(list){ // 创建日历 creatCalendar(list){ // 创建日历
console.log("list",list)
let dateList = []; let dateList = [];
if(list && list.length>0){ if(list && list.length>0){
......
...@@ -110,7 +110,9 @@ ...@@ -110,7 +110,9 @@
</div> </div>
<div> <div>
<p class="title">{{item.countryName}}</p> <p class="title">{{item.countryName}}</p>
<p class="money">{{item.visaPrice | priceFormat}}</p> <p class="money">
{{(isLogin!=1 ? item.visaB2CPrice : item.visaPrice) | priceFormat}}
</p>
<p> <p>
<span class="gq"> <span class="gq">
<span v-if="item.visaType==1">个签</span> <span v-if="item.visaType==1">个签</span>
...@@ -202,7 +204,7 @@ ...@@ -202,7 +204,7 @@
<img :src="item.countryIcon" alt=""> <img :src="item.countryIcon" alt="">
<div class="visa_content"> <div class="visa_content">
<p class="visa_title">{{item.name}}</p> <p class="visa_title">{{item.name}}</p>
<p class="visa_money">{{item.visaPrice | priceFormat}}</p> <p class="visa_money">{{(isLogin!=1 ? item.visaB2CPrice : item.visaPrice) | priceFormat}}</p>
</div> </div>
</div> </div>
...@@ -287,8 +289,12 @@ export default { ...@@ -287,8 +289,12 @@ export default {
platformType:1 platformType:1
}, },
slideList:[], slideList:[],
isLogin:0,
} }
}, },
created(){
this.isLogin=this.$store.state.isLogin;
},
mounted () { mounted () {
this.companyId=this.$store.state.site this.companyId=this.$store.state.site
this.changeScreen() this.changeScreen()
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<p>提前预定:{{item.bookAdvance}}个工作日</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">{{(isLogin!=1 ? item.visaB2CPrice : item.visaPrice) | 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="GourlItem(item)" size="small" style="border:1px solid #FF6633;color:#FF6633;">立即预定</el-button>
...@@ -162,12 +162,13 @@ export default { ...@@ -162,12 +162,13 @@ export default {
total:0, total:0,
datalist:[], datalist:[],
pageCount:0, pageCount:0,
isLogin:0,
} }
}, },
created(){ created(){
this.isLogin=this.$store.state.isLogin;
if(this.$route.query.searchKey){ if(this.$route.query.searchKey){
this.listmsg.searchKey=this.$route.query.searchKey; this.listmsg.searchKey=this.$route.query.searchKey;
} }
......
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