Commit 8a2121c8 authored by huangyuanyuan's avatar huangyuanyuan

update

parent 120215f2
This diff is collapsed.
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
<img src="../../../assets/img/img-03.png" style="width:100%" v-else /> <img src="../../../assets/img/img-03.png" style="width:100%" v-else />
</div> </div>
<div class="box b2"> <div class="box b2">
<p>这里是广告占位,讲述图片内容的详细讲解,位置有限,显示不完整的地方就用...</p> <!-- <p>这里是广告占位,讲述图片内容的详细讲解,位置有限,显示不完整的地方就用...</p> -->
<div class="bottom">查看详情</div> <div class="bottom">查看详情</div>
</div> </div>
</div> </div>
......
...@@ -998,7 +998,7 @@ export default { ...@@ -998,7 +998,7 @@ export default {
path = 'detailTwo' path = 'detailTwo'
path=`${path}/${encodeURIComponent(idDes)}/`+tcid path=`${path}/${encodeURIComponent(idDes)}/`+tcid
// this.$router.push({ path }) // this.$router.push({ path })
let routeData = this.$router.resolve({ path:path}); let routeData = this.$router.resolve({ path:path,query:{free:'free'}});
window.open(routeData.href, '_blank'); window.open(routeData.href, '_blank');
}, },
ClickTicket(item){ ClickTicket(item){
......
...@@ -76,16 +76,26 @@ ...@@ -76,16 +76,26 @@
<template> <template>
<div class="detail-box" v-loading='loadingDataList' id="pdfDom"> <div class="detail-box" v-loading='loadingDataList' id="pdfDom">
<el-row v-if="loadNone==false"> <el-row v-if="loadNone==false">
<el-col :span="20" :offset="2" class="topic"> <el-col :span="20" :offset="2" class="topic" v-if="local==0">
<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: '/heel',query:{} }">跟团游</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/OneDaySearch',query:{'keywords':'','lineId':dataList.lineName} }">{{dataList.lineName}}</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/OneDaySearch',query:{'lineId':dataList.lineId} }">{{dataList.lineName}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/OneDaySearch',query:{'keywords':'','lineId':dataList.lineName,'lineteamId':dataList.ltName} }">{{dataList.ltName}}</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/OneDaySearch',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>
</el-col> </el-col>
<el-col :span="20" :offset="2" class="topic" v-if="local==1">
<el-col :span='12'>
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/Localtourhome',query:{} }">当地游</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/LocalTourList',query:{'lineId':dataList.lineId} }">{{dataList.lineName}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/LocalTourList',query:{'lineId':dataList.lineId,'ltId':dataList.lineteamId} }">{{dataList.ltName}}</el-breadcrumb-item>
<el-breadcrumb-item>{{dataList.title}}</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="20" :offset="2"> <el-col :span="20" :offset="2">
...@@ -634,6 +644,7 @@ export default { ...@@ -634,6 +644,7 @@ export default {
FlightList: [], FlightList: [],
city: -1, city: -1,
routed:"b2b_get_GetB2BTravelInfoV1", routed:"b2b_get_GetB2BTravelInfoV1",
local:0,
} }
},watch: { // 监听参数变化 },watch: { // 监听参数变化
changeCity: { changeCity: {
...@@ -654,6 +665,9 @@ export default { ...@@ -654,6 +665,9 @@ export default {
this.getList() this.getList()
this.isLogin=this.$store.state.isLogin; this.isLogin=this.$store.state.isLogin;
bus.$on('order-chosen', this.orderChosen) bus.$on('order-chosen', this.orderChosen)
if(this.$route.query.local){
this.local=1;
}
}, },
mounted () { mounted () {
this.scrollobj=document.getElementsByClassName('el-scrollbar__wrap')[0]; this.scrollobj=document.getElementsByClassName('el-scrollbar__wrap')[0];
...@@ -860,6 +874,7 @@ export default { ...@@ -860,6 +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);
}else{ }else{
this.$message.error(r.data.message) this.$message.error(r.data.message)
} }
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<template> <template>
<div class="detail-box" v-loading='loadingDataList' id="pdfDom"> <div class="detail-box" v-loading='loadingDataList' id="pdfDom">
<el-row v-if="loadNone==false"> <el-row v-if="loadNone==false">
<el-col :span="20" :offset="2" class="topic"> <el-col :span="20" :offset="2" class="topic" v-if="free==0">
<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: '/heel',query:{} }">跟团游</el-breadcrumb-item>
...@@ -86,6 +86,16 @@ ...@@ -86,6 +86,16 @@
</el-breadcrumb> </el-breadcrumb>
</el-col> </el-col>
</el-col> </el-col>
<el-col :span="20" :offset="2" class="topic" v-if="free==1">
<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>{{dataList.title}}</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="20" :offset="2"> <el-col :span="20" :offset="2">
...@@ -736,6 +746,7 @@ export default { ...@@ -736,6 +746,7 @@ export default {
FlightList: [], FlightList: [],
city: -1, city: -1,
teamType:0, teamType:0,
free:0,
} }
},watch: { // 监听参数变化 },watch: { // 监听参数变化
changeCity: { changeCity: {
...@@ -759,6 +770,9 @@ export default { ...@@ -759,6 +770,9 @@ export default {
this.getList() this.getList()
this.isLogin=this.$store.state.isLogin; this.isLogin=this.$store.state.isLogin;
bus.$on('order-chosen', this.orderChosen) bus.$on('order-chosen', this.orderChosen)
if(this.$route.query.free){
this.free=1;
}
}, },
mounted () { mounted () {
this.scrollobj=document.getElementsByClassName('el-scrollbar__wrap')[0]; this.scrollobj=document.getElementsByClassName('el-scrollbar__wrap')[0];
......
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