Skip to content

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

页面修改

parent 8a0a3a1e
Expand all 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
This diff is collapsed.
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