Skip to content

S
SuperMan
Commit d07f3dc9 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents da68d553 fb6e0210
Hide whitespace changes
Inline Side-by-side
Showing with 688 additions and 506 deletions
src/components/SalesModule/productQuery.vue
View file @ d07f3dc9
...@@ -644,7 +644,7 @@ ...@@ -644,7 +644,7 @@
<p class="d12TC">{{item.TCNUM}}（{{item.TCID}}）</p> <p class="d12TC">{{item.TCNUM}}（{{item.TCID}}）</p>
<p>{{item.LtName}}</p> <p>{{item.LtName}}</p>
<el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250">
<p class="d12p" @click="getJourney(item.ConfigID,item.LineName)" :title="item.Title">{{item.Title}}</p> <p class="d12p" @click="getJourney(item.ConfigID,item.TCID,item.LineName)" :title="item.Title">{{item.Title}}</p>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -2136,11 +2136,11 @@ ...@@ -2136,11 +2136,11 @@
}, err => {}) }, err => {})
}, },
getJourney(id, title) { getJourney(id,TCID, title) {
var that = this; var that = this;
this.tripTitle = title; this.tripTitle = title;
this.$nextTick(() => { this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id); that.$refs.comTeam.GetTrip(id,TCID);
}); });
that.outerVisible = true; that.outerVisible = true;
}, },
......
src/components/commonPage/TravelTripPreview/fiveday.vue
View file @ d07f3dc9
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
</div> </div>
<div class="val" v-if='day.jiu2.length>0'> <div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k"> <span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／ {{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span> </span>
或同級 {{getHotelSuffix()}}
</div> </div>
<div class="val" v-else>本日无酒店安排</div> <div class="val" v-else>本日无酒店安排</div>
</el-col> </el-col>
...@@ -102,7 +102,29 @@ ...@@ -102,7 +102,29 @@
<script> <script>
export default { export default {
props:{ props:{
day:{} day:{},
isDirect: {},
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
} }
} }
</script> </script>
src/components/commonPage/TravelTripPreview/fourday.vue
View file @ d07f3dc9
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<img crossOrigin="Anonymous" :src='day.details[0].img' /> <img crossOrigin="Anonymous" :src='day.details[0].img' />
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
<h3 v-html="day.details[0].title"></h3> <h3 v-html="day.details[0].title"></h3>
<div class="playInfo"> <div class="playInfo">
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'> <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<i class="iconfont icon-menpiao"></i> <i class="iconfont icon-menpiao"></i>
{{day.details[0].ticketName}} {{day.details[0].ticketName}}
</span> </span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'> <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
约 约
<span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span> <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span> <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span>
</span> </span>
</div>
<span v-html="day.details[0].content"></span>
</div>
</div>
</div> </div>
<el-row :gutter="4"> <span v-html="day.details[0].content"></span>
<el-col :span="8" v-for="(item,i) in day.details" v-if="i>0" :key="i"> </div>
<div class="item"> </div>
<div class="three-item"> </div>
<div class="image"> <el-row :gutter="4">
<img crossOrigin="Anonymous" :src='item.img' /> <el-col :span="8" v-for="(item,i) in day.details" v-if="i>0" :key="i">
</div> <div class="item">
<h3 v-html="item.title"></h3> <div class="three-item">
<div class="playInfo"> <div class="image">
<span class="playInfo-item" v-if='item.ticketName!=""'> <img crossOrigin="Anonymous" :src='item.img' />
<i class="iconfont icon-menpiao"></i> </div>
{{item.ticketName}} <h3 v-html="item.title"></h3>
</span> <div class="playInfo">
<span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'> <span class="playInfo-item" v-if='item.ticketName!=""'>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-menpiao"></i>
约 {{item.ticketName}}
<span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span> </span>
<span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span> <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
</span> <i class="iconfont icon-shijian1"></i>
</div> 约
<span v-html="item.content"></span> <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
</div> <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span>
</div> </span>
</el-col> </div>
</el-row> <span v-html="item.content"></span>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div>
</div> </div>
<div class="restaurant"> </div>
<el-row :gutter="30"> </el-col>
<el-col :span="8" class="restaurant-item"> </el-row>
<div class="key"> <div class="item flex" v-if='day.tips.length>0'>
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' /> <h4>温馨提示</h4>
</div> <div class="remark">
<div class="val">{{day.can.breakfirst}}</div> <span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</el-col> </div>
<el-col :span="8" class="restaurant-item"> </div>
<div class="key"> <div class="restaurant">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' /> <el-row :gutter="30">
</div> <el-col :span="8" class="restaurant-item">
<div class="val">{{day.can.lanuch}}</div> <div class="key">
</el-col> <img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div> </div>
<div class="restaurant"> <div class="val">{{day.can.breakfirst}}</div>
<el-row :gutter="30"> </el-col>
<el-col :span="24" class="restaurant-item"> <el-col :span="8" class="restaurant-item">
<div class="key"> <div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' /> <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
</span>
或同級
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div> </div>
</div> <div class="val">{{day.can.lanuch}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{} day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
} }
} }
</script> </script>
src/components/commonPage/TravelTripPreview/oneday.vue
View file @ d07f3dc9
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<img crossOrigin="Anonymous" v-if="day.details[0].img!=''" :src='day.details[0].img' /> <img crossOrigin="Anonymous" v-if="day.details[0].img!=''" :src='day.details[0].img' />
<img crossOrigin="Anonymous" v-else-if="day.dayNum==1 && day.details[0].img==''" src='../../../assets/img/nll.jpg' /> <img crossOrigin="Anonymous" v-else-if="day.dayNum==1 && day.details[0].img==''"
<img crossOrigin="Anonymous" v-else-if="day.islast && day.details[0].img==''" src='../../../assets/img/nll.jpg' /> src='../../../assets/img/nll.jpg' />
<img crossOrigin="Anonymous" v-else src='../../../assets/img/activy.jpg' /> <img crossOrigin="Anonymous" v-else-if="day.islast && day.details[0].img==''"
</div> src='../../../assets/img/nll.jpg' />
<div class="right"> <img crossOrigin="Anonymous" v-else src='../../../assets/img/activy.jpg' />
<div class="details"> </div>
<h3 v-html="day.details[0].title"></h3> <div class="right">
<div class="playInfo"> <div class="details">
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'> <h3 v-html="day.details[0].title"></h3>
<i class="iconfont icon-menpiao"></i> <div class="playInfo">
{{day.details[0].ticketName}} <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
</span> <i class="iconfont icon-menpiao"></i>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'> {{day.details[0].ticketName}}
<i class="iconfont icon-shijian1"></i> </span>
约 <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span> <i class="iconfont icon-shijian1"></i>
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span> 约
</span> <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
</div> <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span>
<span v-html="day.details[0].content"></span> </span>
</div> </div>
</div> <span v-html="day.details[0].content"></span>
</div>
</div>
</div>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
</div> </div>
<div class="item flex" v-if='day.tips.length>0'> <div class="val">{{day.can.breakfirst}}</div>
<h4>温馨提示</h4> </el-col>
<div class="remark"> <el-col :span="8" class="restaurant-item">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span> <div class="key">
</div> <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div> </div>
<div class="restaurant"> <div class="val">{{day.can.lanuch}}</div>
<el-row :gutter="30"> </el-col>
<el-col :span="8" class="restaurant-item"> <el-col :span="8" class="restaurant-item">
<div class="key"> <div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' /> <img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.breakfirst}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div>
<div class="val">{{day.can.lanuch}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div> </div>
<div class="restaurant"> <div class="val">{{day.can.dinner}}</div>
<el-row :gutter="30"> </el-col>
<el-col :span="24" class="restaurant-item"> </el-row>
<div class="key"> </div>
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' /> <div class="restaurant">
</div> <el-row :gutter="30">
<div class="val" v-if='day.jiu2.length>0'> <el-col :span="24" class="restaurant-item">
<span v-for="(t,k) in day.jiu2" :key="k"> <div class="key">
{{t}} ／ <img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</span>
或同級
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div> </div>
</div> <div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{} day: {},
} isDirect: {},
} title: {},
</script> dayNum: {}
\ No newline at end of file },
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
},
};
</script>
src/components/commonPage/TravelTripPreview/threeday.vue
View file @ d07f3dc9
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="two-block"> <div class="two-block">
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<img crossOrigin="Anonymous" :src='day.details[0].img+"?x-oss-process=image/resize,w_663"' /> <img crossOrigin="Anonymous" :src='day.details[0].img+"?x-oss-process=image/resize,w_663"' />
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
<h3 v-html="day.details[0].title"></h3> <h3 v-html="day.details[0].title"></h3>
<div class="playInfo"> <div class="playInfo">
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'> <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<i class="iconfont icon-menpiao"></i> <i class="iconfont icon-menpiao"></i>
{{day.details[0].ticketName}} {{day.details[0].ticketName}}
</span> </span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'> <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
约 约
<span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span> <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span> <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span>
</span> </span>
</div> </div>
<span v-html="day.details[0].content"></span> <span v-html="day.details[0].content"></span>
</div> </div>
</div> </div>
</div>
<el-row :gutter="4">
<el-col :span="8">
<div class="item hor-box">
<div class="Th_remark">
<h3 v-html="day.details[1].title"></h3>
<div class="playInfo">
<span class="playInfo-item" v-if='day.details[1].ticketName!=""'>
<i class="iconfont icon-menpiao"></i>
{{day.details[1].ticketName}}
</span>
<span class="playInfo-item" v-if='day.details[1].playTimeHour || day.details[1].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
约
<span v-if="day.details[1].playTimeHour">{{day.details[1].playTimeHour}}小时 </span>
<span v-if="day.details[1].playTimeMinutes">{{day.details[1].playTimeMinutes}}分钟 </span>
</span>
</div>
<span v-html="day.details[1].content"></span>
</div> </div>
<el-row :gutter="4"> </div>
<el-col :span="8"> </el-col>
<div class="item hor-box"> <el-col :span="16">
<div class="Th_remark"> <div class="item hor-box">
<h3 v-html="day.details[1].title"></h3> <div class="image">
<div class="playInfo"> <img crossOrigin="Anonymous"
<span class="playInfo-item" v-if='day.details[1].ticketName!=""'> :src="day.details[1].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
<i class="iconfont icon-menpiao"></i>
{{day.details[1].ticketName}}
</span>
<span class="playInfo-item" v-if='day.details[1].playTimeHour || day.details[1].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
约
<span v-if="day.details[1].playTimeHour">{{day.details[1].playTimeHour}}小时 </span>
<span v-if="day.details[1].playTimeMinutes">{{day.details[1].playTimeMinutes}}分钟 </span>
</span>
</div>
<span v-html="day.details[1].content"></span>
</div>
</div>
</el-col>
<el-col :span="16">
<div class="item hor-box">
<div class="image">
<img crossOrigin="Anonymous" :src="day.details[1].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
</div>
</div>
</el-col>
</el-row>
<el-row :gutter="4">
<el-col :span="16">
<div class="item hor-box">
<div class="image">
<img crossOrigin="Anonymous" :src="day.details[2].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
</div>
</div>
</el-col>
<el-col :span="8">
<div class="item hor-box">
<div class="Th_remark">
<h3 v-html="day.details[2].title"></h3>
<div class="playInfo">
<span class="playInfo-item" v-if='day.details[2].ticketName!=""'>
<i class="iconfont icon-menpiao"></i>
{{day.details[2].ticketName}}
</span>
<span class="playInfo-item" v-if='day.details[2].playTimeHour || day.details[2].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
约
<span v-if="day.details[2].playTimeHour">{{day.details[2].playTimeHour}}小时 </span>
<span v-if="day.details[2].playTimeMinutes">{{day.details[2].playTimeMinutes}}分钟 </span>
</span>
</div>
<span v-html="day.details[2].content"></span>
</div>
</div>
</el-col>
</el-row>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div>
</div> </div>
<div class="restaurant"> </div>
<el-row :gutter="30"> </el-col>
<el-col :span="8" class="restaurant-item"> </el-row>
<div class="key"> <el-row :gutter="4">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' /> <el-col :span="16">
</div> <div class="item hor-box">
<div class="val">{{day.can.breakfirst}}</div> <div class="image">
</el-col> <img crossOrigin="Anonymous"
<el-col :span="8" class="restaurant-item"> :src="day.details[2].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div>
<div class="val">{{day.can.lanuch}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div> </div>
<div class="restaurant"> </div>
<el-row :gutter="30"> </el-col>
<el-col :span="24" class="restaurant-item"> <el-col :span="8">
<div class="key"> <div class="item hor-box">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' /> <div class="Th_remark">
</div> <h3 v-html="day.details[2].title"></h3>
<div class="val" v-if='day.jiu2.length>0'> <div class="playInfo">
<span v-for="(t,k) in day.jiu2" :key="k"> <span class="playInfo-item" v-if='day.details[2].ticketName!=""'>
{{t}} ／ <i class="iconfont icon-menpiao"></i>
</span> {{day.details[2].ticketName}}
或同級 </span>
</div> <span class="playInfo-item" v-if='day.details[2].playTimeHour || day.details[2].playTimeMinutes'>
<div class="val" v-else>本日无酒店安排</div> <i class="iconfont icon-shijian1"></i>
</el-col> 约
</el-row> <span v-if="day.details[2].playTimeHour">{{day.details[2].playTimeHour}}小时 </span>
<span v-if="day.details[2].playTimeMinutes">{{day.details[2].playTimeMinutes}}分钟 </span>
</span>
</div>
<span v-html="day.details[2].content"></span>
</div> </div>
</div>
</el-col>
</el-row>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div> </div>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
</div>
<div class="val">{{day.can.breakfirst}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div>
<div class="val">{{day.can.lanuch}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{} day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
} }
} }
</script> </script>
src/components/commonPage/TravelTripPreview/twoday.vue
View file @ d07f3dc9
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="two-block"> <div class="two-block">
<el-row :gutter="4"> <el-row :gutter="4">
<el-col :span="12" v-for="item in day.details" :key="item.dayNum"> <el-col :span="12" v-for="item in day.details" :key="item.dayNum">
<div class="item"> <div class="item">
<div class="up"> <div class="up">
<img crossOrigin="Anonymous" :src='item.img' /> <img crossOrigin="Anonymous" :src='item.img' />
</div>
<div class="down">
<h3 v-if='item.title!=""' v-html="item.title"></h3>
<div class="playInfo">
<span class="playInfo-item" v-if='item.ticketName!=""'>
<i class="iconfont icon-menpiao"></i>
{{item.ticketName}}
</span>
<span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
约
<span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
<span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟 </span>
</span>
</div>
<span v-html="item.content"></span>
</div>
</div>
</el-col>
</el-row>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div>
</div> </div>
<div class="restaurant"> <div class="down">
<el-row :gutter="30"> <h3 v-if='item.title!=""' v-html="item.title"></h3>
<el-col :span="8" class="restaurant-item"> <div class="playInfo">
<div class="key"> <span class="playInfo-item" v-if='item.ticketName!=""'>
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' /> <i class="iconfont icon-menpiao"></i>
</div> {{item.ticketName}}
<div class="val">{{day.can.breakfirst}}</div> </span>
</el-col> <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
<el-col :span="8" class="restaurant-item"> <i class="iconfont icon-shijian1"></i>
<div class="key"> 约
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' /> <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
</div> <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟 </span>
<div class="val">{{day.can.lanuch}}</div> </span>
</el-col> </div>
<el-col :span="8" class="restaurant-item"> <span v-html="item.content"></span>
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
</span>
或同級
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div> </div>
</div>
</el-col>
</el-row>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div> </div>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
</div>
<div class="val">{{day.can.breakfirst}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div>
<div class="val">{{day.can.lanuch}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{} day: {},
isDirect: {},
title: {},
dayNum: {}
},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級"
}
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url = 'http://' + url;
}
window.open(url, "_blank");
}
}
} }
} }
</script> </script>
src/components/commonPage/commonTeamInfo.vue
View file @ d07f3dc9
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
</div> </div>
<div class="desc" v-html="item.title"></div> <div class="desc" v-html="item.title"></div>
</div> </div>
<oneday v-if="item.details && item.details.length==1" :day='item'></oneday> <oneday v-if="item.details && item.details.length==1" :day='item' :isDirect="isDirect"></oneday>
<twoday v-if="item.details && item.details.length==2" :day='item'></twoday> <twoday v-if="item.details && item.details.length==2" :day='item' :isDirect="isDirect"></twoday>
<threeday v-if="item.details && item.details.length==3" :day='item'></threeday> <threeday v-if="item.details && item.details.length==3" :day='item' :isDirect="isDirect"></threeday>
<fourday v-if="item.details && item.details.length==4" :day='item'></fourday> <fourday v-if="item.details && item.details.length==4" :day='item' :isDirect="isDirect"></fourday>
<fiveday v-if="item.details && item.details.length>=5" :day='item'></fiveday> <fiveday v-if="item.details && item.details.length>=5" :day='item' :isDirect="isDirect"></fiveday>
</div> </div>
</div> </div>
</template> </template>
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
return { return {
tripList: [], tripList: [],
loading: false, loading: false,
startDate: "" startDate: "",
isDirect: 1, //是否是直采 0：否，1：是
}; };
}, },
components: { components: {
...@@ -79,6 +80,7 @@ ...@@ -79,6 +80,7 @@
if (res.data.data.priceList && res.data.data.priceList.length > 0) { if (res.data.data.priceList && res.data.data.priceList.length > 0) {
this.startDate = res.data.data.priceList[0].startDate; this.startDate = res.data.data.priceList[0].startDate;
} }
this.isDirect = res.data.data.isDirect;
this.tripList = res.data.data.dayList; this.tripList = res.data.data.dayList;
this.init(); this.init();
} }
...@@ -219,13 +221,36 @@ ...@@ -219,13 +221,36 @@
dayItem.dayArray = dayArray; dayItem.dayArray = dayArray;
dayList.push(dayItem); dayList.push(dayItem);
}); });
this.tripList = dayList; this.tripList = dayList;
this.init(); this.init();
} }
}, },
setDate: function (j) {
let stDate = "";
if (this.priceList && this.priceList.length > 0) {
stDate = this.priceList[0].startDate;
}
if (j === 0) {
return stDate
} else {
if (stDate) {
let d = new Date(stDate)
d = d.getTime(d);
let add = d + ((24 * 60 * 60 * 1000) * j)
let date = new Date(add); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' ';
return Y + M + D;
} else {
return "";
}
}
},
init() { init() {
this.tripList.forEach((x, j) => { this.tripList.forEach((x, j) => {
let useDinnerTypeBy = ""; let useDinnerTypeBy = ''
let jin = [], let jin = [],
jiu = [], jiu = [],
jiu2 = [], jiu2 = [],
...@@ -234,202 +259,201 @@ ...@@ -234,202 +259,201 @@
tips = [], tips = [],
activy = [], activy = [],
can = { can = {
breakfirst: "敬请自理", breakfirst: '敬请自理',
lanuch: "敬请自理", lanuch: '敬请自理',
dinner: "敬请自理" dinner: '敬请自理'
}; }
x.dayArray.forEach((y, index) => { x.dayArray.forEach((y, index) => {
if (y.type == 7 && y.childItem.title != "") { if (y.type == 7 && y.childItem.title != '') {
let obj = { let obj = {
title: y.childItem.title, title: y.childItem.title,
content: y.childItem.description, content: y.childItem.description,
img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ? img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ? y.childItem.imaArray[0]
y.childItem.imaArray[0].url : "", .url : '',
ticketName: "", ticketName: '',
playTimeHour: null, playTimeHour: null,
playTimeMinutes: null playTimeMinutes: null,
}; url: ''
dadian.push(obj); }
dadian.push(obj)
} else if (y.type == 1 && y.childItem.subTraffic.length > 0) { } else if (y.type == 1 && y.childItem.subTraffic.length > 0) {
let title = ""; let title = ''
y.childItem.subTraffic.forEach((z, i) => { y.childItem.subTraffic.forEach((z, i) => {
title += z.startCityName; title += z.startCityName
if (z.arrivalType == 1) { if (z.arrivalType == 1) {
title += '<i class="iconfont icon-feiji"></i>'; title += '<i class="iconfont icon-feiji"></i>'
} else if (z.arrivalType == 2) { } else if (z.arrivalType == 2) {
title += '<i class="iconfont icon-bus"></i>'; title += '<i class="iconfont icon-bus"></i>'
} else if (z.arrivalType == 3) { } else if (z.arrivalType == 3) {
title += '<i class="iconfont icon-icon31"></i>'; title += '<i class="iconfont icon-icon31"></i>'
} else { } else {
title += '<i class="iconfont icon-gaotiedongche"></i>'; title += '<i class="iconfont icon-gaotiedongche"></i>'
} }
if (i + 1 == y.childItem.subTraffic.length) { if (i + 1 == y.childItem.subTraffic.length) {
title += z.arrivalCityName; title += z.arrivalCityName
} }
}); })
let obj = { let obj = {
title: title, title: title,
content: y.childItem.description, content: y.childItem.description,
img: "", img: '',
ticketName: "", ticketName: '',
playTimeHour: null, playTimeHour: null,
playTimeMinutes: null playTimeMinutes: null,
}; url: ''
jiao.push(obj); }
} else if ( jiao.push(obj)
y.type == 2 && } else if (y.type == 2 && y.childItem.couponsName != '' && y.childItem.imaArray.length > 0) {
y.childItem.couponsName != "" &&
y.childItem.imaArray.length > 0
) {
let obj = { let obj = {
title: y.childItem.couponsName, title: y.childItem.couponsName,
content: y.childItem.description, content: y.childItem.description,
img: y.childItem.imaArray[0].url, img: y.childItem.imaArray[0].url,
ticketName: y.childItem.couponsTicketName, ticketName: y.childItem.couponsTicketName,
playTimeHour: y.childItem.playTimeHour, playTimeHour: y.childItem.playTimeHour,
playTimeMinutes: y.childItem.playTimeHour playTimeMinutes: y.childItem.playTimeMinutes,
}; scenicJson: y.childItem.scenicJson,
jin.push(obj); url: y.childItem.url
} else if ( }
y.type == 3 && jin.push(obj)
y.childItem.hotelName != "" && } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
y.childItem.imaArray.length > 0 //酒店
) {
let obj = { let obj = {
title: y.childItem.hotelName, title: y.childItem.hotelName,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
content: y.childItem.description, content: y.childItem.description,
img: y.childItem.imaArray[0].url, img: y.childItem.imaArray[0].url,
ticketName: "", ticketName: '',
playTimeHour: null, playTimeHour: null,
playTimeMinutes: null playTimeMinutes: null,
}; url: y.childItem.url
jiu.push(obj); }
jiu.push(obj)
} else if (y.type == 4) { } else if (y.type == 4) {
if (y.childItem.useDinnerType == "1") { if (y.childItem.useDinnerType == "1") {
can.breakfirst = y.childItem.dinnerName; can.breakfirst = y.childItem.dinnerName
} else if (y.childItem.useDinnerType == "2") { } else if (y.childItem.useDinnerType == "2") {
can.lanuch = y.childItem.dinnerName; can.lanuch = y.childItem.dinnerName
} else if (y.childItem.useDinnerType == "3") { } else if (y.childItem.useDinnerType == "3") {
can.dinner = y.childItem.dinnerName; can.dinner = y.childItem.dinnerName
} }
} else if (y.type == 5) { } else if (y.type == 5) {
let obj = { let obj = {
title: "自由活动", title: '自由活动',
content: y.childItem.description, content: y.childItem.description,
img: "", img: '',
ticketName: "", ticketName: '',
playTimeHour: null, playTimeHour: null,
playTimeMinutes: null playTimeMinutes: null,
}; url: ''
activy.push(obj); }
activy.push(obj)
} else if (y.type == 6) { } else if (y.type == 6) {
let obj = { let obj = {
title: y.childItem.title, title: y.childItem.title,
content: y.childItem.description, content: y.childItem.description,
img: "", img: '',
ticketName: "", ticketName: '',
playTimeHour: null, playTimeHour: null,
playTimeMinutes: null playTimeMinutes: null,
}; url: ''
tips.push(obj); }
tips.push(obj)
} }
if (y.type == 3) { if (y.type == 3) {
jiu2.push(y.childItem.hotelName); jiu2.push({
useDinnerTypeBy = y.childItem.useDinnerType; name: y.childItem.hotelName,
url: y.childItem.url,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
});
useDinnerTypeBy = y.childItem.useDinnerType
} }
}); })
if ( if (can.breakfirst == '敬请自理' && useDinnerTypeBy.indexOf('1') != -1) {
can.breakfirst == "敬请自理" && can.breakfirst = '酒店内享用早餐'
useDinnerTypeBy.indexOf("1") != -1 } else if (can.breakfirst == '') {
) { can.breakfirst = '方便游玩敬请自理'
can.breakfirst = "酒店内享用早餐";
} }
if (can.lanuch == "敬请自理" && useDinnerTypeBy.indexOf("2") != -1) { if (can.lanuch == '敬请自理' && useDinnerTypeBy.indexOf('2') != -1) {
can.lanuch = "酒店自助"; can.lanuch = '酒店自助'
} else if (can.lanuch == '') {
can.lanuch = '方便游玩敬请自理'
} }
if (can.dinner == "敬请自理" && useDinnerTypeBy.indexOf("3") != -1) { if (can.dinner == '敬请自理' && useDinnerTypeBy.indexOf('3') != -1) {
can.dinner = "酒店自助"; can.dinner = '酒店自助'
} else if (can.dinner == '') {
can.dinner = '方便游玩敬请自理'
} }
x.can = can; x.can = can
let details = []; let details = [];
x.tips = tips; x.tips = tips
x.jiu2 = jiu2; x.jiu2 = jiu2
if (jin.length > 0) { if (jin.length > 0) {
details = jin; details = jin
} else if (jiu.length > 0) { }
details = jiu; // else if (jiu.length > 0) {
} else if (dadian.length > 0) { // // details = jiu
details = dadian; // }
else if (dadian.length > 0) {
details = dadian
} else if (jiao.length > 0) { } else if (jiao.length > 0) {
if (j == this.tripList.length - 1) { if (j == this.tripList.length - 1) {
let obj = { let obj = {
title: "温暖的家", title: '温暖的家',
content: "感谢您参加本次行程，期待下次与您相遇", content: '感谢您参加本次行程，期待下次与您相遇',
img: "" img: ''
}; }
details.push(obj); details.push(obj)
} else { } else {
details = jiao; details = jiao
} }
} else if (activy.length > 0) { } else if (activy.length > 0) {
details = activy; details = activy
} }
x.title = x.title = dadian.length > 0 && dadian[0].title && dadian[0].title != '' ? dadian[0].title : (jiao
dadian.length > 0 ? .length > 0 ? jiao[0].title : '集合出发')
dadian[0].title : x.details = details
jiao.length > 0 ?
jiao[0].title :
"集合出发";
x.details = details;
if (x.details.length == 0) { if (x.details.length == 0) {
if (j == 0) { if (j == 0) {
let obj = { let obj = {
title: "集合出发", title: '集合出发',
content: "向着远方的目标出发起飞", content: '向着远方的目标出发起飞',
img: "", img: '',
ticketName: "", ticketName: '',
playTimeHour: null, playTimeHour: null,
playTimeMinutes: null playTimeMinutes: null
}; }
details.push(obj); details.push(obj)
} else if (j == this.tripList.length - 1) { } else if (j == this.tripList.length - 1) {
let obj = { let obj = {
title: "温暖的家", title: '温暖的家',
content: "感谢您参加本次行程，期待下次与您相遇", content: '感谢您参加本次行程，期待下次与您相遇',
img: "", img: '',
ticketName: "", ticketName: '',
playTimeHour: null, playTimeHour: null,
playTimeMinutes: null playTimeMinutes: null
}; }
details.push(obj); details.push(obj)
} }
} else { } else {
if (x.title == "集合出发") { if (x.title == '集合出发') {
x.details.forEach(xc => { x.details.forEach(xc => {
if (xc.title !== undefined) x.title = xc.title + "~"; if (xc.title !== undefined)
}); x.title = xc.title + '~'
if (x.title == "集合出发") { })
if (j > 0 && j < tripList.length - 1) x.title = "自由活动"; if (x.title == '集合出发') {
if (j > 0 && j < tripList.length - 1)
x.title = '自由活动'
} else { } else {
x.title = x.title.substring(0, x.title.length - 1); x.title = x.title.substring(0, x.title.length - 1)
} }
} }
} }
x.islast = j + 1 == this.tripList.length; x.islast = (j + 1) == this.tripList.length
this.$set(this.tripList, j, x); this.$set(this.tripList, j, x)
}); x.dateTime = this.setDate(j);
for (let i = this.tripList.length - 1; i >= 0; i--) { })
if (i == 0) this.tripList[i].can.breakfirst = "敬请自理";
else {
this.tripList[i].can.breakfirst = this.tripList[i - 1].can.breakfirst;
if (
this.tripList[i].lineId != 5 &&
this.tripList[i].can.breakfirst == "敬请自理"
)
this.tripList[i].can.breakfirst = "酒店内享用早餐";
}
}
} }
} }
}; };
......
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