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
Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 261 deletions
src/components/commonPage/fiveday.vue
View file @ e28cf317
...@@ -18,14 +18,17 @@ ...@@ -18,14 +18,17 @@
<div class="five-box day_table"> <div class="five-box day_table">
<div class="left"> <div class="left">
<div class="image"> <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-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, "")' /> <img v-else :src='compressImg(day.details[2].img, "filt", 663, "")' />
</div> </div>
<table class="day_table"> <table class="day_table">
<tr> <tr>
<td> <td>
<div class="item"> <div class="item">
<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>--> <!--<i class="iconfont icon-menpiao"></i>-->
...@@ -52,12 +55,13 @@ ...@@ -52,12 +55,13 @@
<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'}"
:src='compressImg(item.img, "filt", 663, "")' />
<img v-else :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>-->
...@@ -119,37 +123,42 @@ ...@@ -119,37 +123,42 @@
</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.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
}else{
if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
if(this.isDirect===1){
} }
} }
} }
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>
src/components/commonPage/fourday.vue
View file @ e28cf317
...@@ -137,11 +137,15 @@ export default { ...@@ -137,11 +137,15 @@ 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 = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
} }
} }
}
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
......
src/components/commonPage/oneday.vue
View file @ e28cf317
...@@ -21,19 +21,22 @@ ...@@ -21,19 +21,22 @@
<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"
: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 :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.dayNum==1 && day.details[0].img==''"
<img v-else-if="day.islast && day.details[0].img==''" :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/nll.jpg'" /> :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'" /> <img v-else :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/activy.jpg'" />
</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>
...@@ -91,37 +94,42 @@ ...@@ -91,37 +94,42 @@
</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 = "或同級" 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>
src/components/commonPage/threeday.vue
View file @ e28cf317
...@@ -177,11 +177,15 @@ export default { ...@@ -177,11 +177,15 @@ 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 = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
} }
} }
}
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
......
src/components/commonPage/twoday.vue
View file @ e28cf317
...@@ -104,11 +104,15 @@ export default { ...@@ -104,11 +104,15 @@ 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 = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級"
} }
} }
} }
}
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
......
src/components/confirmationOrderDownLoad.vue
View file @ e28cf317
...@@ -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