Skip to content

S
SuperMan
Commit 71833e32 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 6418c60d
Show whitespace changes
Inline Side-by-side
Showing with 220 additions and 212 deletions
src/components/commonPage/threeday.vue
View file @ 71833e32
...@@ -25,18 +25,18 @@ ...@@ -25,18 +25,18 @@
</video> </video>
</template> </template>
<template v-else> <template v-else>
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" <img v-if="day.details[0].img!='' && day.details[0].scenicJson"
:style="{'top':day.details[0].scenicJson.y+'px'}"
:src='compressImg(day.details[0].img, "filt", 663, "")' /> :src='compressImg(day.details[0].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' /> <img v-else :src='compressImg(day.details[0].img, "filt", 663, "")' />
</template> </template>
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
<h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h4> <h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer">
</h4>
<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>-->
<!--{{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>
...@@ -59,20 +59,21 @@ ...@@ -59,20 +59,21 @@
<div> <div>
<div class="item hor-box"> <div class="item hor-box">
<div class="details" style="padding: 22px;"> <div class="details" style="padding: 22px;">
<h4 v-html="day.details[1].title" @click.stop="goUrl(day.details[1].url)" style="cursor: pointer" ></h4> <h4 v-html="day.details[1].title" @click.stop="goUrl(day.details[1].url)" style="cursor: pointer">
</h4>
<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>-->
<!--{{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>
<div style="height: 150px;line-height: 22px;overflow: hidden;text-overflow:ellipsis;" v-html="day.details[1].content"></div> <div style="height: 150px;line-height: 22px;overflow: hidden;text-overflow:ellipsis;"
v-html="day.details[1].content"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -80,12 +81,14 @@ ...@@ -80,12 +81,14 @@
<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 v-if="day.details[1].img!='' && day.details[1].scenicJson" :style="{'top':day.details[1].scenicJson.y+'px'}" <img v-if="day.details[1].img!='' && day.details[1].scenicJson"
:src='compressImg(day.details[1].img, "filt", 663, "")'/> :style="{'top':day.details[1].scenicJson.y+'px'}"
:src='compressImg(day.details[1].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[1].img, "filt", 663, "")' /> <img v-else :src='compressImg(day.details[1].img, "filt", 663, "")' />
</template> </template>
</div> </div>
...@@ -103,11 +106,14 @@ ...@@ -103,11 +106,14 @@
<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 v-if="day.details[2].img!='' && day.details[2].scenicJson" :style="{'top':day.details[2].scenicJson.y+'px'}" :src='compressImg(day.details[2].img, "filt", 663, "")' /> <img v-if="day.details[2].img!='' && day.details[2].scenicJson"
:style="{'top':day.details[2].scenicJson.y+'px'}"
:src='compressImg(day.details[2].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' /> <img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</template> </template>
</div> </div>
...@@ -116,20 +122,21 @@ ...@@ -116,20 +122,21 @@
<div> <div>
<div class="item hor-box"> <div class="item hor-box">
<div class="details" style="padding: 22px;"> <div class="details" style="padding: 22px;">
<h4 v-html="day.details[2].title" @click.native.stop="goUrl(day.details[2].url)" style="cursor: pointer"></h4> <h4 v-html="day.details[2].title" @click.stop="goUrl(day.details[2].url)" style="cursor: pointer">
</h4>
<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>-->
<!--{{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>
<div style="height: 131px;line-height: 22px;overflow: hidden;text-overflow:ellipsis;" v-html="day.details[2].content"></div> <div style="height: 131px;line-height: 22px;overflow: hidden;text-overflow:ellipsis;"
v-html="day.details[2].content"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -179,12 +186,12 @@ ...@@ -179,12 +186,12 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{}, day: {},
isDirect:{}, isDirect: {},
title:{}, title: {},
dayNum:{}, dayNum: {},
showTime: {}, showTime: {},
}, },
data() { data() {
...@@ -200,15 +207,15 @@ export default { ...@@ -200,15 +207,15 @@ export default {
deep: true, deep: true,
}, },
}, },
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!='温馨的家'&& this.day.jiu2[0].name!='机场附近酒店'){ if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) { if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】" suffix = "【保证入住】"
} else { } else {
...@@ -221,13 +228,14 @@ export default { ...@@ -221,13 +228,14 @@ export default {
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
if(url!=null&&url.length>0){ if (url != null && url.length > 0) {
if(url.indexOf('http://')==-1 || url.indexOf('https://')==-1){ if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
url='http://'+url; url = 'http://' + url;
} }
window.open(url, "_blank"); window.open(url, "_blank");
} }
} }
} }
} }
</script> </script>
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