Commit 99e090ae authored by huangyuanyuan's avatar huangyuanyuan

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

# Conflicts:
#	src/router.js
parents 51fe91e9 f84742f7
...@@ -2101,7 +2101,7 @@ ...@@ -2101,7 +2101,7 @@
}, },
setDate: function (j) { setDate: function (j) {
let stDate = this.sonData.currentPriceInfo.startDate let stDate = this.sonData.currentPriceInfo && this.sonData.currentPriceInfo.startDate ? this.sonData.currentPriceInfo.startDate :''
if (j === 0) { if (j === 0) {
return stDate return stDate
} else { } else {
...@@ -2174,7 +2174,7 @@ ...@@ -2174,7 +2174,7 @@
init() { init() {
if (true) { if (true) {
let data = JSON.parse(JSON.stringify(this.sonData)) let data = JSON.parse(JSON.stringify(this.sonData))
this.orderTripdiff = data.currentPriceInfo.priceFlight; this.orderTripdiff = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : [];
if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) { if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson); this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
} }
...@@ -2245,7 +2245,7 @@ ...@@ -2245,7 +2245,7 @@
this.feature = data.feature this.feature = data.feature
this.showType = this.feature.featureType; this.showType = this.feature.featureType;
this.isDirect = data.isDirect; this.isDirect = data.isDirect;
if (data.currentPriceInfo.priceFlight.length > 0) { if (data.currentPriceInfo && data.currentPriceInfo.priceFlight.length > 0) {
data.currentPriceInfo.priceFlight.forEach((x, i) => { data.currentPriceInfo.priceFlight.forEach((x, i) => {
if (i == 0) { if (i == 0) {
x.dayNum = 1; x.dayNum = 1;
......
...@@ -925,8 +925,8 @@ export default { ...@@ -925,8 +925,8 @@ export default {
// }) // })
// } // }
this.priceList = data.priceList; this.priceList = data.priceList;
this.clickDate = data.currentPriceInfo.startDate; this.clickDate = data.currentPriceInfo && data.currentPriceInfo.startDate ? data.currentPriceInfo.startDate : '';
this.FlightList = data.currentPriceInfo.priceFlight; this.FlightList = data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : '';
this.dataList = data; this.dataList = data;
this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null; this.toDayObj = this.priceList && this.priceList.length>0?this.priceList[0]:null;
this.imgCover = JSON.parse(this.dataList.imgCover); this.imgCover = JSON.parse(this.dataList.imgCover);
......
...@@ -110,13 +110,13 @@ ...@@ -110,13 +110,13 @@
<div class="daynum">{{item.dayNum}}</div> <div class="daynum">{{item.dayNum}}</div>
<el-carousel :interval="3000" :autoplay='hoverIndex==index' arrow="never" height="148" :style="{'background':'#ddd'}" v-if='item.imgCover!=""'> <el-carousel :interval="3000" :autoplay='hoverIndex==index' arrow="never" height="148" :style="{'background':'#ddd'}" v-if='item.imgCover!=""'>
<el-carousel-item v-for="(img,imgIndex) in JSON.parse(item.imgCover)" :key="imgIndex" v-if='img.Url!=""'> <el-carousel-item v-for="(img,imgIndex) in JSON.parse(item.imgCover)" :key="imgIndex" v-if='img.Url!=""'>
<img v-lazy='`${img.Url}?x-oss-process=image/resize,m_fill,h_148,w_200`' @click="goUrl('detail',item.id)"> <img v-lazy='`${img.Url}?x-oss-process=image/resize,m_fill,h_148,w_200`' @click="goUrl('detail',item.id,item.tcid)">
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
<img v-else style="height:100%;width:100%" src='../../assets/img/banner@3x.png' /> <img v-else style="height:100%;width:100%" src='../../assets/img/banner@3x.png' />
</div> </div>
<div class="contentbox"> <div class="contentbox">
<div class="title" @click="goUrl('detail',item.id)">{{item.title}}</div> <div class="title" @click="goUrl('detail',item.id,item.tcid)">{{item.title}}</div>
<div class="item-info"> <div class="item-info">
<span> <span>
<i class="iconfont icon-bb-chufadi"></i>出发地:{{item.startCityName?item.startCityName:'成都'}} <i class="iconfont icon-bb-chufadi"></i>出发地:{{item.startCityName?item.startCityName:'成都'}}
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<div class="price"> <div class="price">
{{isLogin!==1?item.b2CPrice:item.b2BPrice}}<span></span> {{isLogin!==1?item.b2CPrice:item.b2BPrice}}<span></span>
</div> </div>
<el-button size='mini' @click="goUrl('detail',item.id)">立即预订</el-button> <el-button size='mini' @click="goUrl('detail',item.id,item.tcid)">立即预订</el-button>
</div> </div>
</div> </div>
<div class="item-pager" v-if='teamDatas.length>0'> <div class="item-pager" v-if='teamDatas.length>0'>
...@@ -216,10 +216,10 @@ export default { ...@@ -216,10 +216,10 @@ export default {
this.loadDayCount() this.loadDayCount()
}, },
methods: { methods: {
goUrl(path,id){ goUrl(path,id,tcid){
// detailTwo // detailTwo
path = 'detailTwo' path = 'detailTwo'
path=`${path}/${encodeURIComponent(id)}` path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path }) this.$router.push({ path })
}, },
proving(){ proving(){
......
...@@ -14,7 +14,7 @@ export default { ...@@ -14,7 +14,7 @@ export default {
// var domainUrl = "http://test_reborn.oytour.com";//主域名 // var domainUrl = "http://test_reborn.oytour.com";//主域名
//var domainUrl = "http://reborn.oytour.com"; //主域名 //var domainUrl = "http://reborn.oytour.com"; //主域名
// var domainUrl = "http://192.168.2.214:8082"//主域名 // var domainUrl = "http://192.168.2.214:8082"//主域名
let domainUrl = "http://192.168.2.16:8083"; //刘东主域名 let domainUrl = "https://reborn.oytour.com"; //刘东主域名
if (this.isOnline()) { if (this.isOnline()) {
if(window.location.host.indexOf('viitto.com')!=-1) if(window.location.host.indexOf('viitto.com')!=-1)
domainUrl = "http://test.viitto.com" domainUrl = "http://test.viitto.com"
......
...@@ -50,13 +50,12 @@ export default new Router({ ...@@ -50,13 +50,12 @@ export default new Router({
} }
}, },
{ {
path: "/detailTwo/:id/:pre", path: '/detailTwo/:id/:tcid/:pre',
name: "detailTwo", name: 'detailTwo',
component: resolve => component: resolve => require(['@/components/mall/detailTwo'], resolve),
require(["@/components/mall/detailTwo"], resolve), meta: {
meta: { title: '团队详情-印象之旅~感动与世界同步'
title: "团队详情-印象之旅~感动与世界同步" }
}
}, },
{ {
path: "/heel", path: "/heel",
......
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