Commit 6339ad46 authored by youjie's avatar youjie

no message

parent 3a5f180b
...@@ -191,7 +191,9 @@ ...@@ -191,7 +191,9 @@
margin-left: 21px; margin-left: 21px;
} }
.travelDaysTitlle-right-text{ .travelDaysTitlle-right-text{
padding: 25px 25px 25px 36px; min-height: 124px;
/* padding: 25px 25px 25px 36px; */
padding: 0 25px 0 36px;
border-radius: 100px 0px 0px 100px; border-radius: 100px 0px 0px 100px;
-webkit-border-radius: 100px 0px 0px 100px; -webkit-border-radius: 100px 0px 0px 100px;
-moz-border-radius: 100px 0px 0px 100px; -moz-border-radius: 100px 0px 0px 100px;
...@@ -204,6 +206,9 @@ ...@@ -204,6 +206,9 @@
overflow: hidden; overflow: hidden;
} }
.travelDaysMasterMap img{ .travelDaysMasterMap img{
left: 0;
top: 0;
right: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
...@@ -290,6 +295,19 @@ ...@@ -290,6 +295,19 @@
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
.LeaveGroupDownload-form .travelControlTrip .module-title {
text-align: center;
font-size: 18px;
color: #333;
padding-top: 30px;
padding-bottom: 30px;
}
.LeaveGroupDownload-form .expense{
padding: 0 20px;
}
.LeaveGroupDownload-form .expense .right {
margin-bottom: 20px;
}
.UpgradedVersion-box{ .UpgradedVersion-box{
width: 1123px; width: 1123px;
height: 1588px; height: 1588px;
......
...@@ -138,6 +138,9 @@ ...@@ -138,6 +138,9 @@
<el-option :value="1" label="跟团游"></el-option> <el-option :value="1" label="跟团游"></el-option>
<el-option :value="2" label="签证"></el-option> <el-option :value="2" label="签证"></el-option>
<el-option :value="4" label="单机票"></el-option> <el-option :value="4" label="单机票"></el-option>
<el-option :value="5" label="车"></el-option>
<el-option :value="6" label="酒店"></el-option>
<el-option :value="7" label="门票"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</div> </div>
<div class="UpgradedVersion-header-right"> <div class="UpgradedVersion-header-right">
<div class="UpgradedVersion-header-title"> <div class="UpgradedVersion-header-title">
<span class="edit_div">{{LineShortName}}</span> <span class="edit_div">{{orderMsg.lineName}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
}, },
props: [ props: [
'TripColor', 'TripColor',
'FeatureItem' 'orderMsg'
], ],
data() { data() {
return { return {
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
deep: false, deep: false,
immediate: true immediate: true
}, },
FeatureItem: { orderMsg: {
handler(val,oldVal) { handler(val,oldVal) {
}, },
......
...@@ -202,6 +202,7 @@ ...@@ -202,6 +202,7 @@
<div id="pdfNode" class="LeaveGroupDownload-form"> <div id="pdfNode" class="LeaveGroupDownload-form">
<div id="pdfDom" style="padding:0 20px;"> <div id="pdfDom" style="padding:0 20px;">
<!-- 首页 --> <!-- 首页 -->
<!--
<LeaveGroupDownload <LeaveGroupDownload
:vshowJ="vshowJ" :vshowJ="vshowJ"
:vshowL="vshowL" :vshowL="vshowL"
...@@ -210,10 +211,27 @@ ...@@ -210,10 +211,27 @@
:orderTripdiff="orderTripdiff" :orderTripdiff="orderTripdiff"
:vshowLLR="vshowLLR" :vshowLLR="vshowLLR"
:vshowB="vshowB" :vshowB="vshowB"
:lineId="lineId"></LeaveGroupDownload> :lineId="lineId"></LeaveGroupDownload> -->
<!-- 行程特色 --> <!-- 行程特色 -->
<ItineraryFeatures :feature="feature"></ItineraryFeatures> <!-- <ItineraryFeatures :feature="feature"></ItineraryFeatures> -->
<travelDays :TripColor="TripColor"></travelDays>
<!-- 行程天数 -->
<!-- <travelDays
:dataAll="dataAll"
:orderMsg="orderMsg"
:orderTripdiff="orderTripdiff"
:tripList="tripList"
:vshowD="vshowD"
:vshowK="vshowK"
></travelDays> -->
<!-- 团队说明 -->
<!-- <TourFareDescription
:vshowE="vshowE"
:vshowF="vshowF"
:dataList="dataList"
:feature="feature"></TourFareDescription> -->
</div> </div>
</div> </div>
...@@ -230,6 +248,7 @@ ...@@ -230,6 +248,7 @@
import LeaveGroupDownload from './LeaveGroupDownload/index' import LeaveGroupDownload from './LeaveGroupDownload/index'
import ItineraryFeatures from './LeaveGroupDownload/ItineraryFeatures' import ItineraryFeatures from './LeaveGroupDownload/ItineraryFeatures'
import travelDays from './LeaveGroupDownload/travelDays' import travelDays from './LeaveGroupDownload/travelDays'
import TourFareDescription from './LeaveGroupDownload/TourFareDescription'
import { import {
setTimeout setTimeout
} from 'timers'; } from 'timers';
...@@ -245,11 +264,12 @@ ...@@ -245,11 +264,12 @@
fiveday, fiveday,
LeaveGroupDownload, LeaveGroupDownload,
ItineraryFeatures, ItineraryFeatures,
travelDays travelDays,
TourFareDescription
}, },
data() { data() {
return { return {
TripColor: '#CC0066', dataAll: null,
isShowTime: true, isShowTime: true,
CurrentUserInfo: {}, //当前用户信息 CurrentUserInfo: {}, //当前用户信息
Typevalue: -1, Typevalue: -1,
...@@ -961,9 +981,12 @@ ...@@ -961,9 +981,12 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = (res.data.data); let data = (res.data.data);
this.dataAll = data
this.orderTripdiff = data.orderTripdiff; this.orderTripdiff = data.orderTripdiff;
this.lineId = data.lineId; this.lineId = data.lineId;
this.orderMsg = data.orderMsg; this.orderMsg = data.orderMsg;
console.log(this.orderTripdiff)
console.log(this.orderMsg,'------')
if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) { if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson); this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
if (this.orderMsg.outNotice == 1) { if (this.orderMsg.outNotice == 1) {
......
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