Skip to content

S
SuperMan
Commit fcd48c3c authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 70bb0d45 1df2a376
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 25 deletions
src/components/newConfimationOrder.vue
View file @ fcd48c3c
......@@ -41,6 +41,8 @@
.newTrip_Main .newTripStartInfo{
font-size:20px;
margin-top:20px;
float:left;
width:60%;
}
.newTrip_Main .newTripStartInfo>div{
margin-bottom:20px;
......@@ -120,10 +122,11 @@
.newTripleft{
display: inline-block;
text-align: left;
font-size: 18px;
font-size: 14px;
font-weight: bold;
font-family: Arial;
vertical-align: top;
margin-bottom: 15px;
margin:0 0 15px 0;
}
.newTripRight{
width: 100%;
......@@ -207,6 +210,31 @@
margin-left: 10px;
margin:20px 0;
}
.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
.newTwoCodeRight{
float:right;
width:118px;
height:118px;
margin:40px 20px 0 0;
}
.newTwoCodeRight img{
width:100%;
}
.newTripTable{
width:100%;
}
.newTripTable td{
border:1px solid #d1d1d1;
}
.newTripTable{width: 100%;border-collapse:collapse;}
.newTripTable tr{background: #fff; height: 40px;}
.newTripTable tr td{border: 1px solid #E5E5E5;padding:5px;}
.newTripKuang{
width:100%;
height:100%;
padding:5px;
border:1px solid #d1d1d1;
}
</style>
<template>
<div class="newTrip_Main">
......@@ -221,11 +249,16 @@
{{title}}
</div>
<div class="newTripCankao">(行程中所涉及到的图片仅供参考)</div>
<div class="newTripStartInfo">
<div><span class="newtripComTitle">线路：</span>{{orderMsg.lineName}}</div>
<div><span class="newtripComTitle">出发日期：</span>{{orderMsg.startDate}}</div>
<div><span class="newtripComTitle">返回日期：</span>{{orderMsg.endDate}}</div>
<div><span class="newtripComTitle">行程天数：</span>{{orderMsg.dayNum}}</div>
<div class="clearfix">
<div class="newTripStartInfo">
<div><span class="newtripComTitle">线路：</span>{{orderMsg.lineName}}</div>
<div><span class="newtripComTitle">出发日期：</span>{{orderMsg.startDate}}</div>
<div><span class="newtripComTitle">返回日期：</span>{{orderMsg.endDate}}</div>
<div><span class="newtripComTitle">行程天数：</span>{{orderMsg.dayNum}}</div>
</div>
<div class="newTwoCodeRight">
<img :src="'data:image/png;base64,'+WeiXinShareImgSrc" />
</div>
</div>
<div v-if='vshowL' class="newTripFeiyongtitle">
......@@ -363,22 +396,24 @@
</table>
</div>
<div class="newFeature" v-html="feature.featureHtml"></div>
<div v-if="(showType>=4)&&loadNone==false&&vshowC" class="newFeature" v-html="feature.featureHtml"></div>
<div class="newtripList" v-for="(item,index) in tripList" :key="index">
<div class="newTripFly">DAY {{item.dayNum}}</div>
<div class="newTripDateTime">{{item.dateTime}}</div>
<div class="newTripFly">
<div class="newTripFly" v-if="item.title" :class="getTitle(item.title)!=''?'newTripKuang':''">
{{getTitle(item.title)}}
</div>
<div class="newTripDay" style="margin-bottom:0;" v-for="(subItem,subIndex) in item.details" :key="subIndex">
<div class="newTripTutle">{{getTitle(subItem.title)}}</div>
<div>{{subItem.content}}</div>
<div>
<span class="newTripTutle">{{getTitle(subItem.title)}}：</span>
<span>{{subItem.content}}</span>
</div>
</div>
<div class="newTripDay">
<div class="warmTipsTitle">温馨提示：</div><div class="warmTipsContent" v-html="item.tips[0].content"></div>
</div>
<div>
<table class="newTripTable">
<table class="newTripTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="width:45%">
<label>酒店：</label>
......@@ -402,11 +437,16 @@
<div>晚({{item.can.dinner}})</div>
</div>
</td>
<td style="width:25%"><label>交通：</label>飞机、酒店/机场班车</td>
<td style="width:25%">
<label>交通：</label>
<template v-for="subItem in item.details">
<template v-for="childItem in subItem.trafficArray">{{childItem}}&nbsp;</template>
</template>
</td>
</tr>
</table>
</div>
<div class="newTripImgList">
<div class="newTripImgList" v-if="vshowK">
<newTripCommon :day="item.details"></newTripCommon>
</div>
</div>
......@@ -423,7 +463,7 @@
<div class="newTripRight">
<div v-html="feature.feeInclude"></div>
</div>
<div class="newTripleft" style="margin: 15px 0 15px 0;">费用不包含</div>
<div class="newTripleft" style="margin: 15px 0 10px 8px;">费用不包含</div>
<div class="newTripRight">
<div v-html="feature.feeNonInclude"></div>
</div>
......@@ -462,9 +502,9 @@
<div v-html="feature.shopRemark"></div>
</div>
</div>
<div class="expense" v-if="dataList.shopList && dataList.shopList.length>0&&vshowF">
<div class="left">购物安排</div>
<div class="right">
<div class="newTripExpense" v-if="dataList.shopList && dataList.shopList.length>0&&vshowF">
<div class="newTripleft">购物安排</div>
<div class="newTripRight">
<table class="expense-table autowidth" cellspacing=0 cellpadding=0>
<thead>
<th>城市</th>
......@@ -495,7 +535,7 @@
</div>
</div>
<div v-if='vshowG' class="newTripExpense">
<div class="newTripleft">温馨提示</div>
<div class="newTripleft" style="margin-top:15px;">温馨提示</div>
<div class="newTripRight">
<div v-html="feature.warmTip"></div>
</div>
......@@ -621,13 +661,15 @@
vshowLLR: this.$route.query.vshowLLR === undefined ? true : this.$route.query.vshowLLR === 'true',
vshowTCNUM: this.$route.query.vshowTCNUM === undefined ? false : this.$route.query.vshowTCNUM === 'true',
vshowO: this.$route.query.vshowO === undefined ? true : this.$route.query.vshowO === 'true',
//微信分享图片
WeiXinShareImgSrc:"",
loadNone: false,
}
},
mounted() {
this.orderId = this.$route.query.orderId;
this.isopOperation = this.$route.query.isopOperation;
// this.getWxCode();
this.getWxCode();
this.init();
this.initAirlines()
this.getDataList();
......@@ -964,7 +1006,8 @@
this.priceList = data.priceList;
this.dataList = data;
this.tripList.forEach((x, j) => {
let useDinnerTypeBy = ''
let useDinnerTypeBy = '';
let trafficArray=[];
let jin = [],
jiu = [],
jiu2 = [],
......@@ -991,17 +1034,33 @@
}
dadian.push(obj)
} else if (y.type == 1 && y.childItem.subTraffic.length > 0) {
let title = ''
let title = '';
y.childItem.subTraffic.forEach((z, i) => {
title += z.startCityName
if (z.arrivalType == 1) {
title += '<i class="iconfont icon-feiji"></i>'
if(!(trafficArray.indexOf("飞机") > -1))
{
trafficArray.push("飞机")
}
} else if (z.arrivalType == 2) {
title += '<i class="iconfont icon-bus"></i>'
if(!(trafficArray.indexOf("巴士") > -1))
{
trafficArray.push("巴士")
}
} else if (z.arrivalType == 3) {
title += '<i class="iconfont icon-icon31"></i>'
if(!(trafficArray.indexOf("轮船") > -1))
{
trafficArray.push("轮船")
}
} else {
title += '<i class="iconfont icon-gaotiedongche"></i>'
if(!(trafficArray.indexOf("火车") > -1))
{
trafficArray.push("火车")
}
}
if (i + 1 == y.childItem.subTraffic.length) {
title += z.arrivalCityName
......@@ -1009,6 +1068,7 @@
})
let obj = {
title: title,
trafficArray: trafficArray,
content: y.childItem.description,
img: '',
ticketName: '',
......@@ -1028,7 +1088,8 @@
playTimeHour: y.childItem.playTimeHour,
playTimeMinutes: y.childItem.playTimeMinutes,
scenicJson: y.childItem.scenicJson,
url: y.childItem.url
url: y.childItem.url,
trafficArray: trafficArray,
}
jin.push(obj)
} else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
......@@ -1187,7 +1248,7 @@
getTitele(item){
if(item!=null&&item!=''){
if(item.indexOf('null')>-1){
return item.replace('null','')
return item.replace('null',' ')
}else{
return item
}
......
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