Skip to content

A
Athena
Commit be604cf8 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 8a0a3a1e
Show whitespace changes
Inline Side-by-side
Showing with 477 additions and 432 deletions
src/components/mall/detailTwo.vue
View file @ be604cf8
...@@ -158,8 +158,6 @@ ...@@ -158,8 +158,6 @@
<span class="tips pointer"> <span class="tips pointer">
起价说明 起价说明
</span> </span>
<!-- <span class="blue split medium pointer">4.9</span>
<span class="blue pointer">0条点评</span> -->
<span style='margin-left:5px'>{{dataList.offerNumber+99}}人出游</span> <span style='margin-left:5px'>{{dataList.offerNumber+99}}人出游</span>
</div> </div>
<div class="activy" v-if="maxdiscountAmount>0"> <div class="activy" v-if="maxdiscountAmount>0">
...@@ -417,11 +415,6 @@ ...@@ -417,11 +415,6 @@
</table> </table>
</div> </div>
<div class="slider" v-if="showType==1&&loadNone==false"> <div class="slider" v-if="showType==1&&loadNone==false">
<!-- <el-carousel :interval="2000" height='400px' trigger="click" :style="{'background':'#ddd'}">
<el-carousel-item v-for="(i,index) in feature.featureImgList" :key="index">
<img :src="i.url" />
</el-carousel-item>
</el-carousel> -->
<swiper :imgs='feature.featureImgList'></swiper> <swiper :imgs='feature.featureImgList'></swiper>
</div> </div>
<div class="zidingyi" v-if="(showType==3 || showType<4)&&loadNone==false"> <div class="zidingyi" v-if="(showType==3 || showType<4)&&loadNone==false">
...@@ -441,16 +434,14 @@ ...@@ -441,16 +434,14 @@
</span> </span>
<span>Trip Maps</span> <span>Trip Maps</span>
</div> </div>
<!-- -->
<div class="map-box" v-if="dataList.isDirect&&travelLngLat.length>1"> <div class="map-box" v-if="dataList.isDirect&&travelLngLat.length>1">
<!-- <bmap :data="travelLngLat"/> -->
<GGMap :dataList="travelLngLat"></GGMap> <GGMap :dataList="travelLngLat"></GGMap>
<div class="_travelLngLatInfo_box"> <div class="_travelLngLatInfo_box">
<p v-for="(item,index) in travelLngLatInfo" :key="index"><span class="_travelLngLatInfo_label">{{item.lable}}</span>： <p v-for="(item,index) in travelLngLatInfo" :key="index"><span
class="_travelLngLatInfo_label">{{item.lable}}</span>：
{{item.text}}</p> {{item.text}}</p>
</div> </div>
</div> </div>
<!-- <div id="map_canvas" style="width:1000px; height:600px;"></div> -->
<div class="item-title"> <div class="item-title">
<span class="t">{{dayTrip}}日行程</span> <span class="t">{{dayTrip}}日行程</span>
<span> <span>
...@@ -460,7 +451,6 @@ ...@@ -460,7 +451,6 @@
</div> </div>
<div v-if='dayList&&dayList.length>0'> <div v-if='dayList&&dayList.length>0'>
<!-- <trip :tripList="dayList"></trip> -->
<block :tripList="dayList" :isDirect="isDirect" :clickDate="clickDate"></block> <block :tripList="dayList" :isDirect="isDirect" :clickDate="clickDate"></block>
</div> </div>
<div class="item-title" id='feiyong'> <div class="item-title" id='feiyong'>
...@@ -706,19 +696,16 @@ ...@@ -706,19 +696,16 @@
</table> </table>
</div> </div>
</el-dialog> </el-dialog>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" <viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer"
ref="viewer"> ref="viewer">
<img v-for="(item,index) in images" :src="item.Url" :key="index+5000"> <img v-for="(item,index) in images" :src="item.Url" :key="index+5000">
</viewer> </viewer>
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment' import moment from 'moment'
// import bmap from './map.vue'
import calendar from './calendar.vue' import calendar from './calendar.vue'
import trip from '../trip/waterfall/index' import trip from '../trip/waterfall/index'
import block from '../trip/block/index' import block from '../trip/block/index'
...@@ -729,7 +716,6 @@ ...@@ -729,7 +716,6 @@
import bus from '../../plugins/event-bus' import bus from '../../plugins/event-bus'
export default { export default {
components: { components: {
// bmap,
GGMap, GGMap,
calendar, calendar,
trip, trip,
...@@ -894,7 +880,7 @@ ...@@ -894,7 +880,7 @@
} else { } else {
let orderMsg = this.sonData.orderMsg let orderMsg = this.sonData.orderMsg
this.travelControlTripLayerShow = false this.travelControlTripLayerShow = false
var title=orderMsg.startDate + orderMsg.lineteamName + orderMsg var title = orderMsg.startDate + orderMsg.lineteamName + orderMsg
.dayNum + '日游'; .dayNum + '日游';
this.toPDF(title); this.toPDF(title);
} }
...@@ -903,12 +889,12 @@ ...@@ -903,12 +889,12 @@
toPDF: function (title) { toPDF: function (title) {
this.pdfLoading = true this.pdfLoading = true
let urlObj = this.domainManager(); let urlObj = this.domainManager();
var tcid=0; var tcid = 0;
var cId = 0; var cId = 0;
if(this.sonData&&this.sonData.priceList.length>0&&this.sonData.priceList[0].tcid){ if (this.sonData && this.sonData.priceList.length > 0 && this.sonData.priceList[0].tcid) {
tcid=this.sonData.priceList[0].tcid; tcid = this.sonData.priceList[0].tcid;
} }
if(this.sonData){ if (this.sonData) {
cId = this.sonData.id; cId = this.sonData.id;
} }
let msg = { let msg = {
...@@ -1165,12 +1151,12 @@ ...@@ -1165,12 +1151,12 @@
this.scrollobj.scrollTop = document.getElementById(id).offsetTop + screen.availHeight - 350; this.scrollobj.scrollTop = document.getElementById(id).offsetTop + screen.availHeight - 350;
}, },
//跳转至新行程 //跳转至新行程
goUrlTrip(){ goUrlTrip() {
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: 'newTrip', name: 'newTrip',
query: { query: {
ID : decodeURIComponent(this.$route.params.id), ID: decodeURIComponent(this.$route.params.id),
tcid : decodeURIComponent(this.$route.params.tcid), tcid: decodeURIComponent(this.$route.params.tcid),
} }
}) })
window.open(routeData.href, '_blank') window.open(routeData.href, '_blank')
......
src/components/trip/block/fiveday.vue
View file @ be604cf8
...@@ -5,21 +5,25 @@ ...@@ -5,21 +5,25 @@
<div class="left"> <div class="left">
<div class="image"> <div class="image">
<template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'"> <template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath" controls="controls"> <video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath"
controls="controls">
</video> </video>
</template> </template>
<template v-else> <template v-else>
<img :src='day.details[0].img' :style="{position: 'relative',top:day.details[0].scenicJson.y + 'px'}"/> <img :src='day.details[0].img'
:style="{position: 'relative',top:day.details[0].scenicJson.y + 'px'}" />
</template> </template>
</div> </div>
<div class="item"> <div class="item">
<h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h3> <h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)"
style="cursor: pointer"></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>
...@@ -36,14 +40,15 @@ ...@@ -36,14 +40,15 @@
<div class="three-item"> <div class="three-item">
<div class="image"> <div class="image">
<template v-if="item.fileType&&item.fileType=='.mp4'"> <template v-if="item.fileType&&item.fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="item.videoPath" controls="controls"> <video ref="myVideo" width="100%" height="100%" :src="item.videoPath"
controls="controls">
</video> </video>
</template> </template>
<template v-else> <template v-else>
<img :src='item.img' /> <img :src='item.img' />
</template> </template>
</div> </div>
<h3 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h3> <h3 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer"></h3>
<div class="playInfo"> <div class="playInfo">
<span class="playInfo-item" v-if='item.ticketName!=""'> <span class="playInfo-item" v-if='item.ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>--> <!--<i class="iconfont icon-menpiao"></i>-->
...@@ -112,32 +117,37 @@ ...@@ -112,32 +117,37 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{}, day: {},
isDirect:{} isDirect: {}
}, },
methods:{ methods: {
getHotelSuffix(){ getHotelSuffix() {
let suffix =""; let suffix = "";
if(this.day.jiu2.length>1){ if (this.day.jiu2.length > 1) {
if(this.isDirect===1){ if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
}else{ } else {
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name !=
if(this.isDirect===1){ '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】" suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
} }
} }
} }
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
if(url!=null&&url.length>0){ if (url != null && url.length > 0) {
window.open(url, "_blank"); window.open(url, "_blank");
} }
} }
} }
} }
</script> </script>
\ No newline at end of file
src/components/trip/block/fourday.vue
View file @ be604cf8
...@@ -116,15 +116,20 @@ export default { ...@@ -116,15 +116,20 @@ export default {
}, },
methods:{ methods:{
getHotelSuffix(){ getHotelSuffix(){
let suffix =""; let suffix = "";
if(this.day.jiu2.length>1){ if (this.day.jiu2.length > 1) {
if(this.isDirect===1){ if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
}else{ } else {
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name !=
if(this.isDirect===1){ '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】" suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
} }
} }
} }
......
src/components/trip/block/index.vue
View file @ be604cf8
<style> <style>
@import url('../../../assets/trip/block/index.css'); @import url('../../../assets/trip/block/index.css');
</style> </style>
<template> <template>
<div class="trip-box"> <div class="trip-box">
<div class="trip-block" v-for="(item,i) in trips" :key="i"> <div class="trip-block" v-for="(item,i) in trips" :key="i">
<div class="trip-title"> <div class="trip-title">
<div > <div>
<p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p> <p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p>
<p>{{item.dateTime}}</p> <p>{{item.dateTime}}</p>
</div> </div>
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
</div> </div>
</template> </template>
<script> <script>
import oneday from './oneday' import oneday from './oneday'
import twoday from './twoday' import twoday from './twoday'
import threeday from './threeday' import threeday from './threeday'
import fourday from './fourday' import fourday from './fourday'
import fiveday from './fiveday' import fiveday from './fiveday'
export default { export default {
props: ['tripList','isDirect','clickDate'], props: ['tripList', 'isDirect', 'clickDate'],
components: { components: {
oneday, oneday,
twoday, twoday,
...@@ -34,220 +34,235 @@ export default { ...@@ -34,220 +34,235 @@ export default {
fourday, fourday,
fiveday fiveday
}, },
watch:{ watch: {
clickDate:{ clickDate: {
handler:function(val,oldval){ handler: function (val, oldval) {
if (val) { if (val) {
this.trips.forEach((x,index)=>{ this.trips.forEach((x, index) => {
x.dateTime = this.setDate(index); x.dateTime = this.setDate(index);
}) })
this.$forceUpdate() this.$forceUpdate()
} }
}, },
deep:true//对象内部的属性监听，也叫深度监听 deep: true //对象内部的属性监听，也叫深度监听
}, },
}, },
mounted() { mounted() {
this.init() this.init()
}, },
data () { data() {
return { return {
isReady:false, isReady: false,
trips:[] trips: []
} }
}, },
methods: { methods: {
init(){ init() {
this.tripList.forEach((x,j)=>{ this.tripList.forEach((x, j) => {
let useDinnerTypeBy='' let useDinnerTypeBy = ''
let jin=[],jiu=[],jiu2=[],jiao=[],dadian=[],tips=[],activy=[],can={breakfirst:'敬请自理',lanuch:'敬请自理',dinner:'敬请自理'} let jin = [],
x.dayArray.forEach((y,index)=>{ jiu = [],
if(y.type==7 && y.childItem.title!=''){ jiu2 = [],
let obj={ jiao = [],
title:y.childItem.title, dadian = [],
content:y.childItem.description, tips = [],
img:y.childItem.imaArray&&y.childItem.imaArray.length>0?y.childItem.imaArray[0].url:'', activy = [],
ticketName:'', can = {
playTimeHour:null, breakfirst: '敬请自理',
playTimeMinutes:null, lanuch: '敬请自理',
url:'' dinner: '敬请自理'
}
x.dayArray.forEach((y, index) => {
if (y.type == 7 && y.childItem.title != '') {
let obj = {
title: y.childItem.title,
content: y.childItem.description,
img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ? y
.childItem.imaArray[0].url : '',
ticketName: '',
playTimeHour: 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:'' url: ''
} }
jiao.push(obj) jiao.push(obj)
} else if(y.type==2 && y.childItem.imaArray.length>0){ } else if (y.type == 2 && 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.playTimeMinutes, playTimeMinutes: y.childItem.playTimeMinutes,
url:y.childItem.url, url: y.childItem.url,
scenicJson: y.childItem.scenicJson, scenicJson: y.childItem.scenicJson,
videoPath: y.childItem.imaArray[0].videoPath, videoPath: y.childItem.imaArray[0].videoPath,
fileType: y.childItem.imaArray[0].fileType, fileType: y.childItem.imaArray[0].fileType,
} }
jin.push(obj) jin.push(obj)
} else if(y.type==3 && y.childItem.hotelName!='' && y.childItem.imaArray.length>0){ } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray
let obj={ .length > 0) {
title:y.childItem.hotelName, let obj = {
content:y.childItem.description, title: y.childItem.hotelName,
img:y.childItem.imaArray[0].url, content: y.childItem.description,
ticketName:'', img: y.childItem.imaArray[0].url,
playTimeHour:null, ticketName: '',
playTimeMinutes:null, playTimeHour: null,
url:y.childItem.url 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:'' 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:'' url: ''
} }
tips.push(obj) tips.push(obj)
} }
if(y.type==3){ if (y.type == 3) {
// jiu2.push(y.childItem.hotelName) jiu2.push({
jiu2.push({name:y.childItem.hotelName,url:y.childItem.url}); name: y.childItem.hotelName,
useDinnerTypeBy=y.childItem.useDinnerType url: y.childItem.url,
status:y.childItem.status
});
useDinnerTypeBy = y.childItem.useDinnerType
} }
}) })
if(can.breakfirst=='敬请自理' && useDinnerTypeBy.indexOf('1')!=-1){ if (can.breakfirst == '敬请自理' && useDinnerTypeBy.indexOf('1') != -1) {
can.breakfirst='酒店内享用早餐' can.breakfirst = '酒店内享用早餐'
}else if(can.breakfirst==''){ } 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==''){ } else if (can.lanuch == '') {
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==''){ } else if (can.dinner == '') {
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){ } else if (jiu.length > 0) {
details=jiu details = jiu
} else if(dadian.length>0){ } else if (dadian.length > 0) {
details=dadian 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=dadian.length>0 && dadian[0].title && dadian[0].title!=''?dadian[0].title:(jiao.length>0?jiao[0].title:'集合出发') x.title = dadian.length > 0 && dadian[0].title && dadian[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) if (xc.title !== undefined)
x.title=xc.title+'~' x.title = xc.title + '~'
}) })
if(x.title=='集合出发'){ if (x.title == '集合出发') {
if(j>0&&j<tripList.length-1) if (j > 0 && j < tripList.length - 1)
x.title='自由活动' 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); x.dateTime = this.setDate(j);
}) })
this.trips=this.tripList this.trips = this.tripList
}, },
setDate: function (j) { setDate: function (j) {
if (j === 0) { if (j === 0) {
...@@ -256,13 +271,13 @@ export default { ...@@ -256,13 +271,13 @@ export default {
let d = new Date(this.clickDate) let d = new Date(this.clickDate)
d = d.getTime(d); d = d.getTime(d);
let add = d + ((24 * 60 * 60 * 1000) * j) let add = d + ((24 * 60 * 60 * 1000) * j)
let date = new Date(add);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 let date = new Date(add); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-'; let Y = date.getFullYear() + '-';
let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'; let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' '; let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' ';
return Y+M+D; return Y + M + D;
} }
}, },
} }
} }
</script> </script>
\ No newline at end of file
src/components/trip/block/oneday.vue
View file @ be604cf8
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'"> <template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath" controls="controls"> <video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath"
controls="controls">
</video> </video>
</template> </template>
<template v-else> <template v-else>
...@@ -16,13 +17,12 @@ ...@@ -16,13 +17,12 @@
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
<h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h3> <h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)"
style="cursor: pointer"></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!=""'></span>
<!--<i class="iconfont icon-menpiao"></i>--> <span class="playInfo-item"
<!--{{day.details[0].ticketName!=""}}--> v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
</span>
<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>
...@@ -81,32 +81,37 @@ ...@@ -81,32 +81,37 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{}, day: {},
isDirect:{} isDirect: {}
}, },
methods:{ methods: {
getHotelSuffix(){ getHotelSuffix() {
let suffix =""; let suffix = "";
if(this.day.jiu2.length>1){ if (this.day.jiu2.length > 1) {
if(this.isDirect===1){ if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
}else{ } else {
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name !=
if(this.isDirect===1){ '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】" suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
} }
} }
} }
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
if(url!=null&&url.length>0){ if (url != null && url.length > 0) {
window.open(url, "_blank"); window.open(url, "_blank");
} }
} }
} }
} }
</script> </script>
\ No newline at end of file
src/components/trip/block/threeday.vue
View file @ be604cf8
...@@ -4,22 +4,26 @@ ...@@ -4,22 +4,26 @@
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'"> <template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath" controls="controls"> <video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath"
controls="controls">
</video> </video>
</template> </template>
<template v-else> <template v-else>
<img :src='day.details[0].img' :style="{position: 'relative',top:day.details[0].scenicJson.y + 'px'}" /> <img :src='day.details[0].img'
:style="{position: 'relative',top:day.details[0].scenicJson.y + 'px'}" />
</template> </template>
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
<h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h3> <h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)"
style="cursor: pointer"></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>
...@@ -34,17 +38,20 @@ ...@@ -34,17 +38,20 @@
<el-col :span="8"> <el-col :span="8">
<div class="item hor-box"> <div class="item hor-box">
<div class="remark"> <div class="remark">
<h3 v-html="day.details[1].title" @click.stop="goUrl(day.details[1].url)" style="cursor: pointer" ></h3> <h3 v-html="day.details[1].title" @click.stop="goUrl(day.details[1].url)"
style="cursor: pointer"></h3>
<div class="playInfo"> <div class="playInfo">
<span class="playInfo-item" v-if='day.details[1].ticketName!=""'> <span class="playInfo-item" v-if='day.details[1].ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>--> <!--<i class="iconfont icon-menpiao"></i>-->
<!--{{day.details[1].ticketName}}--> <!--{{day.details[1].ticketName}}-->
</span> </span>
<span class="playInfo-item" v-if='day.details[1].playTimeHour || day.details[1].playTimeMinutes'> <span class="playInfo-item"
v-if='day.details[1].playTimeHour || day.details[1].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
约 约
<span v-if="day.details[1].playTimeHour">{{day.details[1].playTimeHour}}小时 </span> <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 v-if="day.details[1].playTimeMinutes">{{day.details[1].playTimeMinutes}}分钟
</span>
</span> </span>
</div> </div>
<span v-html="day.details[1].content"></span> <span v-html="day.details[1].content"></span>
...@@ -55,11 +62,13 @@ ...@@ -55,11 +62,13 @@
<div class="item hor-box"> <div class="item hor-box">
<div class="image"> <div class="image">
<template v-if="day.details[1].fileType&&day.details[1].fileType=='.mp4'"> <template v-if="day.details[1].fileType&&day.details[1].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[1].videoPath" controls="controls"> <video ref="myVideo" width="100%" height="100%" :src="day.details[1].videoPath"
controls="controls">
</video> </video>
</template> </template>
<template v-else> <template v-else>
<img :src="day.details[1].img" :style="{position: 'relative',top:day.details[1].scenicJson.y + 'px'}" /> <img :src="day.details[1].img"
:style="{position: 'relative',top:day.details[1].scenicJson.y + 'px'}" />
</template> </template>
</div> </div>
</div> </div>
...@@ -70,11 +79,13 @@ ...@@ -70,11 +79,13 @@
<div class="item hor-box"> <div class="item hor-box">
<div class="image"> <div class="image">
<template v-if="day.details[2].fileType&&day.details[2].fileType=='.mp4'"> <template v-if="day.details[2].fileType&&day.details[2].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[2].videoPath" controls="controls"> <video ref="myVideo" width="100%" height="100%" :src="day.details[2].videoPath"
controls="controls">
</video> </video>
</template> </template>
<template v-else> <template v-else>
<img :src="day.details[2].img" :style="{position: 'relative',top:day.details[2].scenicJson.y + 'px'}" /> <img :src="day.details[2].img"
:style="{position: 'relative',top:day.details[2].scenicJson.y + 'px'}" />
</template> </template>
</div> </div>
</div> </div>
...@@ -82,17 +93,20 @@ ...@@ -82,17 +93,20 @@
<el-col :span="8"> <el-col :span="8">
<div class="item hor-box"> <div class="item hor-box">
<div class="remark"> <div class="remark">
<h3 v-html="day.details[2].title" @click.native.stop="goUrl(day.details[2].url)" style="cursor: pointer"></h3> <h3 v-html="day.details[2].title" @click.native.stop="goUrl(day.details[2].url)"
style="cursor: pointer"></h3>
<div class="playInfo"> <div class="playInfo">
<span class="playInfo-item" v-if='day.details[2].ticketName!=""'> <span class="playInfo-item" v-if='day.details[2].ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>--> <!--<i class="iconfont icon-menpiao"></i>-->
<!--{{day.details[2].ticketName}}--> <!--{{day.details[2].ticketName}}-->
</span> </span>
<span class="playInfo-item" v-if='day.details[2].playTimeHour || day.details[2].playTimeMinutes'> <span class="playInfo-item"
v-if='day.details[2].playTimeHour || day.details[2].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
约 约
<span v-if="day.details[2].playTimeHour">{{day.details[2].playTimeHour}}小时 </span> <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 v-if="day.details[2].playTimeMinutes">{{day.details[2].playTimeMinutes}}分钟
</span>
</span> </span>
</div> </div>
<span v-html="day.details[2].content"></span> <span v-html="day.details[2].content"></span>
...@@ -135,7 +149,7 @@ ...@@ -135,7 +149,7 @@
<img src='../../../assets/img/daily_hotel-1.png' /> <img src='../../../assets/img/daily_hotel-1.png' />
</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" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k" > <span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}} {{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span> </span>
{{getHotelSuffix()}} {{getHotelSuffix()}}
...@@ -148,32 +162,37 @@ ...@@ -148,32 +162,37 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{}, day: {},
isDirect:{} isDirect: {}
}, },
methods:{ methods: {
getHotelSuffix(){ getHotelSuffix() {
let suffix =""; let suffix = "";
if(this.day.jiu2.length>1){ if (this.day.jiu2.length > 1) {
if(this.isDirect===1){ if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
}else{ } else {
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name !=
if(this.isDirect===1){ '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】" suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
} }
} }
} }
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
if(url!=null&&url.length>0){ if (url != null && url.length > 0) {
window.open(url, "_blank"); window.open(url, "_blank");
} }
} }
} }
} }
</script> </script>
\ No newline at end of file
src/components/trip/block/twoday.vue
View file @ be604cf8
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
<div class="item"> <div class="item">
<div class="up"> <div class="up">
<template v-if="item.fileType&&item.fileType=='.mp4'"> <template v-if="item.fileType&&item.fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="item.videoPath" controls="controls"> <video ref="myVideo" width="100%" height="100%" :src="item.videoPath"
controls="controls">
</video> </video>
</template> </template>
<template v-else> <template v-else>
...@@ -14,11 +15,10 @@ ...@@ -14,11 +15,10 @@
</template> </template>
</div> </div>
<div class="down"> <div class="down">
<h3 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h3> <h3 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)"
style="cursor: pointer"></h3>
<div class="playInfo"> <div class="playInfo">
<span class="playInfo-item" v-if='item.ticketName!=""'> <span class="playInfo-item" v-if='item.ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>-->
<!--{{item.ticketName}}-->
</span> </span>
<span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'> <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
...@@ -80,32 +80,37 @@ ...@@ -80,32 +80,37 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{}, day: {},
isDirect:{} isDirect: {}
}, },
methods:{ methods: {
getHotelSuffix(){ getHotelSuffix() {
let suffix =""; let suffix = "";
if(this.day.jiu2.length>1){ if (this.day.jiu2.length > 1) {
if(this.isDirect===1){ if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
}else{ } else {
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name !=
if(this.isDirect===1){ '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】" suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
} }
} }
} }
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
if(url!=null&&url.length>0){ if (url != null && url.length > 0) {
window.open(url, "_blank"); window.open(url, "_blank");
} }
} }
} }
} }
</script> </script>
\ No newline at end of file
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