Skip to content

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

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

parents f9f6927b 12873c00
Hide whitespace changes
Inline Side-by-side
Showing with 294 additions and 261 deletions
src/components/commonPage/fiveday.vue
View file @ e28cf317
<template>
<div class="block-item">
<div class="one-block">
<div>
<table class="trip-title">
<div class="block-item">
<div class="one-block">
<div>
<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>
<td class="day">
<h3>
第
<span v-if="dayNum<10">0</span>
{{dayNum}}天
</h3>
<p style="margin: 0;">{{day.dateTime}}</p>
<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>
<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>
<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 class="right">
<div class="fiveday">
<div v-for="(item,i) in day.details" v-if="i>0&&i<5" :key="i">
</div>
<div class="right">
<div class="fiveday">
<div v-for="(item,i) in day.details" v-if="i>0&&i<5" :key="i">
<div class="item item5">
<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 v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src='compressImg(item.img, "filt", 663, "")' />
<div class="item item5">
<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 v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}"
:src='compressImg(item.img, "filt", 663, "")' />
<img v-else :src='compressImg(item.img, "filt", 663, "")' />
</div>
<div class="down">
<h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4>
<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>
<div v-html="item.content" class="pp" style="height:120px;overflow:hidden;"></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 class="down">
<h4 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer"></h4>
<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>
<div v-html="item.content" class="pp" style="height:120px;overflow:hidden;"></div>
</div>
</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>
<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>
<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>
</template>
<script>
export default {
props: {
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!='温馨的家'){
if(this.isDirect===1){
export default {
props: {
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 != '温馨的家') {
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;
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");
}
window.open(url, "_blank");
}
}
}
};
};
</script>
src/components/commonPage/fourday.vue
View file @ e28cf317
......@@ -137,9 +137,13 @@ export default {
}
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "或同級"
}
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
......
src/components/commonPage/oneday.vue
View file @ e28cf317
<template>
<div class="block-item">
<div class="one-block">
<div>
<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="block-item">
<div class="one-block">
<div>
<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>
<table class="day_table">
<tr>
<td>
<div class="item big" style='margin-bottom:20px;'>
<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-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" />
<img v-else-if="day.dayNum==1 && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<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/PictureMaterial/Web/activy.jpg'" />
</div>
<div class="right">
<div class="details">
<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>
</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>
<table class="day_table">
<tr>
<td>
<div class="item big" style='margin-bottom:20px;'>
<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-else :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'" />
<img v-else-if="day.dayNum==1 && day.details[0].img==''"
:src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" />
<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/PictureMaterial/Web/activy.jpg'" />
</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 class="right">
<div class="details">
<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!=""'>
</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>
<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>
</template>
<script>
export default {
props: {
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!='温馨的家'){
if(this.isDirect===1){
export default {
props: {
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 != '温馨的家') {
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;
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");
}
window.open(url, "_blank");
}
}
},
};
},
};
</script>
src/components/commonPage/threeday.vue
View file @ e28cf317
......@@ -177,9 +177,13 @@ export default {
}
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "或同級"
}
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
......
src/components/commonPage/twoday.vue
View file @ e28cf317
......@@ -104,9 +104,13 @@ export default {
}
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
suffix = "或同級"
}
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
......
src/components/confirmationOrderDownLoad.vue
View file @ e28cf317
......@@ -749,7 +749,7 @@
// }, null)
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
'日游', isPc)
'日游', isPc)
} else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc)
}
......@@ -1182,8 +1182,11 @@
}
jin.push(obj)
} else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
//酒店
let obj = {
title: y.childItem.hotelName,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
content: y.childItem.description,
img: y.childItem.imaArray[0].url,
ticketName: '',
......@@ -1226,7 +1229,9 @@
if (y.type == 3) {
jiu2.push({
name: y.childItem.hotelName,
url: y.childItem.url
url: y.childItem.url,
newTitle: y.childItem.newHotelName,
status: y.childItem.status,
});
useDinnerTypeBy = y.childItem.useDinnerType
}
......@@ -1345,7 +1350,6 @@
threeday,
fourday,
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