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