Skip to content

A
Athena
Commit be604cf8 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 8a0a3a1e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 477 additions and 432 deletions
src/components/mall/detailTwo.vue
View file @ be604cf8
......@@ -158,8 +158,6 @@
<span class="tips pointer">
起价说明
</span>
<!-- <span class="blue split medium pointer">4.9</span>
<span class="blue pointer">0条点评</span> -->
<span style='margin-left:5px'>{{dataList.offerNumber+99}}人出游</span>
</div>
<div class="activy" v-if="maxdiscountAmount>0">
......@@ -417,11 +415,6 @@
</table>
</div>
<div class="slider" v-if="showType==1&&loadNone==false">
<!-- <el-carousel :interval="2000" height='400px' trigger="click" :style="{'background':'#ddd'}">
<el-carousel-item v-for="(i,index) in feature.featureImgList" :key="index">
<img :src="i.url" />
</el-carousel-item>
</el-carousel> -->
<swiper :imgs='feature.featureImgList'></swiper>
</div>
<div class="zidingyi" v-if="(showType==3 || showType<4)&&loadNone==false">
......@@ -441,16 +434,14 @@
</span>
<span>Trip Maps</span>
</div>
<!-- -->
<div class="map-box" v-if="dataList.isDirect&&travelLngLat.length>1">
<!-- <bmap :data="travelLngLat"/> -->
<GGMap :dataList="travelLngLat"></GGMap>
<div class="_travelLngLatInfo_box">
<p v-for="(item,index) in travelLngLatInfo" :key="index"><span class="_travelLngLatInfo_label">{{item.lable}}</span>：
<p v-for="(item,index) in travelLngLatInfo" :key="index"><span
class="_travelLngLatInfo_label">{{item.lable}}</span>：
{{item.text}}</p>
</div>
</div>
<!-- <div id="map_canvas" style="width:1000px; height:600px;"></div> -->
<div class="item-title">
<span class="t">{{dayTrip}}日行程</span>
<span>
......@@ -460,7 +451,6 @@
</div>
<div v-if='dayList&&dayList.length>0'>
<!-- <trip :tripList="dayList"></trip> -->
<block :tripList="dayList" :isDirect="isDirect" :clickDate="clickDate"></block>
</div>
<div class="item-title" id='feiyong'>
......@@ -650,7 +640,7 @@
</div>
</div>
<div style="height:100px;"></div>
<template v-if="sonData">
<confirmationOrderDownLoad ref="confirmationOrderDownLoad" :sonData="sonData" :TripLayer="TripLayer" />
</template>
......@@ -706,19 +696,16 @@
</table>
</div>
</el-dialog>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer"
ref="viewer">
<img v-for="(item,index) in images" :src="item.Url" :key="index+5000">
</viewer>
</div>
</template>
<script>
import moment from 'moment'
// import bmap from './map.vue'
import calendar from './calendar.vue'
import trip from '../trip/waterfall/index'
import block from '../trip/block/index'
......@@ -729,7 +716,6 @@
import bus from '../../plugins/event-bus'
export default {
components: {
// bmap,
GGMap,
calendar,
trip,
......@@ -894,7 +880,7 @@
} else {
let orderMsg = this.sonData.orderMsg
this.travelControlTripLayerShow = false
var title=orderMsg.startDate + orderMsg.lineteamName + orderMsg
var title = orderMsg.startDate + orderMsg.lineteamName + orderMsg
.dayNum + '日游';
this.toPDF(title);
}
......@@ -903,12 +889,12 @@
toPDF: function (title) {
this.pdfLoading = true
let urlObj = this.domainManager();
var tcid=0;
var tcid = 0;
var cId = 0;
if(this.sonData&&this.sonData.priceList.length>0&&this.sonData.priceList[0].tcid){
tcid=this.sonData.priceList[0].tcid;
if (this.sonData && this.sonData.priceList.length > 0 && this.sonData.priceList[0].tcid) {
tcid = this.sonData.priceList[0].tcid;
}
if(this.sonData){
if (this.sonData) {
cId = this.sonData.id;
}
let msg = {
......@@ -980,7 +966,7 @@
})
},
DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
var aDate, oDate1, oDate2, iDays
aDate = sDate1.split("-")
......@@ -1068,7 +1054,7 @@
this.showType = this.feature.featureType;
this.dayTrip = this.dataList.dayNum;
if (this.dataList.isDirect == 1 && this.dataList.travelLngLat.length) {
this.travelLngLat = [];
this.travelLngLat = [];
this.dataList.travelLngLat.forEach(x => {
if (x.type != 2) {
this.travelLngLat.push(x)
......@@ -1093,7 +1079,7 @@
this.htmlTitle = this.dataList.ltName;
this.showFlight = true
this.$forceUpdate()
} else {
this.$message.error(r.data.message)
}
......@@ -1165,17 +1151,17 @@
this.scrollobj.scrollTop = document.getElementById(id).offsetTop + screen.availHeight - 350;
},
//跳转至新行程
goUrlTrip(){
goUrlTrip() {
let routeData = this.$router.resolve({
name: 'newTrip',
query: {
ID : decodeURIComponent(this.$route.params.id),
tcid : decodeURIComponent(this.$route.params.tcid),
ID: decodeURIComponent(this.$route.params.id),
tcid: decodeURIComponent(this.$route.params.tcid),
}
})
window.open(routeData.href, '_blank')
},
handleScroll() {
},
handleScroll() {
try {
if (this.scrollobj.scrollTop > this.$refs.nav.offsetTop) {
this.changeNav = true
......
src/components/trip/block/fiveday.vue
View file @ be604cf8
......@@ -5,21 +5,25 @@
<div class="left">
<div class="image">
<template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath" controls="controls">
<video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath"
controls="controls">
</video>
</template>
<template v-else>
<img :src='day.details[0].img' :style="{position: 'relative',top:day.details[0].scenicJson.y + 'px'}"/>
<img :src='day.details[0].img'
:style="{position: 'relative',top:day.details[0].scenicJson.y + 'px'}" />
</template>
</div>
<div class="item">
<h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h3>
<h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)"
style="cursor: pointer"></h3>
<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'>
<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>
......@@ -36,14 +40,15 @@
<div class="three-item">
<div class="image">
<template v-if="item.fileType&&item.fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="item.videoPath" controls="controls">
<video ref="myVideo" width="100%" height="100%" :src="item.videoPath"
controls="controls">
</video>
</template>
<template v-else>
<img :src='item.img' />
<template v-else>
<img :src='item.img' />
</template>
</div>
<h3 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h3>
<h3 v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer"></h3>
<div class="playInfo">
<span class="playInfo-item" v-if='item.ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>-->
......@@ -55,7 +60,7 @@
<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>
......@@ -74,19 +79,19 @@
<el-row :gutter="30">
<el-col :span="8" class="restaurant-item">
<div class="key">
<img src='../../../assets/img/daily_breakfast.png' />
<img 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 src='../../../assets/img/daily_lunch.png' />
<img 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 src='../../../assets/img/daily_dinner.png' />
<img src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
......@@ -96,10 +101,10 @@
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img src='../../../assets/img/daily_hotel-1.png' />
<img 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" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
<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()}}
......@@ -112,32 +117,37 @@
</div>
</template>
<script>
export default {
props:{
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!='温馨的家'){
if(this.isDirect===1){
suffix = "【保证入住】"
export default {
props: {
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;
},
goUrl(url) {
if(url!=null&&url.length>0){
window.open(url, "_blank");
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
window.open(url, "_blank");
}
}
}
}
}
</script>
</script>
\ No newline at end of file
src/components/trip/block/fourday.vue
View file @ be604cf8
......@@ -116,19 +116,24 @@ export default {
},
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){
suffix = "【保证入住】"
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;
return suffix;
},
goUrl(url) {
if(url!=null&&url.length>0){
......
src/components/trip/block/index.vue
View file @ be604cf8
This diff is collapsed.
src/components/trip/block/oneday.vue
View file @ be604cf8
......@@ -4,25 +4,25 @@
<div class="item big">
<div class="left">
<template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath" controls="controls">
</video>
<video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath"
controls="controls">
</video>
</template>
<template v-else>
<img v-if="day.details[0].img!=''" :src='day.details[0].img' />
<img v-else-if="day.dayNum==1 && day.details[0].img==''" src='../../../assets/img/nll.jpg' />
<img v-else-if="day.islast && day.details[0].img==''" src='../../../assets/img/nll.jpg' />
<img v-else src='../../../assets/img/activy.jpg' />
<img v-if="day.details[0].img!=''" :src='day.details[0].img' />
<img v-else-if="day.dayNum==1 && day.details[0].img==''" src='../../../assets/img/nll.jpg' />
<img v-else-if="day.islast && day.details[0].img==''" src='../../../assets/img/nll.jpg' />
<img v-else src='../../../assets/img/activy.jpg' />
</template>
</div>
<div class="right">
<div class="details">
<h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" style="cursor: pointer" ></h3>
<h3 v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)"
style="cursor: pointer"></h3>
<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'>
<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>
......@@ -43,19 +43,19 @@
<el-row :gutter="30">
<el-col :span="8" class="restaurant-item">
<div class="key">
<img src='../../../assets/img/daily_breakfast.png' />
<img 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 src='../../../assets/img/daily_lunch.png' />
<img 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 src='../../../assets/img/daily_dinner.png' />
<img src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
......@@ -65,11 +65,11 @@
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img src='../../../assets/img/daily_hotel-1.png' />
<img 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" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
</span>
{{getHotelSuffix()}}
</div>
......@@ -81,32 +81,37 @@
</div>
</template>
<script>
export default {
props:{
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!='温馨的家'){
if(this.isDirect===1){
suffix = "【保证入住】"
export default {
props: {
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;
},
goUrl(url) {
if(url!=null&&url.length>0){
window.open(url, "_blank");
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
window.open(url, "_blank");
}
}
}
}
}
</script>
\ No newline at end of file
src/components/trip/block/threeday.vue
View file @ be604cf8
This diff is collapsed.
src/components/trip/block/twoday.vue
View file @ be604cf8
......@@ -6,19 +6,19 @@
<div class="item">
<div class="up">
<template v-if="item.fileType&&item.fileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="item.videoPath" controls="controls">
<video ref="myVideo" width="100%" height="100%" :src="item.videoPath"
controls="controls">
</video>
</template>
<template v-else>
<img :src='item.img' />
<img :src='item.img' />
</template>
</div>
<div class="down">
<h3 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h3>
<h3 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)"
style="cursor: pointer"></h3>
<div class="playInfo">
<span class="playInfo-item" v-if='item.ticketName!=""'>
<!--<i class="iconfont icon-menpiao"></i>-->
<!--{{item.ticketName}}-->
<span class="playInfo-item" v-if='item.ticketName!=""'>
</span>
<span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
<i class="iconfont icon-shijian1"></i>
......@@ -42,19 +42,19 @@
<el-row :gutter="30">
<el-col :span="8" class="restaurant-item">
<div class="key">
<img src='../../../assets/img/daily_breakfast.png' />
<img 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 src='../../../assets/img/daily_lunch.png' />
<img 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 src='../../../assets/img/daily_dinner.png' />
<img src='../../../assets/img/daily_dinner.png' />
</div>
<div class="val">{{day.can.dinner}}</div>
</el-col>
......@@ -64,11 +64,11 @@
<el-row :gutter="30">
<el-col :span="24" class="restaurant-item">
<div class="key">
<img src='../../../assets/img/daily_hotel-1.png' />
<img 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" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k">
{{k==day.jiu2.length-1?t.name:t.name+' / '}}
<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()}}
</div>
......@@ -80,32 +80,37 @@
</div>
</template>
<script>
export default {
props:{
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!='温馨的家'){
if(this.isDirect===1){
suffix = "【保证入住】"
export default {
props: {
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;
},
goUrl(url) {
if(url!=null&&url.length>0){
window.open(url, "_blank");
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
window.open(url, "_blank");
}
}
}
}
}
</script>
</script>
\ No newline at end of file
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