Skip to content

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

页面修改

parent 7615a005
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 110 deletions
src/components/global/tripMap.vue
View file @ d67be0df
......@@ -40,7 +40,6 @@
},
mounted() {
console.log(this.dataList, 'datalist组件');
this.mapBuild() //初始化实例之后调用
},
methods: {
......@@ -73,8 +72,6 @@
if (this.dataList && this.dataList.length > 0) {
let lat = parseFloat(this.dataList[0].lat)
let lng = parseFloat(this.dataList[0].lng)
// let lat = parseFloat(this.dataList[0].lat)
// let lng = parseFloat(this.dataList[0].lng)
let center = {
lng: lng,
lat: lat
......
src/components/mall/newTrip.vue
View file @ d67be0df
......@@ -830,10 +830,12 @@
<div class="border"></div>
</div>
<ul>
<li v-for="(item,index) in dataList.dayList" :key="index" :class="crtnav=='dayList'+(index+1)?'active':''" @click="goScroll('dayList'+(index+1),index)">
<li v-for="(item,index) in dataList.dayList" :key="index"
:class="crtnav=='dayList'+(index+1)?'active':''" @click="goScroll('dayList'+(index+1),index)">
<span class="dayIndex">D{{index+1}}</span>
<template v-for="(suItem,subIndex) in item.dayArray">
<template v-if="suItem.type==1" v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="suItem.type==1"
v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="childIndex==0">
<span class="city">{{childItem.startCityName}}</span>
<i>-</i>
......@@ -864,7 +866,8 @@
</div>
<div class="cities">
<template v-for="suItem in item.dayArray">
<template v-if="suItem.type==1" v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="suItem.type==1"
v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="childIndex==0">
<span class="city">{{childItem.startCityName}}</span>
<i class="iconfont icon-daoda icon"></i>
......@@ -907,7 +910,8 @@
<span class="subTitle">交通方案</span>
</div>
</div>
<div class="col-md-12 col-sm-12" v-if="dataList.currentPriceInfo.priceFlight&&dataList.currentPriceInfo.priceFlight!=null"
<div class="col-md-12 col-sm-12"
v-if="dataList.currentPriceInfo.priceFlight&&dataList.currentPriceInfo.priceFlight!=null"
v-for="(item,index) in dataList.currentPriceInfo.priceFlight" :key="index">
<div class="arrangementSubContainer">
<div class="header">
......@@ -942,7 +946,8 @@
<span class="subTitle">酒店安排</span>
</div>
<template v-for="(item,index) in dataList.dayList">
<template v-for="(subItem,subIndex) in item.dayArray" v-if="subItem.type==3">
<template v-for="(subItem,subIndex) in item.dayArray"
v-if="subItem.type==3">
<div class="col-md-12 col-sm-12">
<div class="arrangementSubContainer">
<div class="header hotel">
......@@ -956,7 +961,8 @@
<span class="left">
<i class="iconfont icon-bed"></i>
</span>
<span class="right">{{subItem.childItem.newHotelName}}</span>
<span
class="right">{{subItem.childItem.newHotelName}}</span>
</div>
</div>
</div>
......@@ -968,7 +974,8 @@
</div>
</div>
</div>
<div class="swiper-slide" v-for="(item,index) in dataList.dayList" :id="'dayList'+(index+1)" :key="index">
<div class="swiper-slide" v-for="(item,index) in dataList.dayList" :id="'dayList'+(index+1)"
:key="index">
<div class="inner">
<div class="slideHeader" style="position:relative;">
<div class="dayNum">D{{index+1}}</div>
......@@ -976,7 +983,8 @@
<div class="dateEleSpace"></div>
<div class="cities">
<template v-for="suItem in item.dayArray">
<template v-if="suItem.type==1" v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="suItem.type==1"
v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="childIndex==0">
<span class="city">{{childItem.startCityName}}</span>
<i class="iconfont icon-daoda icon"></i>
......@@ -1007,84 +1015,96 @@
<template v-if="subItem.type==2">
<div class="agendaBox">
<div class="indexNum numberList">{{index+1}}</div>
<div class="coverWrap" :style="`background: url(${subItem.childItem.imaArray[0].url}) no-repeat 100% 100%`">
<div class="coverWrap"
:style="`background: url(${subItem.childItem.imaArray[0].url}) no-repeat 100% 100%`">
</div>
<div class="txtCont icon-triangle">
<div class="detailBox">
<div style="border-top:0;margin:20px 0;" v-html='subItem.childItem.descriptionText'></div>
<div style="border-top:0;margin:20px 0;"
v-html='subItem.childItem.descriptionText'></div>
</div>
<div class="Divtriangle">
<span></span>
</div>
<div class="detailSection" style="margin-top:0;" v-if="subItem.childItem.playTimeHour||subItem.childItem.playTimeMinutes">
<div class="detailSection" style="margin-top:0;"
v-if="subItem.childItem.playTimeHour||subItem.childItem.playTimeMinutes">
<div class="item">
<span class="label">建议游玩时间</span>
<span class="text">约
<template v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template>
<template
v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template>
<template
v-if="subItem.childItem.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template>
</span>
</div>
</div>
</div>
</div>
</template>
<template v-if="subItem.type==3">
<div class="agendaBox">
<div class="indexNum tos-icon hotelPre ">
<i class="iconfont icon-moono"></i>
</div>
<div class="coverWrap" v-if="subItem.childItem.imaArray.length>0" :style="`background: url(${subItem.childItem.imaArray[0].url}) no-repeat 100% 100%`">
</div>
<div class="txtCont icon-triangle" v-if="subItem.childItem.imaArray.length>0">
<div class="agendaPoi">
<i class="iconfont icon-bed bed"></i>
<span class="title">{{subItem.childItem.newHotelName}}</span>
</div>
<div class="detailBox">
<div class="detailSection">
<div class="item">
<span class="label">酒店星级</span>
<span class="text">
<el-rate v-model="subItem.childItem.star" disabled></el-rate>
</span>
</div>
<div class="item">
<span class="label">设施服务</span>
<span class="text">{{getService(subItem.childItem.facilityServices)}}</span>
</div>
</div>
<div class="subSection" v-if="subItem.childItem.hotelNewDescriptionText">{{subItem.childItem.hotelNewDescriptionText}}</div>
<div class="detailSection" style="margin-top:0;">
<div class="item">
<span class="label">地址</span>
<span class="text">{{subItem.childItem.hotelAddress}}</span>
</div>
</div>
</template>
<template v-if="subItem.type==3">
<div class="agendaBox">
<div class="indexNum tos-icon hotelPre ">
<i class="iconfont icon-moono"></i>
</div>
<div class="coverWrap" v-if="subItem.childItem.imaArray.length>0"
:style="`background: url(${subItem.childItem.imaArray[0].url}) no-repeat 100% 100%`">
</div>
<div class="txtCont icon-triangle"
v-if="subItem.childItem.imaArray.length>0">
<div class="agendaPoi">
<i class="iconfont icon-bed bed"></i>
<span
class="title">{{subItem.childItem.newHotelName}}</span>
</div>
<div class="detailBox">
<div class="detailSection">
<div class="item">
<span class="label">酒店星级</span>
<span class="text">
<el-rate v-model="subItem.childItem.star"
disabled></el-rate>
</span>
</div>
<div class="item">
<span class="label">设施服务</span>
<span
class="text">{{getService(subItem.childItem.facilityServices)}}</span>
</div>
</div>
<div class="item">
<span class="label">网址</span>
<span class="text">{{subItem.childItem.url}}</span>
<div class="subSection"
v-if="subItem.childItem.hotelNewDescriptionText">
{{subItem.childItem.hotelNewDescriptionText}}</div>
<div class="detailSection" style="margin-top:0;">
<div class="item">
<span class="label">地址</span>
<span
class="text">{{subItem.childItem.hotelAddress}}</span>
</div>
<div class="item">
<span class="label">网址</span>
<span class="text">{{subItem.childItem.url}}</span>
</div>
</div>
</div>
</div>
<div class="Divtriangle">
<span></span>
<div class="Divtriangle">
<span></span>
</div>
</div>
</div>
</div>
</template>
</template>
</template>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="viewTripMap">
<tripMap :dataList="travelLngLat" :type="1" ref="tripMap"></tripMap>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="viewTripMap">
<tripMap :dataList="travelLngLat" :type="1" ref="tripMap"></tripMap>
</div>
</div>
</div>
</template>
<script>
import tripMap from '../global/tripMap'
......@@ -1109,7 +1129,6 @@
mounted() {
this.msg.ID = this.$route.query.ID;
this.msg.tcid = this.$route.query.tcid;
this.crtnav = 'tripLine';
this.scrollobj = document.getElementsByClassName('el-scrollbar__wrap')[0];
this.scrollobj.addEventListener('scroll', this.handleScroll);
......@@ -1130,19 +1149,15 @@
}
}
},
methods: {
//加载数据
getTrip() {
this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
console.log(" this.dataList ", this.dataList);
console.log("this.dataList", this.dataList);
this.isShow = true;
this.getAllPoint();
// this.$refs.tripMap.mapBuild();
} else {
this.Error(res.data.message)
}
......@@ -1166,14 +1181,13 @@
this.getDayPoint(index);
this.$refs.tripMap.mapBuild();
}
this.crtnav = id;
this.scrollobj.scrollTop = document.getElementById(id).offsetTop;
},
//加载所有坐标点
getAllPoint() {
let Arr = [];
if (this.dataList && this.dataList.length > 0) {
if (this.dataList && this.dataList.dayList && this.dataList.dayList.length > 0) {
this.dataList.dayList.forEach(x => {
x.dayArray.forEach(y => {
if (y.type == 1) {
......@@ -1195,39 +1209,38 @@
})
}
})
})
});
this.travelLngLat = Arr;
}
console.log(Arr, 'Arrrr');
this.travelLngLat = Arr;
},
//加载当日坐标点
getDayPoint(index) {
let Arr = [];
this.dataList.dayList[index].dayArray.forEach(x => {
if (x.type == 1) {
x.childItem.subTraffic.forEach(z => {
let obj1 = {
lat: z.startCityPoint[1],
lng: z.startCityPoint[0],
name: z.arrivalCityName,
type: 1
}
let obj2 = {
lat: z.arrivalCityPoint[1],
lng: z.arrivalCityPoint[0],
name: z.startCityName,
type: 1
}
Arr.push(obj1);
Arr.push(obj2);
})
}
})
console.log(Arr, 'day加载');
this.travelLngLat = Arr;
if (this.dataList && this.dataList.dayList && this.dataList.dayList.length > 0) {
this.dataList.dayList[index].dayArray.forEach(x => {
if (x.type == 1) {
x.childItem.subTraffic.forEach(z => {
let obj1 = {
lat: z.startCityPoint[1],
lng: z.startCityPoint[0],
name: z.arrivalCityName,
type: 1
}
let obj2 = {
lat: z.arrivalCityPoint[1],
lng: z.arrivalCityPoint[0],
name: z.startCityName,
type: 1
}
Arr.push(obj1);
Arr.push(obj2);
})
}
})
console.log('day加载' + index, Arr);
this.travelLngLat = Arr;
}
},
//滚动选中
handleScroll() {
try {
......@@ -1243,18 +1256,12 @@
}
})
this.crtnav = current
// if(current=='tripLine'||current=='aboutTrip'||current=='tripArrange'){
// this.getAllPoint();
// }
if (current.indexOf("dayList") != -1) {
let index = current.split('dayList')[1];
this.dataindex = index;
}
} catch (error) {
}
} catch (error) {}
},
}
}
</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