Commit e28cf317 authored by 华国豪's avatar 华国豪 🙄
parents f9f6927b 12873c00
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div> <div>
<table class="trip-title"> <table class="trip-title">
<tr>
<td class="day">
<h3>
<span v-if="dayNum<10">0</span>
{{dayNum}}
</h3>
<p style="margin: 0;">{{day.dateTime}}</p>
</td>
<td class="desc" v-html="title"></td>
</tr>
</table>
<div class="five-box day_table">
<div class="left">
<div class="image">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson"
:style="{'top':day.details[0].scenicJson.y+'px'}"
:src='compressImg(day.details[2].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</div>
<table class="day_table">
<tr> <tr>
<td class="day"> <td>
<h3> <div class="item">
<h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer">
<span v-if="dayNum<10">0</span> </h4>
{{dayNum}} <div class="playInfo">
</h3> <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<p style="margin: 0;">{{day.dateTime}}</p> <!--<i class="iconfont icon-menpiao"></i>-->
<!--{{day.details[0].ticketName}}-->
</span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
<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>
</div>
<div v-html="day.details[0].content" class="pp"></div>
</div>
</td> </td>
<td class="desc" v-html="title"></td>
</tr> </tr>
</table> </table>
<div class="five-box day_table">
<div class="left">
<div class="image">
<img v-if="day.details[0].img!='' && day.details[0].scenicJson" :style="{'top':day.details[0].scenicJson.y+'px'}" :src='compressImg(day.details[2].img, "filt", 663, "")' />
<img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</div>
<table class="day_table">
<tr>
<td>
<div class="item">
<h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h4>
<div class="playInfo">
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>-->
<!--{{day.details[0].ticketName}}-->
</span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
<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>
</div>
<div v-html="day.details[0].content" class="pp"></div>
</div>
</td>
</tr>
</table>
</div> </div>
<div class="right"> <div class="right">
<div class="fiveday"> <div class="fiveday">
<div v-for="(item,i) in day.details" v-if="i>0&&i<5" :key="i"> <div v-for="(item,i) in day.details" v-if="i>0&&i<5" :key="i">
<div class="item item5"> <div class="item item5">
<div class="upFour"> <div class="upFour">
<!-- <img :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> --> <!-- <img :style="{'top':item.scenicJson.y+'px'}" :src="$commonUtils.replaceHttps(item.img)+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663'" /> -->
<img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")' /> <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}"
<img v-else :src='compressImg(item.img, "filt", 663, "")' /> :src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src='compressImg(item.img, "filt", 663, "")' />
</div> </div>
<div class="down"> <div class="down">
<h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4> <h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer"></h4>
<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>-->
<!--{{item.ticketName}}--> <!--{{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>
<span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span> <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
<span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span> <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span>
</span> </span>
</div> </div>
<div v-html="item.content" class="pp" style="height:120px;overflow:hidden;"></div> <div v-html="item.content" class="pp" style="height:120px;overflow:hidden;"></div>
</div> </div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="item day_tips" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div>
<div v-for="(t,k) in day.tips" :key="k" v-html="t.content"></div>
</div> </div>
</div>
</div> </div>
<table> </div>
<tr class="restaurant"> </div>
<td width="95" valign="middle" class="key"> </div>
<img crossOrigin="Anonymous" src='../../assets/img/daily_breakfast.png' /> <div class="item day_tips" v-if='day.tips.length>0'>
</td> <h4>温馨提示</h4>
<td width="211" valign="middle" class="val">{{day.can.breakfirst}}</td> <div>
<td width="110" align="center" valign="middle" class="key"> <div v-for="(t,k) in day.tips" :key="k" v-html="t.content"></div>
<img crossOrigin="Anonymous" src='../../assets/img/daily_lunch.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.lanuch}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_dinner.png' />
</td>
<td valign="middle" class="val">{{day.can.dinner}}</td>
</tr>
<tr class="restaurant">
<td colspan="6" height="15"></td>
</tr>
<tr class="restaurant">
<td valign="top" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_hotel-1.png' />
</td>
<td valign="middle" colspan="5" 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">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
</tr>
</table>
</div> </div>
</div>
<table>
<tr class="restaurant">
<td width="95" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_breakfast.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.breakfirst}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_lunch.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.lanuch}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_dinner.png' />
</td>
<td valign="middle" class="val">{{day.can.dinner}}</td>
</tr>
<tr class="restaurant">
<td colspan="6" height="15"></td>
</tr>
<tr class="restaurant">
<td valign="top" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_hotel-1.png' />
</td>
<td valign="middle" colspan="5" 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">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
</tr>
</table>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
day:{}, day: {},
isDirect:{}, isDirect: {},
title:{}, title: {},
dayNum:{} dayNum: {}
}, },
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 != '温馨的家') {
if(this.isDirect===1){ if (this.day.jiu2[0].status == 1) {
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){ 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>
...@@ -137,9 +137,13 @@ export default { ...@@ -137,9 +137,13 @@ export default {
} }
}else{ }else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if(this.day.jiu2.length==1 && 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;
......
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div> <div>
<table class="trip-title"> <table class="trip-title">
<tr> <tr>
<td class="day"> <td class="day">
<h3> <h3>
<span v-if="dayNum<10">0</span> <span v-if="dayNum<10">0</span>
{{dayNum}} {{dayNum}}
</h3> </h3>
<p style="margin: 0;">{{day.dateTime}}</p> <p style="margin: 0;">{{day.dateTime}}</p>
</td> </td>
<td class="desc" v-html="title"></td> <td class="desc" v-html="title"></td>
</tr> </tr>
</table> </table>
<table class="day_table"> <table class="day_table">
<tr> <tr>
<td> <td>
<div class="item big" style='margin-bottom:20px;'> <div class="item big" style='margin-bottom:20px;'>
<div class="left"> <div class="left">
<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, "")'/> <img v-if="day.details[0].img!='' && day.details[0].scenicJson"
<img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" /> :style="{'top':day.details[0].scenicJson.y+'px'}"
<img v-else-if="day.dayNum==1 && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" /> :src='compressImg(day.details[0].img, "filt", 663, "")' />
<img v-else-if="day.islast && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" /> <img v-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" />
<img v-else :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/activy.jpg'" /> <img v-else-if="day.dayNum==1 && day.details[0].img==''"
</div> :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<div class="right"> <img v-else-if="day.islast && day.details[0].img==''"
<div class="details"> :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h4> <img v-else :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/activy.jpg'" />
<div class="playInfo">
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>-->
<!--{{day.details[0].ticketName}}-->
</span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
<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>
</div>
<div v-html="day.details[0].content" class="pp"></div>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
<div class="item day_tips" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div>
<div v-for="(t,k) in day.tips" :key="k" v-html="t.content"></div>
</div> </div>
</div> <div class="right">
<table> <div class="details">
<tr class="restaurant"> <h4 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer">
<td width="95" valign="middle" class="key"> </h4>
<img crossOrigin="Anonymous" src='../../assets/img/daily_breakfast.png' /> <div class="playInfo">
</td> <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
<td width="211" valign="middle" class="val">{{day.can.breakfirst}}</td> </span>
<td width="110" align="center" valign="middle" class="key"> <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<img crossOrigin="Anonymous" src='../../assets/img/daily_lunch.png' /> <i class="iconfont icon-shijian1"></i>
</td>
<td width="211" valign="middle" class="val">{{day.can.lanuch}}</td> <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
<td width="110" align="center" valign="middle" class="key"> <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span>
<img crossOrigin="Anonymous" src='../../assets/img/daily_dinner.png' /> </span>
</td> </div>
<td valign="middle" class="val">{{day.can.dinner}}</td> <div v-html="day.details[0].content" class="pp"></div>
</tr> </div>
<tr class="restaurant"> </div>
<td colspan="6" height="15"></td> </div>
</tr> </td>
<tr class="restaurant"> </tr>
<td valign="top" class="key"> </table>
<img crossOrigin="Anonymous" src='../../assets/img/daily_hotel-1.png' /> </div>
</td> <div class="item day_tips" v-if='day.tips.length>0'>
<td valign="middle" colspan="5" class="val" v-if='day.jiu2.length>0'> <h4>温馨提示</h4>
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k"> <div>
{{k==day.jiu2.length-1?t.name:t.name+' / '}} <div v-for="(t,k) in day.tips" :key="k" v-html="t.content"></div>
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
</tr>
</table>
</div> </div>
</div>
<table>
<tr class="restaurant">
<td width="95" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_breakfast.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.breakfirst}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_lunch.png' />
</td>
<td width="211" valign="middle" class="val">{{day.can.lanuch}}</td>
<td width="110" align="center" valign="middle" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_dinner.png' />
</td>
<td valign="middle" class="val">{{day.can.dinner}}</td>
</tr>
<tr class="restaurant">
<td colspan="6" height="15"></td>
</tr>
<tr class="restaurant">
<td valign="top" class="key">
<img crossOrigin="Anonymous" src='../../assets/img/daily_hotel-1.png' />
</td>
<td valign="middle" colspan="5" 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">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span>
{{getHotelSuffix()}}
</td>
<td valign="middle" colspan="5" class="val" v-else>本日无酒店安排</td>
</tr>
</table>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
day:{}, day: {},
isDirect:{}, isDirect: {},
title:{}, title: {},
dayNum:{} dayNum: {}
}, },
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 = "或同級"
}
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "或同級" suffix = "或同級"
} }
} else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家') {
if (this.day.jiu2[0].status == 1) {
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){ 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>
...@@ -177,9 +177,13 @@ export default { ...@@ -177,9 +177,13 @@ export default {
} }
}else{ }else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if(this.day.jiu2.length==1 && 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;
......
...@@ -104,9 +104,13 @@ export default { ...@@ -104,9 +104,13 @@ export default {
} }
}else{ }else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){ if(this.day.jiu2.length==1 && 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;
......
...@@ -749,7 +749,7 @@ ...@@ -749,7 +749,7 @@
// }, null) // }, null)
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
'日游', isPc) '日游', isPc)
} else { } else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc) this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc)
} }
...@@ -1182,8 +1182,11 @@ ...@@ -1182,8 +1182,11 @@
} }
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.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: '',
...@@ -1226,7 +1229,9 @@ ...@@ -1226,7 +1229,9 @@
if (y.type == 3) { if (y.type == 3) {
jiu2.push({ jiu2.push({
name: y.childItem.hotelName, name: y.childItem.hotelName,
url: y.childItem.url url: y.childItem.url,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
}); });
useDinnerTypeBy = y.childItem.useDinnerType useDinnerTypeBy = y.childItem.useDinnerType
} }
...@@ -1345,7 +1350,6 @@ ...@@ -1345,7 +1350,6 @@
threeday, threeday,
fourday, fourday,
fiveday, fiveday,
}, },
} }
......
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