Skip to content

S
SuperMan
Commit 86861cd0 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents ba2014e7 71f2e2b1
Hide whitespace changes
Inline Side-by-side
Showing with 354 additions and 289 deletions
src/assets/css/UpgradedVersion.css
View file @ 86861cd0
html, body{
background: #fff;
}
.UpgradedVersion-box .edit_div { .UpgradedVersion-box .edit_div {
min-width: 30px; min-width: 30px;
height: 100%; height: 100%;
...@@ -36,6 +39,7 @@ ...@@ -36,6 +39,7 @@
.introduceFooter-text img { .introduceFooter-text img {
width: 28px; width: 28px;
height: 28px; height: 28px;
object-fit: cover;
display: inline-block; display: inline-block;
margin: 0 9px; margin: 0 9px;
} }
...@@ -45,7 +49,7 @@ ...@@ -45,7 +49,7 @@
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
font-size: 22px; font-size: 22px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: 400; font-weight: 400;
color: #2A2A2A; color: #2A2A2A;
margin: 0 9px 0 0; margin: 0 9px 0 0;
...@@ -172,7 +176,7 @@ img { ...@@ -172,7 +176,7 @@ img {
height: 80px; height: 80px;
overflow: hidden; overflow: hidden;
font-size: 66px; font-size: 66px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: 400; font-weight: 400;
color: #2A2A2A; color: #2A2A2A;
padding: 0 280px 0 0; padding: 0 280px 0 0;
...@@ -195,7 +199,7 @@ img { ...@@ -195,7 +199,7 @@ img {
.featureHome-text-box .edit_div { .featureHome-text-box .edit_div {
font-size: 45px; font-size: 45px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: bold; font-weight: bold;
/* color: #CC0066; */ /* color: #CC0066; */
} }
...@@ -235,6 +239,7 @@ img { ...@@ -235,6 +239,7 @@ img {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: block; display: block;
object-fit: cover;
} }
.featureHome-right { .featureHome-right {
...@@ -254,7 +259,7 @@ img { ...@@ -254,7 +259,7 @@ img {
height: 540px; height: 540px;
overflow: hidden; overflow: hidden;
font-size: 45px; font-size: 45px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
} }
...@@ -454,6 +459,7 @@ img { ...@@ -454,6 +459,7 @@ img {
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: cover;
} }
.MasterMapList-4 .MasterMapList-2 { .MasterMapList-4 .MasterMapList-2 {
...@@ -503,7 +509,7 @@ img { ...@@ -503,7 +509,7 @@ img {
top: 1137px; top: 1137px;
left: 70px; left: 70px;
right: 70px; right: 70px;
height: 330px; height: 300px;
overflow: hidden; overflow: hidden;
font-size: 23px; font-size: 23px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
...@@ -559,6 +565,7 @@ img { ...@@ -559,6 +565,7 @@ img {
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: cover;
} }
.UpgradedVersionDetails-detailsTop { .UpgradedVersionDetails-detailsTop {
...@@ -591,21 +598,21 @@ img { ...@@ -591,21 +598,21 @@ img {
.UpgradedVersionDetails-num { .UpgradedVersionDetails-num {
height: 38px; height: 38px;
overflow: hidden; overflow: hidden;
margin-top: 5px;
} }
.UpgradedVersionDetails-num span { .UpgradedVersionDetails-num span {
font-size: 76px; font-size: 76px;
font-weight: bold; font-weight: bold;
/* font-family: FZCuSong-B09S; */ /* font-family: FZCuSong-B09S !important; */
left: 0; left: 0;
top: -23px; top: -21px;
} }
.UpgradedVersionDetails-Img-two { .UpgradedVersionDetails-Img-two {
width: 264px; width: 264px;
height: 21px; height: 21px;
margin-top: 38px;
margin-top: 77px;
margin-bottom: 20px; margin-bottom: 20px;
} }
...@@ -618,11 +625,10 @@ img { ...@@ -618,11 +625,10 @@ img {
} }
.UpgradedVersionDetails-Img-two p { .UpgradedVersionDetails-Img-two p {
left: 0;
right: 0;
top: -31px;
font-size: 24px; font-size: 24px;
font-weight: 500; font-weight: 500;
margin-top: 38px;
margin-bottom: 20px;
} }
.UpgradedVersionDetails-T { .UpgradedVersionDetails-T {
...@@ -630,7 +636,7 @@ img { ...@@ -630,7 +636,7 @@ img {
height: 44px; height: 44px;
overflow: hidden; overflow: hidden;
font-size: 38px; font-size: 38px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: 400; font-weight: 400;
color: #2A2A2A; color: #2A2A2A;
left: -7px; left: -7px;
...@@ -763,7 +769,7 @@ img { ...@@ -763,7 +769,7 @@ img {
.UpgradedVersion-sTR { .UpgradedVersion-sTR {
font-size: 45px; font-size: 45px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: 400; font-weight: 400;
color: #2A2A2A; color: #2A2A2A;
} }
...@@ -804,7 +810,8 @@ img { ...@@ -804,7 +810,8 @@ img {
.UpgradedVersion-subIdeImgBoxL img { .UpgradedVersion-subIdeImgBoxL img {
width: 44px; width: 44px;
height: 1005; height: 100%;
object-fit: cover;
} }
.UpgradedVersion-subIdeImgBoxR { .UpgradedVersion-subIdeImgBoxR {
...@@ -879,6 +886,7 @@ img { ...@@ -879,6 +886,7 @@ img {
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: cover;
} }
.subIdeImgForm1Box { .subIdeImgForm1Box {
...@@ -932,7 +940,7 @@ img { ...@@ -932,7 +940,7 @@ img {
height: 70px; height: 70px;
overflow: hidden; overflow: hidden;
font-size: 60px; font-size: 60px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: 400; font-weight: 400;
color: #2A2A2A; color: #2A2A2A;
} }
...@@ -961,7 +969,7 @@ img { ...@@ -961,7 +969,7 @@ img {
right: 124px; right: 124px;
height: 53px; height: 53px;
font-size: 49px; font-size: 49px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: 400; font-weight: 400;
color: #2A2A2A; color: #2A2A2A;
} }
...@@ -986,6 +994,7 @@ img { ...@@ -986,6 +994,7 @@ img {
.UpgradedVersion-headerTitle-two .edit_div { .UpgradedVersion-headerTitle-two .edit_div {
height: 40px; height: 40px;
text-overflow: ellipsis;
} }
.UpgradedVersion-headerTitle-three { .UpgradedVersion-headerTitle-three {
...@@ -1040,7 +1049,7 @@ img { ...@@ -1040,7 +1049,7 @@ img {
.UpgradedVersion-header .edit_div { .UpgradedVersion-header .edit_div {
font-size: 38px; font-size: 38px;
font-weight: 400; font-weight: 400;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
color: #2A2A2A; color: #2A2A2A;
} }
...@@ -1100,6 +1109,8 @@ img { ...@@ -1100,6 +1109,8 @@ img {
.Template-img img { .Template-img img {
width: 100%; width: 100%;
height: 100%;
object-fit: cover;
padding: 10px; padding: 10px;
display: block; display: block;
} }
......
src/assets/css/tripIndexNew.css
View file @ 86861cd0
.LeaveGroupDownload-form div, .LeaveGroupDownload-form dl, html, body{
background: #fff;
}
.LeaveGroupDownload-form dl,
.LeaveGroupDownload-form dt, .LeaveGroupDownload-form dd, .LeaveGroupDownload-form dt, .LeaveGroupDownload-form dd,
.LeaveGroupDownload-form ul, .LeaveGroupDownload-form ol, .LeaveGroupDownload-form ul, .LeaveGroupDownload-form ol,
.LeaveGroupDownload-form li, .LeaveGroupDownload-form h1, .LeaveGroupDownload-form li, .LeaveGroupDownload-form h1,
...@@ -245,6 +248,7 @@ ...@@ -245,6 +248,7 @@
.travelDaysTitlle-left { .travelDaysTitlle-left {
flex-shrink: 0; flex-shrink: 0;
margin-left: 22px;
} }
.travelDaysTitlle-left-text { .travelDaysTitlle-left-text {
...@@ -340,7 +344,8 @@ ...@@ -340,7 +344,8 @@
.travelDaysMasterMap-twoImg { .travelDaysMasterMap-twoImg {
max-width: 335px; max-width: 335px;
max-height: 189px; /* max-height: 189px; */
height: 44.5%;
overflow: hidden; overflow: hidden;
border: 2px solid #FFFFFF; border: 2px solid #FFFFFF;
border-radius: 18px; border-radius: 18px;
...@@ -354,7 +359,7 @@ ...@@ -354,7 +359,7 @@
} }
.travelDaysContent { .travelDaysContent {
min-height: 360px; min-height: 360px;
max-height:600px; max-height:600px;
overflow:hidden; overflow:hidden;
line-height: 38px; line-height: 38px;
...@@ -425,21 +430,31 @@ ...@@ -425,21 +430,31 @@
} }
.LeaveGroupDownload-form .expense { .LeaveGroupDownload-form .expense {
padding: 0 20px; padding: 0 30px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.LeaveGroupDownload-form .expense .right { .LeaveGroupDownload-form .expense .right {
margin-bottom: 20px; margin-bottom: 20px;
} }
.LeaveGroupDownload-form .expense .right * { .LeaveGroupDownload-form .expense .right * {
color: #000000 !important; color: #000000 !important;
font-size: 15px !important; font-size: 15px !important;
padding: 0 !important; padding: 0 !important;
margin: 0 !important; margin: 0 !important;
line-height: 160%; line-height: 160%;
} }
.travelControlTrip .LeaveGroupDownload-form .Passenger-table{
width: 100% !important;
padding: 0 30px;
margin: 0;
}
.travelControlTrip .LeaveGroupDownload-form .footer-div {
text-align: center;
padding: 25px 0;
border-top: none;
}
.UpgradedVersion-header { .UpgradedVersion-header {
top: 0; top: 0;
...@@ -484,13 +499,13 @@ ...@@ -484,13 +499,13 @@
.UpgradedVersion-header .edit_div { .UpgradedVersion-header .edit_div {
font-size: 38px; font-size: 38px;
font-weight: 400; font-weight: 400;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
color: #2A2A2A; color: #2A2A2A;
} }
.UpgradedVersion-box { .UpgradedVersion-box {
width: 1123px; width: 1123px;
height: 1588px; height: 1478px;
overflow: hidden; overflow: hidden;
} }
...@@ -519,10 +534,9 @@ ...@@ -519,10 +534,9 @@
.otherJourney-introduceFooter { .otherJourney-introduceFooter {
left: 0; left: 0;
right: 0; right: 0;
bottom: 32px; margin-bottom: 32px;
width: 100%; width: 100%;
height: 34px; height: 34px;
background-size: 100% 100%;
} }
.introduceFooterBJ { .introduceFooterBJ {
...@@ -559,7 +573,7 @@ ...@@ -559,7 +573,7 @@
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
font-size: 22px; font-size: 22px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S !important;
font-weight: 400; font-weight: 400;
color: #2A2A2A; color: #2A2A2A;
margin: 0 9px 0 0; margin: 0 9px 0 0;
......
src/components/LeaveGroupDownload/index.vue
View file @ 86861cd0
<template> <template>
<div id="pdf_1" v-if="orderMsg"> <div id="pdf_1" v-if="orderMsg&&dataAll">
<div class="trip-adviser"> <div class="UpgradedVersion-box UpgradedVersion-homebj relative" style="height: 1478px;">
<h1 class="trip-nav-title"> <div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
<span>{{ vshowL ? "出团通知书：" : "" }}</span> <Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
{{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
</h1> <div class="travelDaysTitlle row-aic">
<p> <div class="travelDaysTitlle-left">
尊敬的旅客：<br />感谢您选择我们的旅游服务。为了确保各位旅客有更好的旅游体验，请详细阅读《出团通知书》的各项内容。如有任何问题，请拨打通知书内的本团领队电话或机场服务人员电话。 <div class="travelDaysTitlle-left-text column-ajc">
在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！ <div class="travelDaysTitlle-left-textOne">
</p> <span></span>
</div> </div>
<table class="baseTable trip-v3-base"> <div class="travelDaysTitlle-left-textTwo">
<tbody> <span></span>
<tr> </div>
<td class="essential-item jianju"> </div>
<p class="pkey">线路</p>
<p class="pvalue">{{ orderMsg.lineName }}</p>
</td>
<td class="essential-item jianju">
<p class="pkey">出发日期</p>
<p class="pvalue">{{ orderMsg.startDate }}</p>
</td>
<td class="essential-item jianju">
<p class="pkey">返回日期</p>
<p class="pvalue">{{ orderMsg.endDate }}</p>
</td>
<td class="essential-item jianju_b">
<p class="pkey">行程天数</p>
<p class="pvalue">{{ orderMsg.dayNum }}</p>
</td>
<td rowspan="2">
<div style="width: 160px; height:160px;margin-left:20px;">
<img style="width: 160px; height:160px;" :src="'data:image/png;base64,' + WeiXinShareImgSrc"
alt="获取微信小程序分享链接" />
</div> </div>
</td> <div class="travelDaysTitlle-right">
</tr> <div class="travelDaysTitlle-right-text row-aic"
<tr> :style="{'background': dataAll&&dataAll.tripColor,'font-size': getFontSize(orderMsg.lineteamName+orderMsg.dayNum),'color':textColor}">
<td class="essential-item jianju" colspan="2"> {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
<p class="pkey">系列</p> </div>
<p class="pvalue">{{ orderMsg.lineteamName }}</p> </div>
</td> </div>
<td class="essential-item jianju_b" colspan="2"> <div style="margin: 0 30px;">
<p class="pkey">团队编号</p> <div class="trip-adviser" style="margin-top: 20px;">
<p class="pvalue">{{ orderMsg.tcnum }}</p> <!-- <h1 class="trip-nav-title">
</td> <span>{{ vshowL ? "出团通知书：" : "" }}</span>
</tr> {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
</tbody> </h1> -->
</table> <p>
<div class="trip-v3-title small-margin"> 尊敬的旅客：<br />感谢您选择我们的旅游服务。为了确保各位旅客有更好的旅游体验，请详细阅读《出团通知书》的各项内容。如有任何问题，请拨打通知书内的本团领队电话或机场服务人员电话。
<h2>集合地点&amp;联系人</h2> 在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！
</div>
<table class="baseTable trip-v3-base">
<tbody>
<tr>
<td class="essential-item jianju">
<p class="pkey">本团领队</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.leaderInfo
: orderMsg.leaderName +
(orderMsg.leaderMobile != null
? "/" + orderMsg.leaderMobile
: "")
}}
</p>
</td>
<td class="essential-item jianju">
<p class="pkey">集合时间</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringTime
: orderMsg.gatheringTime
}}
</p>
</td>
<td class="essential-item jianju">
<p class="pkey">机场服务</p>
<p class="pvalue">
<template v-if="
orderMsg &&
orderMsg.airportServicePerson &&
orderMsg.airportServicePerson != ''
">
{{ orderMsg.airportServicePerson }}
</template>
</p>
</td>
<td class="essential-item jianju_b">
<p class="pkey">集合标识</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatherIdent
: orderMsg.bName
}}
</p>
</td>
</tr>
<tr>
<td class="essential-item jianju" colspan="2">
<p class="pkey">紧急联系人</p>
<p class="pvalue">
<span v-if="vshowLLR">
<template v-if="orderMsg.emergencyContact != ''">
{{ orderMsg.emergencyContact }}
</template>
</span>
</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<p class="pkey">集合地点</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringAddress
: orderMsg.gatheringAddress
}}
</p> </p>
</td> </div>
</tr> <table class="baseTable trip-v3-base">
</tbody> <tbody>
</table> <tr>
<template v-if='vshowB'> <td class="essential-item jianju">
<div class="trip-v3-title small-margin"> <p class="pkey">线路</p>
参考航班 <p class="pvalue">{{ orderMsg.lineName }}</p>
</div> </td>
<div class="hangban-info"> <td class="essential-item jianju">
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list" <p class="pkey">出发日期</p>
:class="{'guoneiLine':lineId==90}"> <p class="pvalue">{{ orderMsg.startDate }}</p>
<thead class="flight_header"> </td>
<tr> <td class="essential-item jianju">
<th width="140">出发时间<span>(当地)</span></th> <p class="pkey">返回日期</p>
<th width="160">抵达时间<span>(当地)</span></th> <p class="pvalue">{{ orderMsg.endDate }}</p>
<th width="160"> </td>
<template v-if="lineId==90">起飞机场/出发城市</template> <td class="essential-item jianju_b">
<template v-else>起飞机场</template> <p class="pkey">行程天数</p>
</th> <p class="pvalue">{{ orderMsg.dayNum }}</p>
<th width="18" class="gap">&nbsp;</th> </td>
<th width="160"> <td rowspan="2">
<template v-if="lineId==90">抵达机场/到达城市</template> <div style="width: 160px; height:160px;margin-left:20px;">
<template v-else>抵达机场</template> <img style="width: 160px; height:160px;" :src="'data:image/png;base64,' + WeiXinShareImgSrc"
</th> alt="获取微信小程序分享链接" />
<th width="18" class="gap">&nbsp;</th> </div>
<th width="140">航空公司</th> </td>
<th width="90">航班编号</th> </tr>
<th width="18" class="gap">&nbsp;</th> <tr>
<th width="100">经停城市</th> <td class="essential-item jianju" colspan="2">
</tr> <p class="pkey">系列</p>
</thead> <p class="pvalue">{{ orderMsg.lineteamName }}</p>
<tbody style="padding-top:12px;" </td>
v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0"> <td class="essential-item jianju_b" colspan="2">
<tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex"> <p class="pkey">团队编号</p>
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span <p class="pvalue">{{ orderMsg.tcnum }}</p>
class="num">{{flight.departureTime}}</span></td> </td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span </tr>
class="num">{{flight.arrivalTime}}</span></td> </tbody>
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td> </table>
<td width="18" class="gap">&nbsp;</td> <div class="trip-v3-title small-margin">
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td> <h2>集合地点&amp;联系人</h2>
<td width="18" class="gap">&nbsp;</td> </div>
<td width="140">{{flight.alName}}</td> <table class="baseTable trip-v3-base">
<td width="110">{{flight.flightNumber}} <tbody>
<span style="color:green;">{{(flight.flightState==1)?"OK":"暂定"}}</span></td> <tr>
<td width="18" class="gap">&nbsp;</td> <td class="essential-item jianju">
<td width="100">{{flight.stopoverAirPortName}}</td> <p class="pkey">本团领队</p>
</tr> <p class="pvalue">
</tbody> {{
<tbody> orderTripdiff != null
<tr> ? orderTripdiff.leaderInfo
<td colspan="10" align="center" style="color:#333;font-size:14px;"> : orderMsg.leaderName +
1.本航班表僅提供參考，正確航班請點選您的出發日期。 2. (orderMsg.leaderMobile != null
不同航班，餐食及行程安排皆有所不同，正確行程，請點選您的出發日期。 ? "/" + orderMsg.leaderMobile
</td> : "")
</tr> }}
</tbody> </p>
</table> </td>
<td class="essential-item jianju">
<p class="pkey">集合时间</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringTime
: orderMsg.gatheringTime
}}
</p>
</td>
<td class="essential-item jianju">
<p class="pkey">机场服务</p>
<p class="pvalue">
<template v-if="
orderMsg &&
orderMsg.airportServicePerson &&
orderMsg.airportServicePerson != ''
">
{{ orderMsg.airportServicePerson }}
</template>
</p>
</td>
<td class="essential-item jianju_b">
<p class="pkey">集合标识</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatherIdent
: orderMsg.bName
}}
</p>
</td>
</tr>
<tr>
<td class="essential-item jianju" colspan="2">
<p class="pkey">紧急联系人</p>
<p class="pvalue">
<span v-if="vshowLLR">
<template v-if="orderMsg.emergencyContact != ''">
{{ orderMsg.emergencyContact }}
</template>
</span>
</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<p class="pkey">集合地点</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringAddress
: orderMsg.gatheringAddress
}}
</p>
</td>
</tr>
</tbody>
</table>
<template v-if='vshowB'>
<div class="trip-v3-title small-margin">
参考航班
</div>
<div class="hangban-info">
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list"
:class="{'guoneiLine':lineId==90}">
<thead class="flight_header">
<tr>
<th width="140">出发时间<span>(当地)</span></th>
<th width="160">抵达时间<span>(当地)</span></th>
<th width="160">
<template v-if="lineId==90">起飞机场/出发城市</template>
<template v-else>起飞机场</template>
</th>
<th width="18" class="gap">&nbsp;</th>
<th width="160">
<template v-if="lineId==90">抵达机场/到达城市</template>
<template v-else>抵达机场</template>
</th>
<th width="18" class="gap">&nbsp;</th>
<th width="140">航空公司</th>
<th width="90">航班编号</th>
<th width="18" class="gap">&nbsp;</th>
<th width="100">经停城市</th>
</tr>
</thead>
<tbody style="padding-top:12px;"
v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0">
<tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex">
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.arrivalTime}}</span></td>
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="140">{{flight.alName}}</td>
<td width="110">{{flight.flightNumber}}
<span style="color:green;">{{(flight.flightState==1)?"OK":"暂定"}}</span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="100">{{flight.stopoverAirPortName}}</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="10" align="center" style="color:#333;font-size:14px;">
1.本航班表僅提供參考，正確航班請點選您的出發日期。 2.
不同航班，餐食及行程安排皆有所不同，正確行程，請點選您的出發日期。
</td>
</tr>
</tbody>
</table>
</div>
</template>
</div>
<div style="width: 100%;height:40px;"></div>
</div> </div>
</template> </div>
<div style="width: 100%;height:40px;"></div>
</div> </div>
</template> </template>
<script> <script>
import Header from "./components/header";
export default { export default {
components: {}, components: {
Header
},
props: [ props: [
"dataAll",
"vshowJ", "vshowJ",
"vshowL", "vshowL",
"orderMsg", "orderMsg",
...@@ -198,12 +230,42 @@ ...@@ -198,12 +230,42 @@
"lineId" "lineId"
], ],
data() { data() {
return {}; return {
backgroundColor: '',
textColor: '',
textColorOne: '',
};
}, },
methods: {}, methods: {
getFontSize(title){
if(title.length+2>60){
return 929/60 +'px'
}else{
return '30px'
}
},
},
computed: {}, computed: {},
watch: { watch: {
dataAll: {
handler(val, oldVal) {
if(val&&val.tripColor){
this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
let rgba = this.hexToRgb(val.tripColor, 1)
rgba = rgba.split(',')
let rgba0 = rgba[0].split('(')
let arr = [rgba0[1],rgba[1],rgba[2]]
if(this.getRgbLevel(arr)>50){
this.textColor = "#fff"
}else{
this.textColor = "#333"
}
}
},
deep: true,
immediate: true
},
orderMsg: { orderMsg: {
handler(val, oldVal) {}, handler(val, oldVal) {},
deep: true, deep: true,
......
src/components/LeaveGroupDownload/travelDays.vue
View file @ 86861cd0
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div> <div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
</div> </div>
<div class="travelDaysMasterMap-two absolute z-index2"> <div class="travelDaysMasterMap-two absolute z-index2">
<template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgOne">
<div class="travelDaysMasterMap-twoImg relative bjF6" <div class="travelDaysMasterMap-twoImg relative bjF6"
:style="{'color':'#fff'}" :style="{'color':'#fff'}"
:id="'travelDaysImg_two'+index" :id="'travelDaysImg_two'+index"
...@@ -59,8 +58,6 @@ ...@@ -59,8 +58,6 @@
</template> </template>
</template> </template>
</div> </div>
</template>
<template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgTwo">
<div class="travelDaysMasterMap-twoImg relative bjF6" style="margin-top: 47px;" <div class="travelDaysMasterMap-twoImg relative bjF6" style="margin-top: 47px;"
:style="{'color':'#fff'}" :style="{'color':'#fff'}"
:id="'travelDaysImg_three'+index" :id="'travelDaysImg_three'+index"
...@@ -81,15 +78,19 @@ ...@@ -81,15 +78,19 @@
</template> </template>
</template> </template>
</div> </div>
</template>
</div> </div>
</div> </div>
<div class="travelDaysContent column"> <div class="travelDaysContent column">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.details"> <div class="travelDaysContent-text" v-for="(jindian,j) in item.details"
<span>【{{jindian.title}}】</span> v-if="item.details.length>0">
<span>{{jindian.title?'【'+jindian.title+'】':''}}</span>
{{jindian.content}} {{jindian.content}}
</div> </div>
<div class="travelDaysContent-text"
v-else>
<span>暂无描述</span>
</div>
</div> </div>
<div class="travelDaysdetails"> <div class="travelDaysdetails">
...@@ -154,31 +155,6 @@ ...@@ -154,31 +155,6 @@
}, },
methods: { methods: {
getShow(Id,HeightNum,item){
item.imgMapId = Id
if(HeightNum>=243){
item.showImgOne = true
}else{
item.showImgOne = false
}
if(HeightNum>=478){
item.showImgTwo = true
}else{
item.showImgTwo = false
}
this.$forceUpdate()
},
getHeigthNum(Id,item){
let that = this
setTimeout(()=>{
var Height = document.getElementById(Id);
if(Height){
let HeightNum = Height.offsetHeight
that.getShow(Id,HeightNum,item)
}
},300)
},
getFontSize(title){ getFontSize(title){
if(title.length>60){ if(title.length>60){
return 929/60 +'px' return 929/60 +'px'
...@@ -285,9 +261,7 @@ ...@@ -285,9 +261,7 @@
}, },
tripList: { tripList: {
handler(val, oldVal) { handler(val, oldVal) {
this.tripList.forEach((x,index)=>{
this.getHeigthNum(`'travelDaysMasterMap_'+${this.index}`)
})
}, },
deep: true, deep: true,
immediate: true immediate: true
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 86861cd0
...@@ -41,25 +41,27 @@ ...@@ -41,25 +41,27 @@
<div class="travelControlTrip"> <div class="travelControlTrip">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div> <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;"> <el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
<el-col :span="14"> <el-col :span="14" class="row-aic">
<el-dropdown trigger="click"> <div class="el-dropdown-link" style=" height: 30px;
<span class="el-dropdown-link">行程下载 line-height: 30px;
<i class="el-icon-arrow-down el-icon--right"></i> background-color: #E95252;
</span> color: #fff;
<el-dropdown-menu slot="dropdown" class="travelControlDropDown"> font-size: 12px;
<el-dropdown-item width: 80px;
@click.native="toPDF_2023(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')"> text-align: center;
2023版PDF border-radius: 4px;
</el-dropdown-item> cursor: pointer;
</el-dropdown-menu> margin-left: 20px;"
</el-dropdown> @click="toPDF_2023(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')">
<el-checkbox v-model="isShowTime">显示行程日期</el-checkbox> 2023版PDF
</div>
<el-checkbox class="marginL11" v-model="isShowTime">显示行程日期</el-checkbox>
</el-col> </el-col>
</el-row> </el-row>
<div id="pdfNode" class="LeaveGroupDownload-form"> <div id="pdfNode" class="LeaveGroupDownload-form">
<div id="pdfDom" style="padding:0 20px;"> <div id="pdfDom">
<!-- 首页 --> <!-- 首页 -->
<LeaveGroupDownload :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc" <LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
:orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId"> :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId">
</LeaveGroupDownload> </LeaveGroupDownload>
...@@ -287,26 +289,30 @@ ...@@ -287,26 +289,30 @@
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
method: 'post', method: 'post',
url: urlObj.DomainUrl + '/api/file/DownLoadPdf2023', url: urlObj.DomainUrl + '/api/file/DownLoadPdf2023Url',
data: { data: {
"msg": msg "msg": msg
} }
}).then(res => { }).then(res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1&&res.data.data) {
let sign = title + "V2" let sign = title + "V2"
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 + let path = res.data.data
'.pdf&&fPath=' + res.data.data); a.setAttribute('href', 'https://microservice.oytour.com/task/create/pdf/'+encodeURIComponent(path));
a.click(); a.click();
setTimeout(()=>{
this.pdfLoading = false
},25000)
} else { } else {
this.pdfLoading = false
this.$message.error('PDF获取失败'); this.$message.error('PDF获取失败');
} }
this.pdfLoading = false
}).catch(err => { }).catch(err => {
}) })
}, },
DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式 DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
var aDate, oDate1, oDate2, iDays var aDate, oDate1, oDate2, iDays
aDate = sDate1.split("-") aDate = sDate1.split("-")
...@@ -351,14 +357,6 @@ ...@@ -351,14 +357,6 @@
}, },
//初始化行程 //初始化行程
initTrip(res, data) { initTrip(res, data) {
let arrlist = function (arr) {
arr.forEach(x => {
x.showImgOne = true
x.showImgTwo = true
x.imgMapId = null
})
}
arrlist(res.data.data.dayList)
this.tripList = res.data.data.dayList; this.tripList = res.data.data.dayList;
this.feature = res.data.data.feature this.feature = res.data.data.feature
this.showType = this.feature.featureType; this.showType = this.feature.featureType;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ 86861cd0
...@@ -31,17 +31,17 @@ ...@@ -31,17 +31,17 @@
</div> </div>
<!-- UpgradedVersionDetails-two 02 UpgradedVersionDetails-three 03--> <!-- UpgradedVersionDetails-two 02 UpgradedVersionDetails-three 03-->
<div class="UpgradedVersionDetails-Title UpgradedVersionDetails-two"> <div class="UpgradedVersionDetails-Title UpgradedVersionDetails-two">
<div class="UpgradedVersionDetails-Img-one relative"> <div class="UpgradedVersionDetails-Img-one">
<div class="UpgradedVersionDetails-num relative" :style="{'color':TripColor}"> <div class="UpgradedVersionDetails-num relative" :style="{'color':TripColor}">
<span class="absolute">{{'0'+(i+1)}}</span> <span class="absolute">{{'0'+(i+1)}}</span>
</div> </div>
<div class="UpgradedVersionDetails-T absolute"> <div class="UpgradedVersionDetails-T">
<vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv>
</div> </div>
</div> </div>
<div class="UpgradedVersionDetails-Img-two relative"> <div class="UpgradedVersionDetails-Img-two">
<template v-for="(items,indexs) in subscriptText"> <template v-for="(items,indexs) in subscriptText">
<p :key="indexs+10000" class="absolute row-sb" v-if="indexs==i" :style="{'color':TripColor}"> <p :key="indexs+10000" class="row-sb" v-if="indexs==i" :style="{'color':TripColor}">
<span v-for="(t,i) in items.Name" :key="i+100000">{{t}}</span> <span v-for="(t,i) in items.Name" :key="i+100000">{{t}}</span>
</p> </p>
</template> </template>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ 86861cd0
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除页面" placement="top"> <el-tooltip class="item" effect="dark" content="删除页面" placement="top">
<div @click="toDeletePages" v-if="isDeletePage"> <div @click="toDeletePages" v-if="isDeletePage">
<i class="el-icon-delete"></i> <i class="el-icon-delete"></i>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ 86861cd0
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</div> </div>
</div> </div>
<!-- subIdeImgBox 食景副标题图 --> <!-- subIdeImgBox 食景副标题图 -->
<template v-if="FeatureData.pageTitle=='宿'||FeatureData.pageTitle=='食'||FeatureData.pageTitle=='景'"> <template v-if="FeatureData.pageType==4||FeatureData.pageType==5||FeatureData.pageType==6">
<div :class="[Template==1?'':'subIdeImgBox']"> <div :class="[Template==1?'':'subIdeImgBox']">
<div class="UpgradedVersion-subIdeImgBox absolute row z-index1"> <div class="UpgradedVersion-subIdeImgBox absolute row z-index1">
<div class="UpgradedVersion-subIdeImgBoxL" :style="{'background':TripColor}"> <div class="UpgradedVersion-subIdeImgBoxL" :style="{'background':TripColor}">
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</div> </div>
</template> </template>
<!-- 介绍标题 --> <!-- 介绍标题 -->
<div class="UpgradedVersion-intTitle" v-if="FeatureData.pageTitle=='介绍'"> <div class="UpgradedVersion-intTitle" v-if="FeatureData.pageType==2">
<div class="UpgradedVersion-intTitle-one absolute"> <div class="UpgradedVersion-intTitle-one absolute">
<vEditDiv :canEdit='canEdit' v-model="FeatureData.dataObj.MainName"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="FeatureData.dataObj.MainName"></vEditDiv>
</div> </div>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 86861cd0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<Header :TripColor="TripColor" :canEdit="canEdit" :FeatureItem="item"></Header> <Header :TripColor="TripColor" :canEdit="canEdit" :FeatureItem="item"></Header>
<!-- 首页 --> <!-- 首页 -->
<featureHome v-if="item.pageType==1" :canEdit="canEdit" :index="index" :FeatureItem="item" :TripColor="TripColor" <featureHome v-if="item.pageType==1" :canEdit="canEdit" :index="index" :FeatureItem="item" :TripColor="TripColor"
@toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome> @UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
<!-- 其余页 --> <!-- 其余页 -->
<div v-else> <div v-else>
<headerTitle :FeatureItem="item" :TripColor="TripColor" :canEdit="canEdit"></headerTitle> <headerTitle :FeatureItem="item" :TripColor="TripColor" :canEdit="canEdit"></headerTitle>
...@@ -118,6 +118,11 @@ ...@@ -118,6 +118,11 @@
}; };
}, },
methods: { methods: {
UploadImg(pageType,index,url){
if(pageType==1){
this.pageList[index].dataObj.ImgList[0].url = url
}
},
getPageObj() { getPageObj() {
var pageObj = { var pageObj = {
pageTitle: '首页', //页面名称 pageTitle: '首页', //页面名称
......
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