Skip to content

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

页面修改

parent 6f6499aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 688 additions and 506 deletions
src/components/SalesModule/productQuery.vue
View file @ fb6e0210
...@@ -644,7 +644,7 @@ ...@@ -644,7 +644,7 @@
<p class="d12TC">{{item.TCNUM}}（{{item.TCID}}）</p> <p class="d12TC">{{item.TCNUM}}（{{item.TCID}}）</p>
<p>{{item.LtName}}</p> <p>{{item.LtName}}</p>
<el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250">
<p class="d12p" @click="getJourney(item.ConfigID,item.LineName)" :title="item.Title">{{item.Title}}</p> <p class="d12p" @click="getJourney(item.ConfigID,item.TCID,item.LineName)" :title="item.Title">{{item.Title}}</p>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -2136,11 +2136,11 @@ ...@@ -2136,11 +2136,11 @@
}, err => {}) }, err => {})
}, },
getJourney(id, title) { getJourney(id,TCID, title) {
var that = this; var that = this;
this.tripTitle = title; this.tripTitle = title;
this.$nextTick(() => { this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id); that.$refs.comTeam.GetTrip(id,TCID);
}); });
that.outerVisible = true; that.outerVisible = true;
}, },
......
src/components/commonPage/TravelTripPreview/fiveday.vue
View file @ fb6e0210
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
</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" :key="k"> <span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／ {{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span> </span>
或同級 {{getHotelSuffix()}}
</div> </div>
<div class="val" v-else>本日无酒店安排</div> <div class="val" v-else>本日无酒店安排</div>
</el-col> </el-col>
...@@ -102,7 +102,29 @@ ...@@ -102,7 +102,29 @@
<script> <script>
export default { export default {
props:{ props:{
day:{} day:{},
isDirect: {},
},
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 != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】"
} else {
if (this.isDirect === 1) {
suffix = "或同級"
}
}
}
}
return suffix;
},
} }
} }
</script> </script>
src/components/commonPage/TravelTripPreview/fourday.vue
View file @ fb6e0210
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<img crossOrigin="Anonymous" :src='day.details[0].img' /> <img crossOrigin="Anonymous" :src='day.details[0].img' />
</div> </div>
<div class="right"> <div class="right">
<div class="details"> <div class="details">
<h3 v-html="day.details[0].title"></h3> <h3 v-html="day.details[0].title"></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>
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span> <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span>
</span> </span>
</div>
<span v-html="day.details[0].content"></span>
</div>
</div>
</div> </div>
<el-row :gutter="4"> <span v-html="day.details[0].content"></span>
<el-col :span="8" v-for="(item,i) in day.details" v-if="i>0" :key="i"> </div>
<div class="item"> </div>
<div class="three-item"> </div>
<div class="image"> <el-row :gutter="4">
<img crossOrigin="Anonymous" :src='item.img' /> <el-col :span="8" v-for="(item,i) in day.details" v-if="i>0" :key="i">
</div> <div class="item">
<h3 v-html="item.title"></h3> <div class="three-item">
<div class="playInfo"> <div class="image">
<span class="playInfo-item" v-if='item.ticketName!=""'> <img crossOrigin="Anonymous" :src='item.img' />
<i class="iconfont icon-menpiao"></i> </div>
{{item.ticketName}} <h3 v-html="item.title"></h3>
</span> <div class="playInfo">
<span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'> <span class="playInfo-item" v-if='item.ticketName!=""'>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-menpiao"></i>
约 {{item.ticketName}}
<span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span> </span>
<span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span> <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
</span> <i class="iconfont icon-shijian1"></i>
</div> 约
<span v-html="item.content"></span> <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
</div> <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span>
</div> </span>
</el-col> </div>
</el-row> <span v-html="item.content"></span>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div>
</div> </div>
<div class="restaurant"> </div>
<el-row :gutter="30"> </el-col>
<el-col :span="8" class="restaurant-item"> </el-row>
<div class="key"> <div class="item flex" v-if='day.tips.length>0'>
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' /> <h4>温馨提示</h4>
</div> <div class="remark">
<div class="val">{{day.can.breakfirst}}</div> <span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</el-col> </div>
<el-col :span="8" class="restaurant-item"> </div>
<div class="key"> <div class="restaurant">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' /> <el-row :gutter="30">
</div> <el-col :span="8" class="restaurant-item">
<div class="val">{{day.can.lanuch}}</div> <div class="key">
</el-col> <img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div> </div>
<div class="restaurant"> <div class="val">{{day.can.breakfirst}}</div>
<el-row :gutter="30"> </el-col>
<el-col :span="24" class="restaurant-item"> <el-col :span="8" class="restaurant-item">
<div class="key"> <div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' /> <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
</span>
或同級
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div> </div>
</div> <div class="val">{{day.can.lanuch}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{} 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 != '温馨的家' && 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;
}
window.open(url, "_blank");
}
}
} }
} }
</script> </script>
src/components/commonPage/TravelTripPreview/oneday.vue
View file @ fb6e0210
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div class="item big"> <div class="item big">
<div class="left"> <div class="left">
<img crossOrigin="Anonymous" v-if="day.details[0].img!=''" :src='day.details[0].img' /> <img crossOrigin="Anonymous" v-if="day.details[0].img!=''" :src='day.details[0].img' />
<img crossOrigin="Anonymous" v-else-if="day.dayNum==1 && day.details[0].img==''" src='../../../assets/img/nll.jpg' /> <img crossOrigin="Anonymous" v-else-if="day.dayNum==1 && day.details[0].img==''"
<img crossOrigin="Anonymous" v-else-if="day.islast && day.details[0].img==''" src='../../../assets/img/nll.jpg' /> src='../../../assets/img/nll.jpg' />
<img crossOrigin="Anonymous" v-else src='../../../assets/img/activy.jpg' /> <img crossOrigin="Anonymous" v-else-if="day.islast && day.details[0].img==''"
</div> src='../../../assets/img/nll.jpg' />
<div class="right"> <img crossOrigin="Anonymous" v-else src='../../../assets/img/activy.jpg' />
<div class="details"> </div>
<h3 v-html="day.details[0].title"></h3> <div class="right">
<div class="playInfo"> <div class="details">
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'> <h3 v-html="day.details[0].title"></h3>
<i class="iconfont icon-menpiao"></i> <div class="playInfo">
{{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" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'> {{day.details[0].ticketName}}
<i class="iconfont icon-shijian1"></i> </span>
约 <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
<span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span> <i class="iconfont icon-shijian1"></i>
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span> 约
</span> <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
</div> <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span>
<span v-html="day.details[0].content"></span> </span>
</div> </div>
</div> <span v-html="day.details[0].content"></span>
</div>
</div>
</div>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
</div> </div>
<div class="item flex" v-if='day.tips.length>0'> <div class="val">{{day.can.breakfirst}}</div>
<h4>温馨提示</h4> </el-col>
<div class="remark"> <el-col :span="8" class="restaurant-item">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span> <div class="key">
</div> <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div> </div>
<div class="restaurant"> <div class="val">{{day.can.lanuch}}</div>
<el-row :gutter="30"> </el-col>
<el-col :span="8" class="restaurant-item"> <el-col :span="8" class="restaurant-item">
<div class="key"> <div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' /> <img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.breakfirst}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div>
<div class="val">{{day.can.lanuch}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div> </div>
<div class="restaurant"> <div class="val">{{day.can.dinner}}</div>
<el-row :gutter="30"> </el-col>
<el-col :span="24" class="restaurant-item"> </el-row>
<div class="key"> </div>
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' /> <div class="restaurant">
</div> <el-row :gutter="30">
<div class="val" v-if='day.jiu2.length>0'> <el-col :span="24" class="restaurant-item">
<span v-for="(t,k) in day.jiu2" :key="k"> <div class="key">
{{t}} ／ <img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</span>
或同級
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div> </div>
</div> <div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{} day: {},
} isDirect: {},
} title: {},
</script> dayNum: {}
\ No newline at end of file },
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 != '温馨的家' && 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;
}
window.open(url, "_blank");
}
}
},
};
</script>
src/components/commonPage/TravelTripPreview/twoday.vue
View file @ fb6e0210
<template> <template>
<div class="block-item"> <div class="block-item">
<div class="two-block"> <div class="two-block">
<el-row :gutter="4"> <el-row :gutter="4">
<el-col :span="12" v-for="item in day.details" :key="item.dayNum"> <el-col :span="12" v-for="item in day.details" :key="item.dayNum">
<div class="item"> <div class="item">
<div class="up"> <div class="up">
<img crossOrigin="Anonymous" :src='item.img' /> <img crossOrigin="Anonymous" :src='item.img' />
</div>
<div class="down">
<h3 v-if='item.title!=""' v-html="item.title"></h3>
<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>
<span v-html="item.content"></span>
</div>
</div>
</el-col>
</el-row>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div>
</div> </div>
<div class="restaurant"> <div class="down">
<el-row :gutter="30"> <h3 v-if='item.title!=""' v-html="item.title"></h3>
<el-col :span="8" class="restaurant-item"> <div class="playInfo">
<div class="key"> <span class="playInfo-item" v-if='item.ticketName!=""'>
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' /> <i class="iconfont icon-menpiao"></i>
</div> {{item.ticketName}}
<div class="val">{{day.can.breakfirst}}</div> </span>
</el-col> <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
<el-col :span="8" class="restaurant-item"> <i class="iconfont icon-shijian1"></i>
<div class="key"> 约
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' /> <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
</div> <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟 </span>
<div class="val">{{day.can.lanuch}}</div> </span>
</el-col> </div>
<el-col :span="8" class="restaurant-item"> <span v-html="item.content"></span>
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{t}} ／
</span>
或同級
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div> </div>
</div>
</el-col>
</el-row>
<div class="item flex" v-if='day.tips.length>0'>
<h4>温馨提示</h4>
<div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
</div> </div>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
</div>
<div class="val">{{day.can.breakfirst}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
</div>
<div class="val">{{day.can.lanuch}}</div>
</el-col>
<el-col :span="8" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
</el-row>
</div>
<div class="restaurant">
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
</div>
<div class="val" v-if='day.jiu2.length>0'>
<span v-for="(t,k) in day.jiu2" :key="k">
{{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
</span>
{{getHotelSuffix()}}
</div>
<div class="val" v-else>本日无酒店安排</div>
</el-col>
</el-row>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{} 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 != '温馨的家' && 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;
}
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