Skip to content

A
Athena
Commit 95de05d8 authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents da993777 db9f769d
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 31 deletions
src/components/mall/newTrip.vue
View file @ 95de05d8
...@@ -532,7 +532,7 @@ ...@@ -532,7 +532,7 @@
color: #fff; color: #fff;
position: relative; position: relative;
background-size: cover; background-size: cover;
background-position: center!important; background-position: center !important;
} }
.tripViewAgendaList .agendaBox .txtCont { .tripViewAgendaList .agendaBox .txtCont {
...@@ -1033,7 +1033,8 @@ ...@@ -1033,7 +1033,8 @@
<div class="agendaBox"> <div class="agendaBox">
<div class="indexNum numberList">{{index+1}}</div> <div class="indexNum numberList">{{index+1}}</div>
<div class="coverWrap" <div class="coverWrap"
:style="`background: url(${subItem.childItem.imaArray[0].url}) no-repeat 100% 100%`" @click="bigImgShow(subItem.childItem.imaArray[0].url)"> :style="`background: url(${subItem.childItem.imaArray[0].url}) no-repeat 100% 100%`"
@click="bigImgShow(subItem.childItem.imaArray[0].url)">
</div> </div>
<div class="txtCont icon-triangle"> <div class="txtCont icon-triangle">
<div class="agendaPoi"> <div class="agendaPoi">
...@@ -1051,7 +1052,9 @@ ...@@ -1051,7 +1052,9 @@
v-if="subItem.childItem.playTimeHour||subItem.childItem.playTimeMinutes"> v-if="subItem.childItem.playTimeHour||subItem.childItem.playTimeMinutes">
<div class="item"> <div class="item">
<span class="label">建议游玩时间</span> <span class="label">建议游玩时间</span>
<span class="text">约<template v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template><template v-if="subItem.childItem.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template> <span class="text">约<template
v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template><template
v-if="subItem.childItem.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template>
</span> </span>
</div> </div>
</div> </div>
...@@ -1063,7 +1066,8 @@ ...@@ -1063,7 +1066,8 @@
<div class="indexNum tos-icon hotelPre "> <div class="indexNum tos-icon hotelPre ">
<i class="iconfont icon-moono"></i> <i class="iconfont icon-moono"></i>
</div> </div>
<div class="coverWrap" v-if="subItem.childItem.imaArray.length>0" @click="bigImgShow(subItem.childItem.imaArray[0].url)" <div class="coverWrap" v-if="subItem.childItem.imaArray.length>0"
@click="bigImgShow(subItem.childItem.imaArray[0].url)"
:style="`background: url(${subItem.childItem.imaArray[0].url}) no-repeat 100% 100%`"> :style="`background: url(${subItem.childItem.imaArray[0].url}) no-repeat 100% 100%`">
</div> </div>
<div class="txtCont icon-triangle" <div class="txtCont icon-triangle"
...@@ -1071,8 +1075,10 @@ ...@@ -1071,8 +1075,10 @@
<div class="agendaPoi"> <div class="agendaPoi">
<i class="iconfont icon-bed bed"></i> <i class="iconfont icon-bed bed"></i>
<span class="title"> <span class="title">
<template v-if="subItem.childItem.newHotelName">{{subItem.childItem.newHotelName}}</template> <template
<template v-else>{{subItem.childItem.hotelName}}</template> v-if="subItem.childItem.newHotelName">{{subItem.childItem.newHotelName}}</template>
<template
v-else>{{subItem.childItem.hotelName}}</template>
</span> </span>
</div> </div>
<div class="detailBox"> <div class="detailBox">
...@@ -1091,9 +1097,12 @@ ...@@ -1091,9 +1097,12 @@
</div> </div>
</div> </div>
<div class="subSection" <div class="subSection"
v-if="subItem.childItem.hotelNewDescriptionText" v-html="subItem.childItem.hotelNewDescriptionText"></div> v-if="subItem.childItem.hotelNewDescriptionText"
v-html="subItem.childItem.hotelNewDescriptionText">
</div>
<div class="detailSection" style="margin-top:0;"> <div class="detailSection" style="margin-top:0;">
<div class="item" v-if="subItem.childItem.hotelAddress!=''"> <div class="item"
v-if="subItem.childItem.hotelAddress!=''">
<span class="label">地址</span> <span class="label">地址</span>
<span <span
class="text">{{subItem.childItem.hotelAddress}}</span> class="text">{{subItem.childItem.hotelAddress}}</span>
...@@ -1122,7 +1131,8 @@ ...@@ -1122,7 +1131,8 @@
<tripMap :locationArray="travelLngLat" :type="1" ref="tripMap"></tripMap> <tripMap :locationArray="travelLngLat" :type="1" ref="tripMap"></tripMap>
</div> </div>
</div> </div>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer"> <viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer"
ref="viewer">
<img v-for="(item,index) in images" :src="item" :key="index+8000" class="12312312"> <img v-for="(item,index) in images" :src="item" :key="index+8000" class="12312312">
</viewer> </viewer>
</div> </div>
...@@ -1146,9 +1156,9 @@ ...@@ -1146,9 +1156,9 @@
isShow: false, isShow: false,
dataindex: 0, dataindex: 0,
images: [], images: [],
imageOptions:{ imageOptions: {
navbar:false, navbar: false,
title:false title: false
}, },
} }
...@@ -1182,7 +1192,7 @@ ...@@ -1182,7 +1192,7 @@
}, },
bigImgShow(url) { bigImgShow(url) {
let index = this.images.indexOf(url); let index = this.images.indexOf(url);
if(this.images.length>0){ if (this.images.length > 0) {
this.$viewer.view(index) this.$viewer.view(index)
this.$viewer.show(); this.$viewer.show();
} }
...@@ -1196,11 +1206,11 @@ ...@@ -1196,11 +1206,11 @@
this.isShow = true; this.isShow = true;
this.getAllPoint(); this.getAllPoint();
//装载景点酒店图片以供预览 //装载景点酒店图片以供预览
this.images=[]; this.images = [];
this.dataList.dayList.forEach(x=>{ this.dataList.dayList.forEach(x => {
x.dayArray.forEach(y=>{ x.dayArray.forEach(y => {
if(y.type==2||y.type==3){ if (y.type == 2 || y.type == 3) {
if(y.childItem.imaArray.length>0){ if (y.childItem.imaArray.length > 0) {
this.images.push(y.childItem.imaArray[0].url); this.images.push(y.childItem.imaArray[0].url);
} }
} }
...@@ -1265,6 +1275,10 @@ ...@@ -1265,6 +1275,10 @@
getDayPoint(dayNum) { getDayPoint(dayNum) {
let Arr = []; let Arr = [];
if (this.dataList && this.dataList.dayList && this.dataList.dayList.length > 0) { if (this.dataList && this.dataList.dayList && this.dataList.dayList.length > 0) {
var startTrafficArray = [];
var arrivalTrafficArray = [];
var hotelArray = [];
var scenicArray = [];
this.dataList.dayList.forEach(item => { this.dataList.dayList.forEach(item => {
if (item.dayNum == dayNum) { if (item.dayNum == dayNum) {
item.dayArray.forEach(x => { item.dayArray.forEach(x => {
...@@ -1282,8 +1296,8 @@ ...@@ -1282,8 +1296,8 @@
name: z.arrivalCityName, name: z.arrivalCityName,
type: 1 type: 1
} }
Arr.push(obj1); startTrafficArray.push(obj1);
Arr.push(obj2); arrivalTrafficArray.push(obj2);
}) })
} }
//放入景点 //放入景点
...@@ -1297,7 +1311,7 @@ ...@@ -1297,7 +1311,7 @@
name: x.childItem.couponsName, name: x.childItem.couponsName,
type: 2 type: 2
} }
Arr.push(obj3); scenicArray.push(obj3);
} }
} }
//放入住宿 //放入住宿
...@@ -1305,22 +1319,34 @@ ...@@ -1305,22 +1319,34 @@
let obj4 = { let obj4 = {
lat: x.childItem.pointArray[1], lat: x.childItem.pointArray[1],
lng: x.childItem.pointArray[0], lng: x.childItem.pointArray[0],
name:'', name: '',
type: 3 type: 3
} }
if(x.childItem.newHotelName&&x.childItem.newHotelName!='') if (x.childItem.newHotelName && x.childItem.newHotelName != '') {
{ obj4.name = x.childItem.newHotelName;
obj4.name= x.childItem.newHotelName; } else {
} obj4.name = x.childItem.hotelName;
else
{
obj4.name= x.childItem.hotelName;
} }
Arr.push(obj4); hotelArray.push(obj4);
} }
}) })
} }
}) })
if (startTrafficArray && startTrafficArray.length > 0) {
Arr.push(...startTrafficArray)
}
if (dayNum == 1) {
if (arrivalTrafficArray && arrivalTrafficArray.length > 0) {
Arr.push(...arrivalTrafficArray)
}
}
if (scenicArray && scenicArray.length > 0) {
Arr.push(...scenicArray)
}
if (hotelArray && hotelArray.length > 0) {
Arr.push(...hotelArray)
}
console.log('day加载' + dayNum, Arr); console.log('day加载' + dayNum, Arr);
this.travelLngLat = Arr; this.travelLngLat = Arr;
} }
......
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