Skip to content

S
SuperMan
Commit 8f93f784 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 1df2a376
Show whitespace changes
Inline Side-by-side
Showing with 661 additions and 602 deletions
src/components/newConfimationOrder.vue
View file @ 8f93f784
<style> <style>
.newTrip_Main{ .newTrip_Main {
display: block !important; display: block !important;
width: 1166px; width: 1166px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
...@@ -8,127 +8,156 @@ ...@@ -8,127 +8,156 @@
height: auto; height: auto;
padding: 0 20px; padding: 0 20px;
margin: 0 auto; margin: 0 auto;
height: auto!important; height: auto !important;
font-family: 'PingFang SC Regular'; font-family: 'PingFang SC Regular';
} }
.newTrip_Main .newTripCom_Img{
width:100%; .newTrip_Main .newTripCom_Img {
width: 100%;
} }
.newTrip_Main .newTripCom_Img img{
width:100%; .newTrip_Main .newTripCom_Img img {
width: 100%;
} }
.newTrip_Main .newCenterContent{
width:100%; .newTrip_Main .newCenterContent {
height:auto; width: 100%;
color:#111111; height: auto;
color: #111111;
} }
.newTrip_Main .newTripTitle{
font-size:30px; .newTrip_Main .newTripTitle {
margin-bottom:10px; font-size: 30px;
width:100%; margin-bottom: 10px;
width: 100%;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
margin-top:20px; margin-top: 20px;
} }
.newTrip_Main .newTripCankao{
width:100%; .newTrip_Main .newTripCankao {
font-size:20px; width: 100%;
text-align:center; font-size: 20px;
text-align: center;
} }
.newTrip_Main .newtripComTitle{
.newTrip_Main .newtripComTitle {
font-weight: bold; font-weight: bold;
} }
.newTrip_Main .newTripStartInfo{
font-size:20px; .newTrip_Main .newTripStartInfo {
margin-top:20px; font-size: 20px;
float:left; margin-top: 20px;
width:60%; float: left;
width: 60%;
} }
.newTrip_Main .newTripStartInfo>div{
margin-bottom:20px; .newTrip_Main .newTripStartInfo>div {
margin-bottom: 20px;
} }
.newTrip_Main .newtripList>div{
margin-bottom:20px; .newTrip_Main .newtripList>div {
margin-bottom: 20px;
} }
.newTrip_Main .newTripDay{
font-size:20px; .newTrip_Main .newTripDay {
font-size: 20px;
} }
.newTrip_Main .newTripFly{
font-size:25px; .newTrip_Main .newTripFly {
font-size: 25px;
font-weight: bold; font-weight: bold;
} }
.newTrip_Main .newTripTable{
font-size:20px; .newTrip_Main .newTripTable {
font-size: 20px;
} }
.newTrip_Main .newTripTable tr td{
.newTrip_Main .newTripTable tr td {
vertical-align: top; vertical-align: top;
} }
.newTrip_Main .newTripTable label{
.newTrip_Main .newTripTable label {
font-weight: bold; font-weight: bold;
} }
.newTrip_Main .tripLeftCan,.newTrip_Main .tripRightCan{
display:inline-block; .newTrip_Main .tripLeftCan,
max-width:265px ; .newTrip_Main .tripRightCan {
display: inline-block;
max-width: 265px;
} }
.newTrip_Main .newTripDateTime{
font-size:15px; .newTrip_Main .newTripDateTime {
font-size: 15px;
} }
.newTrip_Main .warmTipsTitle{
display:inline-block; .newTrip_Main .warmTipsTitle {
width:100px; display: inline-block;
width: 100px;
vertical-align: top; vertical-align: top;
margin-top:20px; margin-top: 20px;
} }
.newTrip_Main .warmTipsContent{
display:inline-block; .newTrip_Main .warmTipsContent {
width:90%; display: inline-block;
width: 90%;
} }
.newTrip_Main .newTripDay div{
margin-bottom:20px; .newTrip_Main .newTripDay div {
margin-bottom: 20px;
} }
.newTrip_Main .newTripTutle{
.newTrip_Main .newTripTutle {
font-weight: bold; font-weight: bold;
margin-bottom:10px!important; margin-bottom: 10px !important;
} }
.newTripImgList{
width:100%; .newTripImgList {
width: 100%;
} }
.newTripFeiyong{
width:100%; .newTripFeiyong {
height:100%; width: 100%;
height: 100%;
} }
.newTripFeiyongtitle{
.newTripFeiyongtitle {
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
color: #333; color: #333;
padding-top: 30px; padding-top: 30px;
padding-bottom: 30px; padding-bottom: 30px;
} }
.newTripLine{
.newTripLine {
width: 32px; width: 32px;
height: 2px; height: 2px;
background: #e73e6d; background: #e73e6d;
margin: 12px auto; margin: 12px auto;
} }
.newTripEnglish{
.newTripEnglish {
font-family: arial; font-family: arial;
font-size: 12px; font-size: 12px;
color: #ccc; color: #ccc;
} }
.newTripExpense{
margin:0 auto; .newTripExpense {
width:100%; margin: 0 auto;
width: 100%;
} }
.newTripleft{
.newTripleft {
display: inline-block; display: inline-block;
text-align: left; text-align: left;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
font-family: Arial; font-family: Arial;
vertical-align: top; vertical-align: top;
margin:0 0 15px 0; margin: 0 0 15px 0;
} }
.newTripRight{
.newTripRight {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
font-size: 14px; font-size: 14px;
...@@ -137,10 +166,12 @@ ...@@ -137,10 +166,12 @@
vertical-align: top; vertical-align: top;
font-family: '微软雅黑'; font-family: '微软雅黑';
} }
.newTripFeiyongtitle h2{
font-size:18px; .newTripFeiyongtitle h2 {
font-size: 18px;
} }
.newTripflightInfo{
.newTripflightInfo {
background-color: #f7f7f7; background-color: #f7f7f7;
padding: 20px 15px 15px 15px; padding: 20px 15px 15px 15px;
width: 100%; width: 100%;
...@@ -148,32 +179,38 @@ ...@@ -148,32 +179,38 @@
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.newTripflightInfo .flight_th { .newTripflightInfo .flight_th {
font-size: 20px; font-size: 20px;
font-weight: 700; font-weight: 700;
width: 100%; width: 100%;
color: #000000; color: #000000;
} }
._hangban_line { ._hangban_line {
height: 1px; height: 1px;
background-color: #929292; background-color: #929292;
margin-top: 8px; margin-top: 8px;
margin-bottom: 13px; margin-bottom: 13px;
} }
.newTripflight_list{
width:100%; .newTripflight_list {
width: 100%;
} }
.newTripflight_list td { .newTripflight_list td {
font-size: 15px; font-size: 15px;
height: 34px; height: 34px;
vertical-align: middle; vertical-align: middle;
background-color: #eaeaea; background-color: #eaeaea;
} }
.newTrip_Main .newTripcollection {
.newTrip_Main .newTripcollection {
margin-bottom: 40px; margin-bottom: 40px;
width: 100%; width: 100%;
} }
.newTrip_Main .newTripCollectuion {
.newTrip_Main .newTripCollectuion {
width: 400px; width: 400px;
height: 80px; height: 80px;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
...@@ -181,25 +218,29 @@ ...@@ -181,25 +218,29 @@
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
color: #666; color: #666;
} }
.newTrip_Main .newTripCollectuion>div {
.newTrip_Main .newTripCollectuion>div {
width: 130px; width: 130px;
float: left; float: left;
padding-top: 25px; padding-top: 25px;
} }
.newTrip_Main .newTripCollectuion span {
.newTrip_Main .newTripCollectuion span {
font-size: 18px; font-size: 18px;
color: #000; color: #000;
width: 270px; width: 270px;
display: inline-block; display: inline-block;
float: left; float: left;
padding-top: 25px; padding-top: 25px;
} }
.newTrip_Main .newTripCollectuion img {
.newTrip_Main .newTripCollectuion img {
vertical-align: sub; vertical-align: sub;
margin-right: 12px; margin-right: 12px;
} }
.newTripDownbtn{
.newTripDownbtn {
color: #fff; color: #fff;
width: 90px; width: 90px;
height: 30px; height: 30px;
...@@ -208,41 +249,66 @@ ...@@ -208,41 +249,66 @@
cursor: pointer; cursor: pointer;
border-radius: 15px; border-radius: 15px;
margin-left: 10px; margin-left: 10px;
margin:20px 0; margin: 20px 0;
} }
.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
.newTwoCodeRight{ .clearfix:after {
float:right; content: "\0020";
width:118px; display: block;
height:118px; height: 0;
margin:40px 20px 0 0; clear: both;
} }
.newTwoCodeRight img{
width:100%; .newTwoCodeRight {
} float: right;
.newTripTable{ width: 118px;
width:100%; height: 118px;
} margin: 40px 20px 0 0;
.newTripTable td{ }
border:1px solid #d1d1d1;
} .newTwoCodeRight img {
.newTripTable{width: 100%;border-collapse:collapse;} width: 100%;
.newTripTable tr{background: #fff; height: 40px;} }
.newTripTable tr td{border: 1px solid #E5E5E5;padding:5px;}
.newTripKuang{ .newTripTable {
width:100%; width: 100%;
height:100%; }
padding:5px;
border:1px solid #d1d1d1; .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> </style>
<template> <template>
<div class="newTrip_Main"> <div class="newTrip_Main">
<div> <div>
<input type="button" value="行程下载" class="newTripDownbtn" @click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')"/> <input type="button" value="行程下载" class="newTripDownbtn"
@click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
</div> </div>
<div class="newTripCom_Img"> <div class="newTripCom_Img">
<img :src="lineTripFeatureTopBg" alt=""/> <img :src="lineTripFeatureTopBg" alt="" />
</div> </div>
<div class="newCenterContent"> <div class="newCenterContent">
<div class="newTripTitle"> <div class="newTripTitle">
...@@ -410,7 +476,8 @@ ...@@ -410,7 +476,8 @@
</div> </div>
</div> </div>
<div class="newTripDay"> <div class="newTripDay">
<div class="warmTipsTitle">温馨提示：</div><div class="warmTipsContent" v-html="item.tips[0].content"></div> <div class="warmTipsTitle">温馨提示：</div>
<div class="warmTipsContent" v-html="item.tips[0].content"></div>
</div> </div>
<div> <div>
<table class="newTripTable" border="0" cellspacing="0" cellpadding="0"> <table class="newTripTable" border="0" cellspacing="0" cellpadding="0">
...@@ -439,8 +506,11 @@ ...@@ -439,8 +506,11 @@
</td> </td>
<td style="width:25%"> <td style="width:25%">
<label>交通：</label> <label>交通：</label>
<template v-for="subItem in item.details"> <template v-if="item.trafficArray&& item.trafficArray.length>0" v-for="(subItem,subIndex) in item.trafficArray">
<template v-for="childItem in subItem.trafficArray">{{childItem}}&nbsp;</template> <span>{{subItem}}</span>
<template v-if="subIndex!=item.trafficArray.length-1">
<span>、</span>
</template>
</template> </template>
</td> </td>
</tr> </tr>
...@@ -590,7 +660,7 @@ ...@@ -590,7 +660,7 @@
</div> </div>
</div> </div>
<div class="newTripCom_Img"> <div class="newTripCom_Img">
<img :src="lineTripFeatureBottomBg" alt=""/> <img :src="lineTripFeatureBottomBg" alt="" />
</div> </div>
</div> </div>
</template> </template>
...@@ -600,11 +670,11 @@ ...@@ -600,11 +670,11 @@
export default { export default {
data() { data() {
return { return {
Typevalue:-1, Typevalue: -1,
titleList:[], titleList: [],
listMsg:{ listMsg: {
pageSize:1000, pageSize: 1000,
pageIndex:1, pageIndex: 1,
}, },
//orderId和是否op操作控制按钮显示 //orderId和是否op操作控制按钮显示
orderId: 0, orderId: 0,
...@@ -637,11 +707,11 @@ ...@@ -637,11 +707,11 @@
orderTripdiff: {}, orderTripdiff: {},
title: '', title: '',
isDirect: 1, //是否是直采 0：否，1：是 isDirect: 1, //是否是直采 0：否，1：是
isClick: this.$route.query.isClick === undefined ? 0 : 1,//不算统计 isClick: this.$route.query.isClick === undefined ? 0 : 1, //不算统计
//顶部图片 //顶部图片
lineTripFeatureTopBg:'', lineTripFeatureTopBg: '',
//底部图片 //底部图片
lineTripFeatureBottomBg:'', lineTripFeatureBottomBg: '',
//航空公司下拉 //航空公司下拉
airLineList: [], airLineList: [],
...@@ -662,7 +732,7 @@ ...@@ -662,7 +732,7 @@
vshowTCNUM: this.$route.query.vshowTCNUM === undefined ? false : this.$route.query.vshowTCNUM === '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', vshowO: this.$route.query.vshowO === undefined ? true : this.$route.query.vshowO === 'true',
//微信分享图片 //微信分享图片
WeiXinShareImgSrc:"", WeiXinShareImgSrc: "",
loadNone: false, loadNone: false,
} }
}, },
...@@ -682,7 +752,7 @@ ...@@ -682,7 +752,7 @@
suffix = "或同級" suffix = "或同級"
} }
} else { } else {
if (item.jiu2.length == 1 && item.jiu2[0].name != '温馨的家'&& item.jiu2[0].name!='机场附近酒店') { if (item.jiu2.length == 1 && item.jiu2[0].name != '温馨的家' && item.jiu2[0].name != '机场附近酒店') {
if (item.jiu2[0].status == 1) { if (item.jiu2[0].status == 1) {
suffix = "【保证入住】" suffix = "【保证入住】"
} else { } else {
...@@ -695,15 +765,15 @@ ...@@ -695,15 +765,15 @@
return suffix; return suffix;
}, },
// 获取标题 // 获取标题
getDataList(){ getDataList() {
this.apiJavaPost('/api/rssarticle/getArticleList',this.listMsg,res=>{ this.apiJavaPost('/api/rssarticle/getArticleList', this.listMsg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
let data=res.data.data.pageData.list; let data = res.data.data.pageData.list;
this.titleList=data; this.titleList = data;
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
},null) }, null)
}, },
//获取微信二维码 //获取微信二维码
getWxCode: function () { getWxCode: function () {
...@@ -711,7 +781,7 @@ ...@@ -711,7 +781,7 @@
TCID: this.$route.query.tcid TCID: this.$route.query.tcid
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.WeiXinShareImgSrc=res.data.data; this.WeiXinShareImgSrc = res.data.data;
} }
}, err => {}) }, err => {})
}, },
...@@ -847,7 +917,7 @@ ...@@ -847,7 +917,7 @@
//模板参数 //模板参数
templateId: this.showType, templateId: this.showType,
//用户Id //用户Id
UId:this.getLocalStorage().EmployeeId UId: this.getLocalStorage().EmployeeId
}; };
this.$http({ this.$http({
headers: { headers: {
...@@ -860,7 +930,7 @@ ...@@ -860,7 +930,7 @@
} }
}).then(res => { }).then(res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let sign = title+"V3" let sign = title + "V3"
const a = document.createElement('a'); const a = document.createElement('a');
a.setAttribute('download', ''); a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign + a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
...@@ -889,11 +959,10 @@ ...@@ -889,11 +959,10 @@
cityId: this.$route.query.cityId, cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid, tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId, orderId: this.$route.query.orderId,
isClick:1//不算统计 isClick: 1 //不算统计
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = (res.data.data); let data = (res.data.data);
console.log(res,'resssssss');
this.lineTripFeatureTopBg = data.lineTripFeatureTopBg; this.lineTripFeatureTopBg = data.lineTripFeatureTopBg;
this.lineTripFeatureBottomBg = data.lineTripFeatureBottomBg; this.lineTripFeatureBottomBg = data.lineTripFeatureBottomBg;
this.orderTripdiff = data.orderTripdiff; this.orderTripdiff = data.orderTripdiff;
...@@ -963,7 +1032,8 @@ ...@@ -963,7 +1032,8 @@
this.airLineSelectChange(fItem.airLineID, fItem); this.airLineSelectChange(fItem.airLineID, fItem);
}); });
} }
this.title = this.getTitele(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游') this.title = this.getTitele(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg
.dayNum + '日游')
document.title = this.title; document.title = this.title;
//初始化行程 //初始化行程
...@@ -1007,7 +1077,7 @@ ...@@ -1007,7 +1077,7 @@
this.dataList = data; this.dataList = data;
this.tripList.forEach((x, j) => { this.tripList.forEach((x, j) => {
let useDinnerTypeBy = ''; let useDinnerTypeBy = '';
let trafficArray=[]; let trafficArray = [];
let jin = [], let jin = [],
jiu = [], jiu = [],
jiu2 = [], jiu2 = [],
...@@ -1039,26 +1109,22 @@ ...@@ -1039,26 +1109,22 @@
title += z.startCityName title += z.startCityName
if (z.arrivalType == 1) { if (z.arrivalType == 1) {
title += '<i class="iconfont icon-feiji"></i>' title += '<i class="iconfont icon-feiji"></i>'
if(!(trafficArray.indexOf("飞机") > -1)) if (!(trafficArray.indexOf("飞机") > -1)) {
{
trafficArray.push("飞机") trafficArray.push("飞机")
} }
} else if (z.arrivalType == 2) { } else if (z.arrivalType == 2) {
title += '<i class="iconfont icon-bus"></i>' title += '<i class="iconfont icon-bus"></i>'
if(!(trafficArray.indexOf("巴士") > -1)) if (!(trafficArray.indexOf("巴士") > -1)) {
{
trafficArray.push("巴士") trafficArray.push("巴士")
} }
} else if (z.arrivalType == 3) { } else if (z.arrivalType == 3) {
title += '<i class="iconfont icon-icon31"></i>' title += '<i class="iconfont icon-icon31"></i>'
if(!(trafficArray.indexOf("轮船") > -1)) if (!(trafficArray.indexOf("轮船") > -1)) {
{
trafficArray.push("轮船") trafficArray.push("轮船")
} }
} else { } else {
title += '<i class="iconfont icon-gaotiedongche"></i>' title += '<i class="iconfont icon-gaotiedongche"></i>'
if(!(trafficArray.indexOf("火车") > -1)) if (!(trafficArray.indexOf("火车") > -1)) {
{
trafficArray.push("火车") trafficArray.push("火车")
} }
} }
...@@ -1068,7 +1134,6 @@ ...@@ -1068,7 +1134,6 @@
}) })
let obj = { let obj = {
title: title, title: title,
trafficArray: trafficArray,
content: y.childItem.description, content: y.childItem.description,
img: '', img: '',
ticketName: '', ticketName: '',
...@@ -1089,7 +1154,6 @@ ...@@ -1089,7 +1154,6 @@
playTimeMinutes: y.childItem.playTimeMinutes, playTimeMinutes: y.childItem.playTimeMinutes,
scenicJson: y.childItem.scenicJson, scenicJson: y.childItem.scenicJson,
url: y.childItem.url, url: y.childItem.url,
trafficArray: trafficArray,
} }
jin.push(obj) jin.push(obj)
} else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) { } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
...@@ -1162,16 +1226,14 @@ ...@@ -1162,16 +1226,14 @@
} else if (can.dinner == '') { } else if (can.dinner == '') {
can.dinner = '方便游玩敬请自理' can.dinner = '方便游玩敬请自理'
} }
x.can = can x.can = can;
x.trafficArray=trafficArray;
let details = []; let details = [];
x.tips = tips x.tips = tips
x.jiu2 = jiu2 x.jiu2 = jiu2
if (jin.length > 0) { if (jin.length > 0) {
details = jin details = jin
} }
// else if (jiu.length > 0) {
// // details = jiu
// }
else if (dadian.length > 0) { else if (dadian.length > 0) {
details = dadian details = dadian
} else if (jiao.length > 0) { } else if (jiao.length > 0) {
...@@ -1227,29 +1289,27 @@ ...@@ -1227,29 +1289,27 @@
} }
} }
} }
x.islast = (j + 1) == this.tripList.length x.islast = (j + 1) == this.tripList.length;
this.$set(this.tripList, j, x) this.$set(this.tripList, j, x);
x.dateTime = this.setDate(j); x.dateTime = this.setDate(j);
console.log(this.tripList,'triplistttt');
}) })
}, },
//遍历字符串书否有null //遍历字符串书否有null
getTitle(item){ getTitle(item) {
if(item!=null&&item!=''){ if (item != null && item != '') {
if(item.indexOf('null')>-1){ if (item.indexOf('null') > -1) {
return '' return ''
}else{ } else {
return item return item
} }
} }
}, },
//去掉null //去掉null
getTitele(item){ getTitele(item) {
if(item!=null&&item!=''){ if (item != null && item != '') {
if(item.indexOf('null')>-1){ if (item.indexOf('null') > -1) {
return item.replace('null',' ') return item.replace('null', ' ')
}else{ } else {
return item return item
} }
} }
...@@ -1259,5 +1319,4 @@ ...@@ -1259,5 +1319,4 @@
newTripCommon newTripCommon
}, },
} }
</script> </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