Skip to content

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

修改

parent 87ce810a
Show 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 @@
max-width: 480px;
margin-left: 250px;
}
.tripViewContainer .inner {
margin: 15px;
color: #869096;
......@@ -161,6 +162,7 @@
font-size: 20px;
font-family: 'PingFangR';
}
.tripViewContainer .inner .articleCont {
min-height: 30px;
margin-bottom: 20px;
......@@ -283,6 +285,7 @@
top: 10px;
content: " ";
}
.arrangements .arrangementSubContainer {
border: 1px solid #DBE0E4;
border-radius: 5px;
......@@ -893,9 +896,10 @@
box-sizing: border-box;
/* padding: 0 30px; */
}
.slideList{
.slideList {
background: #fff;
margin:30px 0;
margin: 30px 0;
position: relative;
}
</style>
......@@ -904,6 +908,7 @@
<div class="tripContWrap">
<div class="sideBar mobileHide">
<div class="sideBarBtns sideTop">
<input type="button" @click="downLoadTrip()" value="下载" style="display:none;" />
<div :class="crtnav=='tripLine'?'active':''" class="btnPage" @click="goScroll('tripLine','')">
<i class="iconfont icon-huozhuduanchaxunxianlu"></i>行程线路
</div>
......@@ -916,13 +921,10 @@
<div class="border"></div>
</div>
<ul>
<li v-for="(item,index) in dataList.dayList" :key="index"
:class="crtnav=='dayList'+(item.dayNum)?'active':''"
@click="goScroll('dayList'+(item.dayNum),item.dayNum)">
<li v-for="(item,index) in dataList.dayList" :key="index" :class="crtnav=='dayList'+(item.dayNum)?'active':''" @click="goScroll('dayList'+(item.dayNum),item.dayNum)">
<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>
......@@ -951,8 +953,7 @@
</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>
......@@ -995,9 +996,8 @@
<span class="subTitle">交通方案</span>
</div>
</div>
<div class="col-md-12 col-sm-12"
v-if="dataList.currentPriceInfo&&dataList.currentPriceInfo.priceFlight&&dataList.currentPriceInfo.priceFlight.length>0">
<template v-for="(item,index) in dataList.currentPriceInfo.priceFlight" >
<div class="col-md-12 col-sm-12" v-if="dataList.currentPriceInfo&&dataList.currentPriceInfo.priceFlight&&dataList.currentPriceInfo.priceFlight.length>0">
<template v-for="(item,index) in dataList.currentPriceInfo.priceFlight">
<div class="arrangementSubContainer" :key="index">
<div class="header">
<span class="dayIndex">{{item.startDate}}</span>
......@@ -1038,26 +1038,21 @@
<span class="dayIndex">D{{item.dayNum}}</span>
<div class="city">
<span>
<template
v-for="(subItem,subIndex) in getHotelArray(item.dayArray)"
v-if="subIndex==0">
<template v-for="(subItem,subIndex) in getHotelArray(item.dayArray)" v-if="subIndex==0">
{{subItem.childItem.cityName}}
</template>
</span>
</div>
</div>
<div class="content">
<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="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>
<template v-if="subItem.childItem.newHotelName!=''">{{subItem.childItem.newHotelName}}</template>
<template v-else>{{subItem.childItem.hotelName}}</template>
</span>
</div>
</template>
......@@ -1071,8 +1066,7 @@
</div>
</div>
</div>
<div class="slideList" v-for="(item,index) in dataList.dayList" :id="'dayList'+(index+1)"
:key="index">
<div class="slideList" 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>
......@@ -1080,8 +1074,7 @@
<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>
......@@ -1116,30 +1109,25 @@
<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}) center`"
@click="bigImgShow(subItem.childItem.imaArray[0].url)">
<div class="coverWrap" :style="`background: url(${subItem.childItem.imaArray[0].url}) center`" @click="bigImgShow(subItem.childItem.imaArray[0].url)">
</div>
<div class="txtCont icon-triangle">
<div class="agendaPoi">
<i class="iconfont icon-jingdianjingguan tour"></i>
<span class="title"
style="color:#00A4A8;">{{subItem.childItem.couponsName}}</span>
<span class="title" style="color:#00A4A8;">{{subItem.childItem.couponsName}}</span>
</div>
<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.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>
</div>
</div>
......@@ -1155,17 +1143,14 @@
<template v-if="subItem.childItem.trafficType==2">
<div class="tripAgendaTransitBox">
<div class="transitIcon">
<i class="iconfont icon-icon-"
style="font-size:25px;"></i>专车
<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 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>
......@@ -1187,18 +1172,15 @@
<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)"
<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>
<template v-if="subItem.childItem.newHotelName">{{subItem.childItem.newHotelName}}</template>
<template v-else>{{subItem.childItem.hotelName}}</template>
</span>
</div>
<div class="detailBox">
......@@ -1206,37 +1188,28 @@
<div class="item">
<span class="label">酒店星级</span>
<span class="text">
<el-rate v-model="subItem.childItem.star"
disabled></el-rate>
<el-rate v-model="subItem.childItem.star" disabled></el-rate>
</span>
</div>
<div class="item"
v-if="getService(subItem.childItem.facilityServices)!=''">
<div class="item" v-if="getService(subItem.childItem.facilityServices)!=''">
<span class="label">设施服务</span>
<span
class="text">{{getService(subItem.childItem.facilityServices)}}</span>
<span class="text">{{getService(subItem.childItem.facilityServices)}}</span>
</div>
</div>
<div class="subSection"
:class="{'hideAgendaDetails':!subItem.childItem.isShow}"
v-if="subItem.childItem.hotelNewDescriptionText"
<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!=''">
<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>
<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 class="showMore" @click="getShowMore(subItem.childItem)">{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div>
</div>
<div class="Divtriangle">
<span></span>
......@@ -1264,8 +1237,7 @@
</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">
</viewer>
</div>
......@@ -1275,7 +1247,7 @@
export default {
data() {
return {
loading:false,
loading: false,
defaultImg: 'this.src="' + require('../../assets/img/newtrip/hotel.jpg') + '"',
travelLngLat: [],
showType: 1, //显示类型(1-所有的，2-每天的)
......@@ -1311,14 +1283,15 @@
let userAgentInfo = navigator.userAgent;
let Agents = ["Android", "iPhone",
"SymbianOS", "Windows Phone",
"iPad", "iPod"];
"iPad", "iPod"
];
for (let v = 0; v < Agents.length; v++) {
if (userAgentInfo.indexOf(Agents[v]) > 0) {
this.$router.push({
name:'tripMobile',
name: 'tripMobile',
query: {
ID : decodeURIComponent(this.msg.ID),
tcid : decodeURIComponent(this.msg.tcid),
ID: decodeURIComponent(this.msg.ID),
tcid: decodeURIComponent(this.msg.tcid),
}
});
}
......@@ -1353,15 +1326,15 @@
},
//加载数据
getTrip() {
this.loading=true;
this.loading = true;
this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, res => {
this.loading=false;
this.loading = false;
if (res.data.resultCode == 1) {
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;
}
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;
}
......@@ -1683,7 +1656,7 @@
}
} 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();
if (lastChecked.indexOf("dayList") != -1) {
this.crtnav = lastChecked;
......@@ -1699,6 +1672,41 @@
getSubWay(url) {
this.showSubwayDiv = true;
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 @@
//请求参数
msg: {
ID: 0,
tcid: 0
tcid: 0,
isDes:0,
NewId:''
},
dataList: {},
FlightList: [],
......@@ -1027,11 +1029,12 @@
mounted() {
this.msg.ID = this.$route.query.ID;
this.msg.tcid = this.$route.query.tcid;
var oldTimeStamp = this.$route.query.ExpireTime;
var timestamp = Date.parse(new Date());
if(timestamp>oldTimeStamp){
// this.Error('超时');
this.showDiv=true;
//获取浏览器NewId
var NewId = this.$route.query.NewId;
if(NewId){
this.msg.isDes=1;
this.msg.NewId=NewId;
}
this.getTrip();
//加载滑动
......@@ -1076,6 +1079,7 @@
this.getScroll();
})
} else {
this.showDiv=true;
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