Skip to content

S
SuperMan
Commit 02159d1c authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 1bc28e83
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 42 deletions
src/components/newConfimationOrder.vue
View file @ 02159d1c
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
.newTrip_Main .newTripCom_Img { .newTrip_Main .newTripCom_Img {
width: 100%; width: 100%;
padding-top:40px;
} }
.newTrip_Main .newTripCom_Img img { .newTrip_Main .newTripCom_Img img {
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
.newTripleft { .newTripleft {
display: inline-block; display: inline-block;
text-align: left; text-align: left;
font-size: 14px; font-size: 16px;
font-weight: bold; font-weight: bold;
font-family: Arial; font-family: Arial;
vertical-align: top; vertical-align: top;
...@@ -159,8 +160,8 @@ ...@@ -159,8 +160,8 @@
.newTripRight { .newTripRight {
width: 100%; width: 100%;
overflow: hidden; /* overflow: hidden; */
font-size: 14px; font-size: 16px;
line-height: 25px; line-height: 25px;
color: #000000; color: #000000;
vertical-align: top; vertical-align: top;
...@@ -263,7 +264,7 @@ ...@@ -263,7 +264,7 @@
float: right; float: right;
width: 118px; width: 118px;
height: 118px; height: 118px;
margin: 40px 20px 0 0; margin: 40px 120px 0 0;
} }
.newTwoCodeRight img { .newTwoCodeRight img {
...@@ -299,10 +300,16 @@ ...@@ -299,10 +300,16 @@
padding: 5px; padding: 5px;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
} }
.newTripPassenger td{
font-size:14px;
font-family: '微软雅黑';
vertical-align: middle!important;
}
.newTripTable tr th{background: #E6E6E6;height:40px; font-size: 14px; color: #333;}
</style> </style>
<template> <template>
<div class="newTrip_Main"> <div class="newTrip_Main" v-loading="pdfLoading">
<div> <div>
<input type="button" value="行程下载" class="newTripDownbtn" <input type="button" value="行程下载" class="newTripDownbtn"
@click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> @click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
...@@ -464,7 +471,7 @@ ...@@ -464,7 +471,7 @@
<div v-if="(showType>=4)&&loadNone==false&&vshowC" 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="newtripList" v-for="(item,index) in tripList" :key="index">
<div class="newTripFly">DAY {{item.dayNum}}</div> <div class="newTripFly" style="margin-bottom:10px;">DAY {{item.dayNum}}</div>
<div class="newTripDateTime">{{item.dateTime}}</div> <div class="newTripDateTime">{{item.dateTime}}</div>
<div class="newTripFly" v-if="item.title" :class="getTitle(item.title)!=''?'newTripKuang':''"> <div class="newTripFly" v-if="item.title" :class="getTitle(item.title)!=''?'newTripKuang':''">
{{getTitle(item.title)}} {{getTitle(item.title)}}
...@@ -482,7 +489,7 @@ ...@@ -482,7 +489,7 @@
<div> <div>
<table class="newTripTable" border="0" cellspacing="0" cellpadding="0"> <table class="newTripTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td style="width:45%"> <td style="width:42%">
<label>酒店：</label> <label>酒店：</label>
<template v-if='item.jiu2.length>0'> <template v-if='item.jiu2.length>0'>
<span v-for="(t,k) in item.jiu2" style="cursor: pointer" :key="k"> <span v-for="(t,k) in item.jiu2" style="cursor: pointer" :key="k">
...@@ -541,21 +548,19 @@ ...@@ -541,21 +548,19 @@
<div class="newTripExpense" v-if='dataList.selfpayingList && dataList.selfpayingList.length>0&&vshowE'> <div class="newTripExpense" v-if='dataList.selfpayingList && dataList.selfpayingList.length>0&&vshowE'>
<div class="newTripleft">自理费用</div> <div class="newTripleft">自理费用</div>
<div class="newTripRight"> <div class="newTripRight">
<table class="expense-table" cellspacing=0 cellpadding=0> <table class="newTripTable newTripPassenger" cellspacing=0 cellpadding=0>
<thead> <tr>
<th>城市</th> <th width="10%">城市</th>
<th>活动</th> <th width="10%">活动</th>
<th>参考价格</th> <th width="20%">参考价格</th>
<th>说明</th> <th width="60%">说明</th>
</thead> </tr>
<tbody> <tr v-for="(item,i) in dataList.selfpayingList" :key="i">
<tr v-for="(item,i) in dataList.selfpayingList" :key="i"> <td>{{item.cityName}}</td>
<td>{{item.cityName}}</td> <td>{{item.itemName}}</td>
<td>{{item.itemName}}</td> <td>约{{item.estimatedCost}}</td>
<td>约{{item.estimatedCost}}</td> <td>{{item.explain}}</td>
<td>{{item.explain}}</td> </tr>
</tr>
</tbody>
</table> </table>
</div> </div>
</div> </div>
...@@ -575,19 +580,17 @@ ...@@ -575,19 +580,17 @@
<div class="newTripExpense" v-if="dataList.shopList && dataList.shopList.length>0&&vshowF"> <div class="newTripExpense" v-if="dataList.shopList && dataList.shopList.length>0&&vshowF">
<div class="newTripleft">购物安排</div> <div class="newTripleft">购物安排</div>
<div class="newTripRight"> <div class="newTripRight">
<table class="expense-table autowidth" cellspacing=0 cellpadding=0> <table class="newTripTable newTripPassenger" cellspacing=0 cellpadding=0>
<thead> <tr>
<th>城市</th> <th width="33%">城市</th>
<th>购物店名称</th> <th width="33%">购物店名称</th>
<th>预计停留时间</th> <th width="33%">预计停留时间</th>
</thead> </tr>
<tbody> <tr v-for="(item,i) in dataList.shopList" :key="i">
<tr v-for="(item,i) in dataList.shopList" :key="i"> <td>{{item.cityName}}</td>
<td>{{item.cityName}}</td> <td>{{item.shopName}}</td>
<td>{{item.shopName}}</td> <td>{{item.visitTime}}</td>
<td>{{item.visitTime}}</td> </tr>
</tr>
</tbody>
</table> </table>
</div> </div>
</div> </div>
...@@ -639,14 +642,14 @@ ...@@ -639,14 +642,14 @@
<div class="newTripLine"></div> <div class="newTripLine"></div>
<div class="newTripEnglish">Passenger information</div> <div class="newTripEnglish">Passenger information</div>
</div> </div>
<table v-if='vshowM' class="Passenger-table" border="0" cellspacing="2" cellpadding="2"> <table v-if='vshowM' class="newTripTable newTripPassenger" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td width="16.6%" class="thClass">姓名</td> <th width="16.6%" class="thClass">姓名</th>
<td width="16.6%" class="thClass">英文姓名</td> <th width="16.6%" class="thClass">英文姓名</th>
<td width="16.6%" class="thClass">性别</td> <th width="16.6%" class="thClass">性别</th>
<td width="16.6%" class="thClass">护照号</td> <th width="16.6%" class="thClass">护照号</th>
<td width="16.6%" class="thClass">有效期</td> <th width="16.6%" class="thClass">有效期</th>
<td width="16.6%" class="thClass">联系电话</td> <th width="16.6%" class="thClass">联系电话</th>
</tr> </tr>
<tr v-for="(item,i) in orderMsg.guestList" :key="i"> <tr v-for="(item,i) in orderMsg.guestList" :key="i">
<td>{{item.name}}</td> <td>{{item.name}}</td>
...@@ -734,6 +737,7 @@ ...@@ -734,6 +737,7 @@
//微信分享图片 //微信分享图片
WeiXinShareImgSrc: "", WeiXinShareImgSrc: "",
loadNone: false, loadNone: false,
pdfLoading:false,
} }
}, },
mounted() { mounted() {
...@@ -1292,6 +1296,7 @@ ...@@ -1292,6 +1296,7 @@
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,'triplist');
}) })
}, },
//遍历字符串书否有null //遍历字符串书否有null
......
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