Skip to content

A
Athena
Commit 4b892322 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 87ce810a
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 107 deletions
src/components/mall/newTrip.vue
View file @ 4b892322
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
max-width: 480px; max-width: 480px;
margin-left: 250px; margin-left: 250px;
} }
.tripViewContainer .inner { .tripViewContainer .inner {
margin: 15px; margin: 15px;
color: #869096; color: #869096;
...@@ -161,6 +162,7 @@ ...@@ -161,6 +162,7 @@
font-size: 20px; font-size: 20px;
font-family: 'PingFangR'; font-family: 'PingFangR';
} }
.tripViewContainer .inner .articleCont { .tripViewContainer .inner .articleCont {
min-height: 30px; min-height: 30px;
margin-bottom: 20px; margin-bottom: 20px;
...@@ -283,6 +285,7 @@ ...@@ -283,6 +285,7 @@
top: 10px; top: 10px;
content: " "; content: " ";
} }
.arrangements .arrangementSubContainer { .arrangements .arrangementSubContainer {
border: 1px solid #DBE0E4; border: 1px solid #DBE0E4;
border-radius: 5px; border-radius: 5px;
...@@ -893,9 +896,10 @@ ...@@ -893,9 +896,10 @@
box-sizing: border-box; box-sizing: border-box;
/* padding: 0 30px; */ /* padding: 0 30px; */
} }
.slideList{
.slideList {
background: #fff; background: #fff;
margin:30px 0; margin: 30px 0;
position: relative; position: relative;
} }
</style> </style>
...@@ -904,6 +908,7 @@ ...@@ -904,6 +908,7 @@
<div class="tripContWrap"> <div class="tripContWrap">
<div class="sideBar mobileHide"> <div class="sideBar mobileHide">
<div class="sideBarBtns sideTop"> <div class="sideBarBtns sideTop">
<input type="button" @click="downLoadTrip()" value="下载" style="display:none;" />
<div :class="crtnav=='tripLine'?'active':''" class="btnPage" @click="goScroll('tripLine','')"> <div :class="crtnav=='tripLine'?'active':''" class="btnPage" @click="goScroll('tripLine','')">
<i class="iconfont icon-huozhuduanchaxunxianlu"></i>行程线路 <i class="iconfont icon-huozhuduanchaxunxianlu"></i>行程线路
</div> </div>
...@@ -916,13 +921,10 @@ ...@@ -916,13 +921,10 @@
<div class="border"></div> <div class="border"></div>
</div> </div>
<ul> <ul>
<li v-for="(item,index) in dataList.dayList" :key="index" <li v-for="(item,index) in dataList.dayList" :key="index" :class="crtnav=='dayList'+(item.dayNum)?'active':''" @click="goScroll('dayList'+(item.dayNum),item.dayNum)">
:class="crtnav=='dayList'+(item.dayNum)?'active':''"
@click="goScroll('dayList'+(item.dayNum),item.dayNum)">
<span class="dayIndex">D{{index+1}}</span> <span class="dayIndex">D{{index+1}}</span>
<template v-for="(suItem,subIndex) in item.dayArray"> <template v-for="(suItem,subIndex) in item.dayArray">
<template v-if="suItem.type==1" <template v-if="suItem.type==1" v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="childIndex==0"> <template v-if="childIndex==0">
<span class="city">{{childItem.startCityName}}</span> <span class="city">{{childItem.startCityName}}</span>
<i>-</i> <i>-</i>
...@@ -951,8 +953,7 @@ ...@@ -951,8 +953,7 @@
</div> </div>
<div class="cities"> <div class="cities">
<template v-for="suItem in item.dayArray"> <template v-for="suItem in item.dayArray">
<template v-if="suItem.type==1" <template v-if="suItem.type==1" v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="childIndex==0"> <template v-if="childIndex==0">
<span class="city">{{childItem.startCityName}}</span> <span class="city">{{childItem.startCityName}}</span>
<i class="iconfont icon-daoda icon"></i> <i class="iconfont icon-daoda icon"></i>
...@@ -995,32 +996,31 @@ ...@@ -995,32 +996,31 @@
<span class="subTitle">交通方案</span> <span class="subTitle">交通方案</span>
</div> </div>
</div> </div>
<div class="col-md-12 col-sm-12" <div class="col-md-12 col-sm-12" v-if="dataList.currentPriceInfo&&dataList.currentPriceInfo.priceFlight&&dataList.currentPriceInfo.priceFlight.length>0">
v-if="dataList.currentPriceInfo&&dataList.currentPriceInfo.priceFlight&&dataList.currentPriceInfo.priceFlight.length>0"> <template v-for="(item,index) in dataList.currentPriceInfo.priceFlight">
<template v-for="(item,index) in dataList.currentPriceInfo.priceFlight" > <div class="arrangementSubContainer" :key="index">
<div class="arrangementSubContainer" :key="index"> <div class="header">
<div class="header"> <span class="dayIndex">{{item.startDate}}</span>
<span class="dayIndex">{{item.startDate}}</span> </div>
</div> <div class="content">
<div class="content"> <div class="name transit">{{item.flightNumber}}</div>
<div class="name transit">{{item.flightNumber}}</div> <div class="fromTo">
<div class="fromTo"> <div class="from">
<div class="from"> <div class="name">{{item.departureAirPortName}}</div>
<div class="name">{{item.departureAirPortName}}</div> <div class="time">出发时间 {{item.departureTime}}</div>
<div class="time">出发时间 {{item.departureTime}}</div> </div>
</div> <div class="middle">
<div class="middle"> <div>
<div> <i class="iconfont icon-daoda icon"></i>
<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 class="to">
<div class="name">{{item.arrivalAirPortName}}</div>
<div class="time">到达时间 {{item.arrivalTime}}</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
</div> </div>
</div> </div>
...@@ -1038,26 +1038,21 @@ ...@@ -1038,26 +1038,21 @@
<span class="dayIndex">D{{item.dayNum}}</span> <span class="dayIndex">D{{item.dayNum}}</span>
<div class="city"> <div class="city">
<span> <span>
<template <template v-for="(subItem,subIndex) in getHotelArray(item.dayArray)" v-if="subIndex==0">
v-for="(subItem,subIndex) in getHotelArray(item.dayArray)"
v-if="subIndex==0">
{{subItem.childItem.cityName}} {{subItem.childItem.cityName}}
</template> </template>
</span> </span>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<template v-for="(subItem,subIndex) in item.dayArray" <template v-for="(subItem,subIndex) in item.dayArray" v-if="subItem.type==3">
v-if="subItem.type==3">
<div class="name hotel"> <div class="name hotel">
<span class="left"> <span class="left">
<i class="iconfont icon-bed"></i> <i class="iconfont icon-bed"></i>
</span> </span>
<span class="right"> <span class="right">
<template <template v-if="subItem.childItem.newHotelName!=''">{{subItem.childItem.newHotelName}}</template>
v-if="subItem.childItem.newHotelName!=''">{{subItem.childItem.newHotelName}}</template> <template v-else>{{subItem.childItem.hotelName}}</template>
<template
v-else>{{subItem.childItem.hotelName}}</template>
</span> </span>
</div> </div>
</template> </template>
...@@ -1071,8 +1066,7 @@ ...@@ -1071,8 +1066,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="slideList" v-for="(item,index) in dataList.dayList" :id="'dayList'+(index+1)" <div class="slideList" v-for="(item,index) in dataList.dayList" :id="'dayList'+(index+1)" :key="index">
:key="index">
<div class="inner"> <div class="inner">
<div class="slideHeader" style="position:relative;"> <div class="slideHeader" style="position:relative;">
<div class="dayNum">D{{index+1}}</div> <div class="dayNum">D{{index+1}}</div>
...@@ -1080,8 +1074,7 @@ ...@@ -1080,8 +1074,7 @@
<div class="dateEleSpace"></div> <div class="dateEleSpace"></div>
<div class="cities"> <div class="cities">
<template v-for="suItem in item.dayArray"> <template v-for="suItem in item.dayArray">
<template v-if="suItem.type==1" <template v-if="suItem.type==1" v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
v-for="(childItem,childIndex) in suItem.childItem.subTraffic">
<template v-if="childIndex==0"> <template v-if="childIndex==0">
<span class="city">{{childItem.startCityName}}</span> <span class="city">{{childItem.startCityName}}</span>
<i class="iconfont icon-daoda icon"></i> <i class="iconfont icon-daoda icon"></i>
...@@ -1116,30 +1109,25 @@ ...@@ -1116,30 +1109,25 @@
<template v-if="subItem.type==2"> <template v-if="subItem.type==2">
<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}) center`" @click="bigImgShow(subItem.childItem.imaArray[0].url)">
:style="`background: url(${subItem.childItem.imaArray[0].url}) center`"
@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">
<i class="iconfont icon-jingdianjingguan tour"></i> <i class="iconfont icon-jingdianjingguan tour"></i>
<span class="title" <span class="title" style="color:#00A4A8;">{{subItem.childItem.couponsName}}</span>
style="color:#00A4A8;">{{subItem.childItem.couponsName}}</span>
</div> </div>
<div class="detailBox"> <div class="detailBox">
<div style="border-top:0;margin:20px 0;" <div style="border-top:0;margin:20px 0;" v-html='subItem.childItem.descriptionText'></div>
v-html='subItem.childItem.descriptionText'></div>
</div> </div>
<div class="Divtriangle"> <div class="Divtriangle">
<span></span> <span></span>
</div> </div>
<div class="detailSection" style="margin-top:0;" <div class="detailSection" style="margin-top:0;" 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 <span class="text">约
v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template><template <template v-if="subItem.childItem.playTimeHour">{{subItem.childItem.playTimeHour}}小时</template>
v-if="subItem.childItem.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template> <template v-if="subItem.childItem.playTimeMinutes">{{subItem.childItem.playTimeMinutes}}分钟</template>
</span> </span>
</div> </div>
</div> </div>
...@@ -1155,17 +1143,14 @@ ...@@ -1155,17 +1143,14 @@
<template v-if="subItem.childItem.trafficType==2"> <template v-if="subItem.childItem.trafficType==2">
<div class="tripAgendaTransitBox"> <div class="tripAgendaTransitBox">
<div class="transitIcon"> <div class="transitIcon">
<i class="iconfont icon-icon-" <i class="iconfont icon-icon-" style="font-size:25px;"></i>专车
style="font-size:25px;"></i>专车
</div> </div>
</div> </div>
</template> </template>
<template v-if="subItem.childItem.trafficType==3"> <template v-if="subItem.childItem.trafficType==3">
<div class="tripAgendaTransitBox"> <div class="tripAgendaTransitBox">
<div class="btnTransit" <div class="btnTransit" @click="getSubWay(subItem.childItem.trafficImage)">
@click="getSubWay(subItem.childItem.trafficImage)"> <i class="iconfont icon-subway" style="margin-right:10px;font-size:18px;"></i>查看交通详情
<i class="iconfont icon-subway"
style="margin-right:10px;font-size:18px;"></i>查看交通详情
</div> </div>
<div class="transitIcon" style="margin-left:0;"> <div class="transitIcon" style="margin-left:0;">
<span>地铁</span> <span>地铁</span>
...@@ -1187,18 +1172,15 @@ ...@@ -1187,18 +1172,15 @@
<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" <div class="coverWrap" v-if="subItem.childItem.imaArray.length>0" @click="bigImgShow(subItem.childItem.imaArray[0].url)"
@click="bigImgShow(subItem.childItem.imaArray[0].url)"
:style="`background: url(${subItem.childItem.imaArray[0].url}) center`"> :style="`background: url(${subItem.childItem.imaArray[0].url}) center`">
</div> </div>
<div class="txtCont icon-triangle"> <div class="txtCont icon-triangle">
<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 <template v-if="subItem.childItem.newHotelName">{{subItem.childItem.newHotelName}}</template>
v-if="subItem.childItem.newHotelName">{{subItem.childItem.newHotelName}}</template> <template v-else>{{subItem.childItem.hotelName}}</template>
<template
v-else>{{subItem.childItem.hotelName}}</template>
</span> </span>
</div> </div>
<div class="detailBox"> <div class="detailBox">
...@@ -1206,37 +1188,28 @@ ...@@ -1206,37 +1188,28 @@
<div class="item"> <div class="item">
<span class="label">酒店星级</span> <span class="label">酒店星级</span>
<span class="text"> <span class="text">
<el-rate v-model="subItem.childItem.star" <el-rate v-model="subItem.childItem.star" disabled></el-rate>
disabled></el-rate>
</span> </span>
</div> </div>
<div class="item" <div class="item" v-if="getService(subItem.childItem.facilityServices)!=''">
v-if="getService(subItem.childItem.facilityServices)!=''">
<span class="label">设施服务</span> <span class="label">设施服务</span>
<span <span class="text">{{getService(subItem.childItem.facilityServices)}}</span>
class="text">{{getService(subItem.childItem.facilityServices)}}</span>
</div> </div>
</div> </div>
<div class="subSection" <div class="subSection" :class="{'hideAgendaDetails':!subItem.childItem.isShow}" v-if="subItem.childItem.hotelNewDescriptionText"
:class="{'hideAgendaDetails':!subItem.childItem.isShow}"
v-if="subItem.childItem.hotelNewDescriptionText"
v-html="subItem.childItem.hotelNewDescriptionText"> v-html="subItem.childItem.hotelNewDescriptionText">
</div> </div>
<div class="detailSection" style="margin-top:0;" <div class="detailSection" style="margin-top:0;" v-if="subItem.childItem.isShow">
v-if="subItem.childItem.isShow"> <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>
</div> </div>
<div class="item" v-if="subItem.childItem.url!=''"> <div class="item" v-if="subItem.childItem.url!=''">
<span class="label">网址</span> <span class="label">网址</span>
<span class="text">{{subItem.childItem.url}}</span> <span class="text">{{subItem.childItem.url}}</span>
</div> </div>
</div> </div>
<div class="showMore" <div class="showMore" @click="getShowMore(subItem.childItem)">{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div>
@click="getShowMore(subItem.childItem)">{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div>
</div> </div>
<div class="Divtriangle"> <div class="Divtriangle">
<span></span> <span></span>
...@@ -1264,8 +1237,7 @@ ...@@ -1264,8 +1237,7 @@
</div> </div>
</div> </div>
</div> </div>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" <viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="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>
...@@ -1275,7 +1247,7 @@ ...@@ -1275,7 +1247,7 @@
export default { export default {
data() { data() {
return { return {
loading:false, loading: false,
defaultImg: 'this.src="' + require('../../assets/img/newtrip/hotel.jpg') + '"', defaultImg: 'this.src="' + require('../../assets/img/newtrip/hotel.jpg') + '"',
travelLngLat: [], travelLngLat: [],
showType: 1, //显示类型(1-所有的，2-每天的) showType: 1, //显示类型(1-所有的，2-每天的)
...@@ -1310,15 +1282,16 @@ ...@@ -1310,15 +1282,16 @@
let userAgentInfo = navigator.userAgent; let userAgentInfo = navigator.userAgent;
let Agents = ["Android", "iPhone", let Agents = ["Android", "iPhone",
"SymbianOS", "Windows Phone", "SymbianOS", "Windows Phone",
"iPad", "iPod"]; "iPad", "iPod"
];
for (let v = 0; v < Agents.length; v++) { for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) { if (userAgentInfo.indexOf(Agents[v]) > 0) {
this.$router.push({ this.$router.push({
name:'tripMobile', name: 'tripMobile',
query: { query: {
ID : decodeURIComponent(this.msg.ID), ID: decodeURIComponent(this.msg.ID),
tcid : decodeURIComponent(this.msg.tcid), tcid: decodeURIComponent(this.msg.tcid),
} }
}); });
} }
...@@ -1353,18 +1326,18 @@ ...@@ -1353,18 +1326,18 @@
}, },
//加载数据 //加载数据
getTrip() { getTrip() {
this.loading=true; this.loading = true;
this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, res => { this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, res => {
this.loading=false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
if(res.data.data.currentPriceInfo&&res.data.data.currentPriceInfo.priceFlight){ if (res.data.data.currentPriceInfo && res.data.data.currentPriceInfo.priceFlight) {
this.FlightList = res.data.data.currentPriceInfo.priceFlight; this.FlightList = res.data.data.currentPriceInfo.priceFlight;
} }
if(res.data.data.currentPriceInfo&&res.data.data.currentPriceInfo.startDate){ if (res.data.data.currentPriceInfo && res.data.data.currentPriceInfo.startDate) {
this.StartData = res.data.data.currentPriceInfo.startDate; this.StartData = res.data.data.currentPriceInfo.startDate;
} }
this.isShow = true; this.isShow = true;
this.getAllPoint(); this.getAllPoint();
//装载景点酒店图片以供预览 //装载景点酒店图片以供预览
...@@ -1683,7 +1656,7 @@ ...@@ -1683,7 +1656,7 @@
} }
} catch (error) {} } catch (error) {}
//滚动条到底了 //滚动条到底了
if(this.scrollobj.scrollHeight-this.scrollobj.scrollTop==this.scrollobj.clientHeight){ if (this.scrollobj.scrollHeight - this.scrollobj.scrollTop == this.scrollobj.clientHeight) {
var lastChecked = navs.pop(); var lastChecked = navs.pop();
if (lastChecked.indexOf("dayList") != -1) { if (lastChecked.indexOf("dayList") != -1) {
this.crtnav = lastChecked; this.crtnav = lastChecked;
...@@ -1699,6 +1672,41 @@ ...@@ -1699,6 +1672,41 @@
getSubWay(url) { getSubWay(url) {
this.showSubwayDiv = true; this.showSubwayDiv = true;
this.subWaySrc = url; this.subWaySrc = url;
},
//行程下载
downLoadTrip() {
var fileName="行程下载.pdf";
this.loading = true;
let urlObj = this.domainManager();
let msg = {
tcid: this.$route.query.tcid,
//用户Id
UId: this.getLocalStorage().EmployeeId
};
this.$http({
headers: {
'Content-Type': 'application/json'
},
method: 'post',
url: urlObj.DomainUrl + '/api/file/GetB2CWebHtmlToPdf',
data: {
"msg": msg
}
}).then(res => {
if (res.data.resultCode === 1) {
const a = document.createElement('a');
a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' +
fileName +
'.pdf&&fPath=' + res.data.data);
a.click();
} else {
this.$message.error('PDF获取失败');
}
this.loading = false;
}).catch(err => {
})
} }
} }
} }
......
src/components/mall/tripMobile.vue
View file @ 4b892322
...@@ -1007,7 +1007,9 @@ ...@@ -1007,7 +1007,9 @@
//请求参数 //请求参数
msg: { msg: {
ID: 0, ID: 0,
tcid: 0 tcid: 0,
isDes:0,
NewId:''
}, },
dataList: {}, dataList: {},
FlightList: [], FlightList: [],
...@@ -1027,11 +1029,12 @@ ...@@ -1027,11 +1029,12 @@
mounted() { mounted() {
this.msg.ID = this.$route.query.ID; this.msg.ID = this.$route.query.ID;
this.msg.tcid = this.$route.query.tcid; this.msg.tcid = this.$route.query.tcid;
var oldTimeStamp = this.$route.query.ExpireTime;
var timestamp = Date.parse(new Date()); //获取浏览器NewId
if(timestamp>oldTimeStamp){ var NewId = this.$route.query.NewId;
// this.Error('超时'); if(NewId){
this.showDiv=true; this.msg.isDes=1;
this.msg.NewId=NewId;
} }
this.getTrip(); this.getTrip();
//加载滑动 //加载滑动
...@@ -1076,6 +1079,7 @@ ...@@ -1076,6 +1079,7 @@
this.getScroll(); this.getScroll();
}) })
} else { } else {
this.showDiv=true;
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
......
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