Skip to content

A
Athena
Commit 1f4aa46e authored by zhengke's avatar zhengke
Browse files
Options

修改

parent eb72c7a7
Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 289 deletions
src/components/global/tripMap.vue
View file @ 1f4aa46e
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
let lat = parseFloat(startArray[0]); let lat = parseFloat(startArray[0]);
let lng = parseFloat(startArray[1]); let lng = parseFloat(startArray[1]);
this.map.setCenter(new google.maps.LatLng(lat, lng)); this.map.setCenter(new google.maps.LatLng(lat, lng));
this.map.setZoom(13); this.map.setZoom(10);
//全部 //全部
if (this.type == 1) { if (this.type == 1) {
/* 循环标出所有坐标 */ /* 循环标出所有坐标 */
......
src/components/mall/newTrip.vue
View file @ 1f4aa46e
...@@ -92,12 +92,6 @@ ...@@ -92,12 +92,6 @@
max-width: 480px; max-width: 480px;
margin-left: 250px; margin-left: 250px;
} }
.swiper-slide {
position: relative;
-webkit-overflow-scrolling: touch;
}
.tripViewContainer .inner { .tripViewContainer .inner {
margin: 15px; margin: 15px;
color: #869096; color: #869096;
...@@ -167,12 +161,6 @@ ...@@ -167,12 +161,6 @@
font-size: 20px; font-size: 20px;
font-family: 'PingFangR'; font-family: 'PingFangR';
} }
.swiper-slide,
.swiperMobile .swiper-slide {
background: #fff;
}
.tripViewContainer .inner .articleCont { .tripViewContainer .inner .articleCont {
min-height: 30px; min-height: 30px;
margin-bottom: 20px; margin-bottom: 20px;
...@@ -295,11 +283,6 @@ ...@@ -295,11 +283,6 @@
top: 10px; top: 10px;
content: " "; content: " ";
} }
.swiper-slide {
margin: 30px 0;
}
.arrangements .arrangementSubContainer { .arrangements .arrangementSubContainer {
border: 1px solid #DBE0E4; border: 1px solid #DBE0E4;
border-radius: 5px; border-radius: 5px;
...@@ -910,6 +893,11 @@ ...@@ -910,6 +893,11 @@
box-sizing: border-box; box-sizing: border-box;
/* padding: 0 30px; */ /* padding: 0 30px; */
} }
.slideList{
background: #fff;
margin:30px 0;
position: relative;
}
</style> </style>
<template> <template>
<div class="pageViewTrip" v-if="isShow"> <div class="pageViewTrip" v-if="isShow">
...@@ -952,311 +940,306 @@ ...@@ -952,311 +940,306 @@
<div class="border"></div> <div class="border"></div>
</div> </div>
<div class="tripViewContainer main "> <div class="tripViewContainer main ">
<div class="swiper-container"> <div class="slideList" id="tripLine">
<div class="swiper-wrapper"> <div class="inner">
<div class="swiper-slide" id="tripLine"> <div class="slideHeader">行程路线</div>
<div class="inner"> <div>
<div class="slideHeader">行程路线</div> <div class="cityDayList clear">
<div> <div class="tripDay" v-for="(item,index) in dataList.dayList" :key="index">
<div class="cityDayList clear"> <div class="left">
<div class="tripDay" v-for="(item,index) in dataList.dayList" :key="index"> <div class="dayIndex">D{{index+1}}</div>
<div class="left"> </div>
<div class="dayIndex">D{{index+1}}</div> <div class="cities">
</div> <template v-for="suItem in item.dayArray">
<div class="cities"> <template v-if="suItem.type==1"
<template v-for="suItem in item.dayArray"> v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="suItem.type==1" <template v-if="childIndex==0">
v-for="(childItem,childIndex) in suItem.childItem.subTraffic"> <span class="city">{{childItem.startCityName}}</span>
<template v-if="childIndex==0"> <i class="iconfont icon-daoda icon"></i>
<span class="city">{{childItem.startCityName}}</span> <span class="city">{{childItem.arrivalCityName}}</span>
<i class="iconfont icon-daoda icon"></i> <i class="iconfont icon-daoda icon"></i>
<span class="city">{{childItem.arrivalCityName}}</span>
<i class="iconfont icon-daoda icon"></i>
</template>
<template v-else>
<span class="city">{{childItem.arrivalCityName}}</span>
<i class="iconfont icon-daoda icon"></i>
</template>
</template>
</template> </template>
</div> <template v-else>
</div> <span class="city">{{childItem.arrivalCityName}}</span>
<i class="iconfont icon-daoda icon"></i>
</template>
</template>
</template>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="swiper-slide" id="aboutTrip"> </div>
<div class="inner"> </div>
<div class="slideHeader">关于这次旅行</div> <div class="slideList" id="aboutTrip">
<div class="articleCont articleTxt"> <div class="inner">
<p>旅游并不一定是舟车劳顿的代名词</p> <div class="slideHeader">关于这次旅行</div>
<p>为了是挣脱都会丛林中污浊的空气</p> <div class="articleCont articleTxt">
<p>还是杂乱的交通</p> <p>旅游并不一定是舟车劳顿的代名词</p>
<p>或者是拥挤的人群</p> <p>为了是挣脱都会丛林中污浊的空气</p>
<p>寻求一丝自我的空间</p> <p>还是杂乱的交通</p>
<p>您的梦想即将实现</p> <p>或者是拥挤的人群</p>
<p>就让我们为您实现一次精彩的旅行</p> <p>寻求一丝自我的空间</p>
</div> <p>您的梦想即将实现</p>
</div> <p>就让我们为您实现一次精彩的旅行</p>
</div> </div>
<div class="swiper-slide" id="tripArrange"> </div>
<div class="inner slideQuote"> </div>
<div class="slideHeader">行程安排</div> <div class="slideList" id="tripArrange">
<div class="arrangements"> <div class="inner slideQuote">
<div class="row"> <div class="slideHeader">行程安排</div>
<div class="col-md-12 arrangementHeader"> <div class="arrangements">
<div class="arrangementSubHeader"> <div class="row">
<span class="subTitle">交通方案</span> <div class="col-md-12 arrangementHeader">
</div> <div class="arrangementSubHeader">
<span class="subTitle">交通方案</span>
</div>
</div>
<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">
<span class="dayIndex">{{item.startDate}}</span>
</div> </div>
<div class="col-md-12 col-sm-12" <div class="content">
v-if="dataList.currentPriceInfo.priceFlight&&dataList.currentPriceInfo.priceFlight!=null" <div class="name transit">{{item.flightNumber}}</div>
v-for="(item,index) in dataList.currentPriceInfo.priceFlight" :key="index"> <div class="fromTo">
<div class="arrangementSubContainer"> <div class="from">
<div class="header"> <div class="name">{{item.departureAirPortName}}</div>
<span class="dayIndex">{{item.startDate}}</span> <div class="time">出发时间 {{item.departureTime}}</div>
</div> </div>
<div class="content"> <div class="middle">
<div class="name transit">{{item.flightNumber}}</div> <div>
<div class="fromTo"> <i class="iconfont icon-daoda icon"></i>
<div class="from">
<div class="name">{{item.departureAirPortName}}</div>
<div class="time">出发时间 {{item.departureTime}}</div>
</div>
<div class="middle">
<div>
<i class="iconfont icon-daoda icon"></i>
</div>
</div>
<div class="to">
<div class="name">{{item.arrivalAirPortName}}</div>
<div class="time">到达时间 {{item.arrivalTime}}</div>
</div>
</div> </div>
</div> </div>
<div class="to">
<div class="name">{{item.arrivalAirPortName}}</div>
<div class="time">到达时间 {{item.arrivalTime}}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="arrangements"> </div>
<div class="row"> </div>
<div class="col-md-12 arrangementHeader"> <div class="arrangements">
<div class="arrangementSubHeader"> <div class="row">
<span class="subTitle">酒店安排</span> <div class="col-md-12 arrangementHeader">
</div> <div class="arrangementSubHeader">
<template v-for="(item,index) in dataList.dayList"> <span class="subTitle">酒店安排</span>
<div class="col-md-12 col-sm-12"> </div>
<div class="arrangementSubContainer"> <template v-for="(item,index) in dataList.dayList">
<div class="header hotel"> <div class="col-md-12 col-sm-12">
<span class="dayIndex">D{{item.dayNum}}</span> <div class="arrangementSubContainer">
<div class="city"> <div class="header hotel">
<span> <span class="dayIndex">D{{item.dayNum}}</span>
<template <div class="city">
v-for="(subItem,subIndex) in getHotelArray(item.dayArray)" <span>
v-if="subIndex==0"> <template
{{subItem.childItem.cityName}} v-for="(subItem,subIndex) in getHotelArray(item.dayArray)"
</template> v-if="subIndex==0">
</span> {{subItem.childItem.cityName}}
</div>
</div>
<div class="content">
<template v-for="(subItem,subIndex) in item.dayArray"
v-if="subItem.type==3">
<div class="name hotel">
<span class="left">
<i class="iconfont icon-bed"></i>
</span>
<span class="right">
<template
v-if="subItem.childItem.newHotelName!=''">{{subItem.childItem.newHotelName}}</template>
<template
v-else>{{subItem.childItem.hotelName}}</template>
</span>
</div>
</template> </template>
</div> </span>
</div> </div>
</div> </div>
</template> <div class="content">
<template v-for="(subItem,subIndex) in item.dayArray"
v-if="subItem.type==3">
<div class="name hotel">
<span class="left">
<i class="iconfont icon-bed"></i>
</span>
<span class="right">
<template
v-if="subItem.childItem.newHotelName!=''">{{subItem.childItem.newHotelName}}</template>
<template
v-else>{{subItem.childItem.hotelName}}</template>
</span>
</div>
</template>
</div>
</div>
</div> </div>
</div> </template>
</div> </div>
</div> </div>
</div> </div>
<div class="swiper-slide" v-for="(item,index) in dataList.dayList" :id="'dayList'+(index+1)" </div>
:key="index"> </div>
<div class="inner"> <div class="slideList" v-for="(item,index) in dataList.dayList" :id="'dayList'+(index+1)"
<div class="slideHeader" style="position:relative;"> :key="index">
<div class="dayNum">D{{index+1}}</div> <div class="inner">
<div class="dayNumRight"> <div class="slideHeader" style="position:relative;">
<div class="dateEleSpace"></div> <div class="dayNum">D{{index+1}}</div>
<div class="cities"> <div class="dayNumRight">
<template v-for="suItem in item.dayArray"> <div class="dateEleSpace"></div>
<template v-if="suItem.type==1" <div class="cities">
v-for="(childItem,childIndex) in suItem.childItem.subTraffic"> <template v-for="suItem in item.dayArray">
<template v-if="childIndex==0"> <template v-if="suItem.type==1"
<span class="city">{{childItem.startCityName}}</span> v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<i class="iconfont icon-daoda icon"></i> <template v-if="childIndex==0">
<span class="city">{{childItem.arrivalCityName}}</span> <span class="city">{{childItem.startCityName}}</span>
<i class="iconfont icon-daoda icon"></i> <i class="iconfont icon-daoda icon"></i>
</template> <span class="city">{{childItem.arrivalCityName}}</span>
<template v-else> <i class="iconfont icon-daoda icon"></i>
<span class="city">{{childItem.arrivalCityName}}</span>
<i class="iconfont icon-daoda icon"></i>
</template>
</template>
</template> </template>
</div> <template v-else>
</div> <span class="city">{{childItem.arrivalCityName}}</span>
</div> <i class="iconfont icon-daoda icon"></i>
<div class="articleCont articleTxt"> </template>
<p>今日推荐：</p> </template>
<template v-for="(subItem,subIndex) in item.dayArray" v-if="subItem.type==7">
<p :key="subIndex">{{subItem.childItem.title}}</p>
</template> </template>
</div> </div>
<div class="agendaSection"> </div>
<div class="slideSubHeader"> </div>
<span class="subTitle">D{{index+1}} 日程安排</span> <div class="articleCont articleTxt">
</div> <p>今日推荐：</p>
<div class="tripViewAgendaList"> <template v-for="(subItem,subIndex) in item.dayArray" v-if="subItem.type==7">
<template v-for="subItem in item.dayArray"> <p :key="subIndex">{{subItem.childItem.title}}</p>
<template v-if="subItem.type==2"> </template>
<div class="agendaBox"> </div>
<div class="indexNum numberList">{{index+1}}</div> <div class="agendaSection">
<div class="coverWrap" <div class="slideSubHeader">
:style="`background: url(${subItem.childItem.imaArray[0].url}) center`" <span class="subTitle">D{{index+1}} 日程安排</span>
@click="bigImgShow(subItem.childItem.imaArray[0].url)"> </div>
</div> <div class="tripViewAgendaList">
<div class="txtCont icon-triangle"> <template v-for="subItem in item.dayArray">
<div class="agendaPoi"> <template v-if="subItem.type==2">
<i class="iconfont icon-jingdianjingguan tour"></i> <div class="agendaBox">
<span class="title" <div class="indexNum numberList">{{index+1}}</div>
style="color:#00A4A8;">{{subItem.childItem.couponsName}}</span> <div class="coverWrap"
</div> :style="`background: url(${subItem.childItem.imaArray[0].url}) center`"
<div class="detailBox"> @click="bigImgShow(subItem.childItem.imaArray[0].url)">
<div style="border-top:0;margin:20px 0;" </div>
v-html='subItem.childItem.descriptionText'></div> <div class="txtCont icon-triangle">
</div> <div class="agendaPoi">
<div class="Divtriangle"> <i class="iconfont icon-jingdianjingguan tour"></i>
<span></span> <span class="title"
</div> style="color:#00A4A8;">{{subItem.childItem.couponsName}}</span>
<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.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template>
</span>
</div>
</div>
</div>
</div> </div>
<template v-if="subItem.childItem.trafficType==1"> <div class="detailBox">
<div class="tripAgendaTransitBox"> <div style="border-top:0;margin:20px 0;"
<div class="transitIcon"> v-html='subItem.childItem.descriptionText'></div>
<i class="iconfont icon-feiji2"></i>飞机 </div>
</div> <div class="Divtriangle">
</div> <span></span>
</template> </div>
<template v-if="subItem.childItem.trafficType==2"> <div class="detailSection" style="margin-top:0;"
<div class="tripAgendaTransitBox"> v-if="subItem.childItem.playTimeHour||subItem.childItem.playTimeMinutes">
<div class="transitIcon"> <div class="item">
<i class="iconfont icon-icon-" <span class="label">建议游玩时间</span>
style="font-size:25px;"></i>专车 <span class="text">约<template
</div> v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template><template
v-if="subItem.childItem.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template>
</span>
</div> </div>
</template> </div>
<template v-if="subItem.childItem.trafficType==3"> </div>
<div class="tripAgendaTransitBox"> </div>
<div class="btnTransit" <template v-if="subItem.childItem.trafficType==1">
@click="getSubWay(subItem.childItem.trafficImage)"> <div class="tripAgendaTransitBox">
<i class="iconfont icon-subway" <div class="transitIcon">
style="margin-right:10px;font-size:18px;"></i>查看交通详情 <i class="iconfont icon-feiji2"></i>飞机
</div> </div>
<div class="transitIcon" style="margin-left:0;"> </div>
<span>地铁</span> </template>
<template v-if="subItem.childItem.trafficType==2">
<div class="tripAgendaTransitBox">
<div class="transitIcon">
<i class="iconfont icon-icon-"
style="font-size:25px;"></i>专车
</div>
</div>
</template>
<template v-if="subItem.childItem.trafficType==3">
<div class="tripAgendaTransitBox">
<div class="btnTransit"
@click="getSubWay(subItem.childItem.trafficImage)">
<i class="iconfont icon-subway"
style="margin-right:10px;font-size:18px;"></i>查看交通详情
</div>
<div class="transitIcon" style="margin-left:0;">
<span>地铁</span>
</div>
</div>
</template>
<template v-if="subItem.childItem.trafficType==4">
<div class="tripAgendaTransitBox">
<div class="transitIcon">
<i class="iconfont icon-walking"></i>
{{subItem.childItem.trafficContent}}
</div>
</div>
</template>
</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"
@click="bigImgShow(subItem.childItem.imaArray[0].url)"
:style="`background: url(${subItem.childItem.imaArray[0].url}) center`">
</div>
<div class="txtCont icon-triangle">
<div class="agendaPoi">
<i class="iconfont icon-bed bed"></i>
<span class="title">
<template
v-if="subItem.childItem.newHotelName">{{subItem.childItem.newHotelName}}</template>
<template
v-else>{{subItem.childItem.hotelName}}</template>
</span>
</div>
<div class="detailBox">
<div class="detailSection" v-if="subItem.childItem.isShow">
<div class="item">
<span class="label">酒店星级</span>
<span class="text">
<el-rate v-model="subItem.childItem.star"
disabled></el-rate>
</span>
</div> </div>
</div> <div class="item"
</template> v-if="getService(subItem.childItem.facilityServices)!=''">
<template v-if="subItem.childItem.trafficType==4"> <span class="label">设施服务</span>
<div class="tripAgendaTransitBox"> <span
<div class="transitIcon"> class="text">{{getService(subItem.childItem.facilityServices)}}</span>
<i class="iconfont icon-walking"></i>
{{subItem.childItem.trafficContent}}
</div> </div>
</div> </div>
</template> <div class="subSection"
:class="{'hideAgendaDetails':!subItem.childItem.isShow}"
</template> v-if="subItem.childItem.hotelNewDescriptionText"
<template v-if="subItem.type==3"> v-html="subItem.childItem.hotelNewDescriptionText">
<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"
@click="bigImgShow(subItem.childItem.imaArray[0].url)"
:style="`background: url(${subItem.childItem.imaArray[0].url}) center`">
</div> </div>
<div class="txtCont icon-triangle"> <div class="detailSection" style="margin-top:0;"
<div class="agendaPoi"> v-if="subItem.childItem.isShow">
<i class="iconfont icon-bed bed"></i> <div class="item"
<span class="title"> v-if="subItem.childItem.hotelAddress!=''">
<template <span class="label">地址</span>
v-if="subItem.childItem.newHotelName">{{subItem.childItem.newHotelName}}</template> <span
<template class="text">{{subItem.childItem.hotelAddress}}</span>
v-else>{{subItem.childItem.hotelName}}</template>
</span>
</div> </div>
<div class="detailBox"> <div class="item" v-if="subItem.childItem.url!=''">
<div class="detailSection" v-if="subItem.childItem.isShow"> <span class="label">网址</span>
<div class="item"> <span class="text">{{subItem.childItem.url}}</span>
<span class="label">酒店星级</span>
<span class="text">
<el-rate v-model="subItem.childItem.star"
disabled></el-rate>
</span>
</div>
<div class="item"
v-if="getService(subItem.childItem.facilityServices)!=''">
<span class="label">设施服务</span>
<span
class="text">{{getService(subItem.childItem.facilityServices)}}</span>
</div>
</div>
<div class="subSection"
:class="{'hideAgendaDetails':!subItem.childItem.isShow}"
v-if="subItem.childItem.hotelNewDescriptionText"
v-html="subItem.childItem.hotelNewDescriptionText">
</div>
<div class="detailSection" style="margin-top:0;"
v-if="subItem.childItem.isShow">
<div class="item"
v-if="subItem.childItem.hotelAddress!=''">
<span class="label">地址</span>
<span
class="text">{{subItem.childItem.hotelAddress}}</span>
</div>
<div class="item" v-if="subItem.childItem.url!=''">
<span class="label">网址</span>
<span class="text">{{subItem.childItem.url}}</span>
</div>
</div>
<div class="showMore"
@click="getShowMore(subItem.childItem)">
{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div>
</div>
<div class="Divtriangle">
<span></span>
</div> </div>
</div> </div>
<div class="showMore"
@click="getShowMore(subItem.childItem)">{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div>
</div> </div>
</template> <div class="Divtriangle">
</template> <span></span>
</div> </div>
</div> </div>
</div>
</template>
</template>
</div> </div>
</div> </div>
</div> </div>
......
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