Skip to content

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

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

parents fc9e46fb 659fc233
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1422 additions and 1718 deletions
src/assets/css/tripIndexNewHV.css 0 → 100644
View file @ ed9e64d1
.LeaveGroupDownload-form.LeaveGroupDownload-formHV .flight_list td{
background: none !important;
}
.hangban-info.hangban-infoHV{
background: none !important;
}
.baseTable.baseTableHV .essential-item.jianju {
border: 5px solid #FFF;
}
.baseTable.baseTableHV .essential-item.jianju_b {
border: 5px solid #FFF;
}
.travelDaysHVMasterMap3{
height: 388px;
border-radius: 60px 0px 60px 0px;
}
.travelDaysHV-Description{
font-size: 24px;
line-height: 34px;
color: #484647;
font-family: DengXian;
font-weight: 400;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
overflow: hidden;
margin-top: 10px;
}
.travelDaysHV-Description.travelDaysHV-Description3{
height: 295px;
-webkit-line-clamp: 9;
margin-top: 20px;
}
.travelDaysHV-CouponsName span.CouponsNameM{
position: relative;
top: -9px;
}
.travelDaysHV-CouponsName.travelDaysHV-CouponsName3 span.CouponsNameT{
max-width: 450px;
}
.travelDaysHV-CouponsName span.CouponsNameT{
display: inline-block;
width: auto;
max-width: 650px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.travelDaysHV-CouponsName{
overflow: hidden;
font-size: 30px;
text-align: center;
font-family: Microsoft YaHei;
white-space: nowrap;
}
.travelDaysHVMasterMap-one{
height: 524px;
}
.travelDaysHVMasterMap2 {
height: 524px;
border-radius: 50px 0px 50px 0px;
}
.travelDaysHV3-imgBox{
width: 516px;
}
.travelDaysHV2-imgBox{
width: 786px;
}
.travelDaysHV-box{
padding: 47px 54px 0 54px;
}
.travelDaysHVdetails-icon span{
margin-left: 1px;
font-size: 20px;
}
.travelDaysHVdetails-icon{
width: 36px;
height: 36px;
border-radius: 50%;
background: #D6CEC1;
text-align: center;
line-height: 34px;
margin-right: 30px;
}
.trtravelDaysHVdetails-textC{
font-size: 26px;
font-family: DengXian;
font-weight: 400;
color: #484647;
}
.travelDaysHVdetails-text0{
font-size: 26px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #484647;
line-height: 28px;
white-space: nowrap;
}
.travelDaysHVTdetails-textBox{
min-height: 53px;
align-items: center;
}
.travelDaysHVdetails-textBox{
width: 100%;
height: 2px;
background:#E8E8E8;
margin: 14px 0;
}
.travelDaysHVContent-text .textBold{
font-size: 30px;
margin-bottom: 29px;
}
.travelDaysHVContent-text:last-child{
margin-bottom: 0;
}
.travelDaysHVContent-text{
font-size: 26px;
font-family: DengXian;
font-weight: bold;
color: #FFFFFF;
line-height: 26px;
margin-bottom: 40px;
}
.travelDaysHVdetailsBJ{
background: rgba(255,255,255, 0.8);
padding: 16px 55px;
border-radius: 20px;
}
.travelDaysHVdetails{
margin: 0;
padding: 0 47px 40px 47px;
}
.travelDaysHVContent{
padding: 42px 55px;
background: rgba(23,23,23,0.4);
margin: 0 57px;
margin-bottom: 50px;
}
.travelDaysHVMasterMap img{
width: 100%;
}
.travelDaysHVMasterMap{
height: 800px;
}
.travelDaysHVMasterMap2-box{
height: 1050px;
background: url('http://imgfile.oytour.com/Static/bjHV.png')no-repeat;
background-size: 100% 100%;
}
.travelDaysHVContentOne{
z-index: 99;
bottom: 0;
left: 0;
right: 0;
}
.UpgradedVersion2Line.UpgradedVersion2LineHV{
top: 1240px;
}
.HVTitlle-header1{
width: 1342px;
font-size: 26px;
font-family: DengXian;
font-weight: bold;
color: #242424;
margin-top: 22px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
text-align: left;
line-height: 38px;
}
.HVTitlle-header0 img{
width: 29px;
height: 32px;
margin-right: 23px;
top: 7px;
}
.HVTitlle-header0 span{
width: 1342px;
font-size: 32px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #242424;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.travelDaysHVTitlle-right{
margin-left: 54px;
flex-wrap: nowrap;
flex: 1;
overflow: hidden;
}
.travelDaysHVTitlle-borderL div{
border-left: 1px dashed #fff;
height: 95%;
min-height: 65px;
}
.travelDaysHVTitlle-borderL{
width: 1px;
padding: 5px 0;
}
.travelDaysHVTitlle-right-text{
padding-left: 72px;
justify-content: center;
}
.travelDaysHVTitlle-left-textOne img{
width: 100%;
display: block;
}
.travelDaysHVTitlle-left-textOne{
width: 125px;
height: 36px;
margin-top: 6px;
}
.travelDaysHVTitlle-left-textTwo{
font-family: Microsoft YaHei;
font-size: 52px;
font-weight: bold;
color: #242424;
}
.travelDaysHVTitlle-left{
margin-left: 61px;
}
.UpgradedVersionHV-box2{
width: 1754px;
background: #fff;
}
src/components/FinancialModule/RecPayQuery.vue
View file @ ed9e64d1
...@@ -458,6 +458,17 @@ ...@@ -458,6 +458,17 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="发票状态">
<template slot-scope="scope">
<div v-if="scope.row.KingdeeInvoice==1||scope.row.KingdeeInvoice==3">
<div v-if="scope.row.InvoiceState==0">有票-待上传</div>
<div v-else-if="scope.row.InvoiceState==1">有票-待审核</div>
<div v-else-if="scope.row.InvoiceState==2">有票-已审核</div>
</div>
<div v-else>无票</div>
</template>
</el-table-column>
<el-table-column prop="" label="操作"> <el-table-column prop="" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
......
src/components/Hotel/roomReservationsDetails.vue
View file @ ed9e64d1
...@@ -28,6 +28,17 @@ ...@@ -28,6 +28,17 @@
padding: 5px; padding: 5px;
} }
.roomReservationsDetailsTalbe {
table-layout: fixed;
}
.roomReservationsDetailsTalbe thead tr th {
position: sticky;
top: 0;
z-index: 1000;
}
</style> </style>
<template> <template>
...@@ -49,15 +60,16 @@ ...@@ -49,15 +60,16 @@
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}" <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
class="ownScrollbarStyle" ref="ownScrollbarStyle"> class="ownScrollbarStyle" ref="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading"> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
<thead>
<tr> <tr>
<th class="fz14" colspan="5"> <th class="fz14" style="border:none;" >
{{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}} {{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
&nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th> &nbsp;&nbsp;{{$t('leader.leader_Guide')}}: {{GuideName}} </th>
<th class="fz14" colspan="17"> <th class="fz14" style="border:none;">
<el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start" <el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start"
style="float:left;margin-left:20px;"> style="float:left;margin-left:20px;">
<el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click" <el-popover placement="bottom" popper-class="piliangPop" width="500" trigger="click"
v-model="isShowPiliangPop"> v-model="isShowPiliangPop">
<table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0"> <table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -66,11 +78,12 @@ ...@@ -66,11 +78,12 @@
</tr> </tr>
<template v-for="(lItem,lIndex) in list"> <template v-for="(lItem,lIndex) in list">
<tr v-for="(subItem,subIndex) in lItem.HotelOrderList" :key="subIndex+lIndex"> <tr v-for="(subItem,subIndex) in lItem.HotelOrderList" :key="subIndex+lIndex">
<td style="width:100px;"> <td style="width:120px;">
{{lItem.UseTimeStr}} {{lItem.UseTimeStr}}
</td> </td>
<td style="width:280px;"> <td style="width:280px;">
<el-checkbox v-model="subItem.IsChecked" @change="MoreUpdate(subItem)">{{subItem.NewHotelName}} <el-checkbox v-model="subItem.IsChecked" @change="MoreUpdate(subItem)">
{{subItem.NewHotelName}}
</el-checkbox> </el-checkbox>
</td> </td>
</tr> </tr>
...@@ -89,8 +102,6 @@ ...@@ -89,8 +102,6 @@
</el-button> </el-button>
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
<span style="margin-top:6px;display:inline-block;">{{$t('ground.dijiecaozuoxinxi')}}</span>
<el-tooltip class="item" effect="dark" content="批量修改" placement="top-start" <el-tooltip class="item" effect="dark" content="批量修改" placement="top-start"
style="float:left;margin-left:20px;"> style="float:left;margin-left:20px;">
<el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click" <el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click"
...@@ -130,6 +141,10 @@ ...@@ -130,6 +141,10 @@
</el-tooltip> </el-tooltip>
</th> </th>
</tr> </tr>
</thead>
</table>
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
<thead>
<tr> <tr>
<th width="120">{{$t('hotel.table_CheckInDate')}}</th> <th width="120">{{$t('hotel.table_CheckInDate')}}</th>
<th width="180">{{$t('hotel.hotel_name')}}</th> <th width="180">{{$t('hotel.hotel_name')}}</th>
...@@ -140,7 +155,6 @@ ...@@ -140,7 +155,6 @@
<th width="100">{{$t('ground.fangjianleixing')}}</th> <th width="100">{{$t('ground.fangjianleixing')}}</th>
<th width="80">{{$t('ground.fangjian')}}<br />{{$t("ground.yudingshu")}}</th> <th width="80">{{$t('ground.fangjian')}}<br />{{$t("ground.yudingshu")}}</th>
<th width="80">{{$t('ground.yudingrenshu')}}</th> <th width="80">{{$t('ground.yudingrenshu')}}</th>
<!-- <th width="80">尚差<br />房间数</th> -->
<th width="80">{{$t('ground.danjiameiren')}}</th> <th width="80">{{$t('ground.danjiameiren')}}</th>
<th width="80">{{$t('ground.mianjianrenshu')}}</th> <th width="80">{{$t('ground.mianjianrenshu')}}</th>
<th width="80">{{$t('ground.jinexiaoji')}}</th> <th width="80">{{$t('ground.jinexiaoji')}}</th>
...@@ -154,6 +168,8 @@ ...@@ -154,6 +168,8 @@
<th width="250">{{$t('ground.fukuanbzdth')}}</th> <th width="250">{{$t('ground.fukuanbzdth')}}</th>
<th width="80">{{$t('system.table_operation')}}</th> <th width="80">{{$t('system.table_operation')}}</th>
</tr> </tr>
</thead>
<tbody>
<template v-for="(item,index) in list"> <template v-for="(item,index) in list">
<template v-for="(subItem,subIndex) in item.HotelOrderList"> <template v-for="(subItem,subIndex) in item.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList"> <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
...@@ -193,7 +209,8 @@ ...@@ -193,7 +209,8 @@
</td> </td>
</tr> </tr>
</table> </table>
<span style="font-weight:bold;font-size:14px;">报价酒店：<font style="color:red;">{{subItem.OfferHotelName}}( <span style="font-weight:bold;font-size:14px;">报价酒店：<font style="color:red;">
{{subItem.OfferHotelName}}(
{{subItem.OfferUnitPrice}}/人)</font></span> {{subItem.OfferUnitPrice}}/人)</font></span>
</td> </td>
<!-- 机位总数/(Y/E/F) --> <!-- 机位总数/(Y/E/F) -->
...@@ -575,7 +592,8 @@ ...@@ -575,7 +592,8 @@
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.addBtn')" v-if="subItem.OPState!=1" <el-tooltip class="item" effect="dark" :content="$t('pub.addBtn')" v-if="subItem.OPState!=1"
placement="top-start"> placement="top-start">
<el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button> <el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary">
</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark" <el-tooltip v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark"
:content="$t('system.table_delete')" placement="top-start"> :content="$t('system.table_delete')" placement="top-start">
...@@ -592,6 +610,7 @@ ...@@ -592,6 +610,7 @@
</tr> </tr>
</template> </template>
</template> </template>
</tbody>
</table> </table>
<div class="noDataNotice" v-if="list.length<1"> <div class="noDataNotice" v-if="list.length<1">
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
......
src/components/LeaveGroupDownload/ItineraryFeatures.vue
View file @ ed9e64d1
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
<!-- <div v-if="showType>=4" id="gernalCanvas" style="margin:auto;width:100%" v-html="feature.featureHtml"></div> --> <!-- <div v-if="showType>=4" id="gernalCanvas" style="margin:auto;width:100%" v-html="feature.featureHtml"></div> -->
<div v-if="showType>=4" id="gernalCanvas" class="slider" style="margin:auto;width:100%"> <div v-if="showType>=4" id="gernalCanvas" class="slider" style="margin:auto;width:100%">
<template v-for="(i,index) in feature.tripImageList"> <template v-for="(i,index) in feature.tripImageList">
<img :key="index" :src="feature.headerImage" style="width:100%;display: block;"> <img v-if="dataAll.featurePageType==2" :key="index" :src="feature.headerImage" style="width:100%;display: block;">
<img :key="index+100000" :src="i" style="width:100%;display: block;"> <img :key="index+100000" :src="i" style="width:100%;display: block;">
<img :key="index+200000" class="MT19" :src="feature.footerImage" style="width:100%;display: block;"> <img v-if="dataAll.featurePageType==2" :key="index+200000" class="MT19" :src="feature.footerImage" style="width:100%;display: block;">
</template> </template>
</div> </div>
</div> </div>
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
}, },
props: [ props: [
'dataAll',
'feature', 'feature',
'vshowC', 'vshowC',
'showType' 'showType'
......
src/components/LeaveGroupDownload/index.vue
View file @ ed9e64d1
<template> <template>
<div id="pdf_1" v-if="orderMsg&&dataAll"> <div id="pdf_1" v-if="orderMsg&&dataAll">
<div class="UpgradedVersion-box UpgradedVersion-homebj relative" style="height: 1478px;"> <div class="UpgradedVersion-box relative"
:class="[dataAll.featurePageType==2?'UpgradedVersion-homebj':'UpgradedVersion-homebjHV']"
:style="{'width':dataAll.featurePageType==2?'1123px':'1754px',
'height':dataAll.featurePageType==2?'1478px':'1240px'}">
<div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;"> <div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
<template v-if="dataAll.featurePageType==2">
<Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header> <Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
<div class="travelDaysTitlle row-aic" :style="{'background':backgroundColor}"> <div class="travelDaysTitlle row-aic" :style="{'background':backgroundColor}">
<div class="travelDaysTitlle-left"> <div class="travelDaysTitlle-left">
<div class="relative"> <div class="relative">
...@@ -24,6 +27,32 @@ ...@@ -24,6 +27,32 @@
</div> </div>
</div> </div>
</div> </div>
</template>
<div v-if="dataAll.featurePageType==1" class="travelDaysTitlle row-aic" style="min-height: 190px;" :style="{'background': backgroundColor}">
<div class="travelDaysHVTitlle-left flexS">
<div class="relative">
<div class="travelDaysHVTitlle-left-text column-ajc">
<div class="travelDaysHVTitlle-left-textOne" style="margin-top: 0;width: 126px;height: auto;">
<img src="http://imgfile.oytour.com/Static/headerLogoHV.png"/>
</div>
</div>
</div>
</div>
<div class="travelDaysHVTitlle-right row">
<div class="travelDaysHVTitlle-borderL row-aic">
<div></div>
</div>
<div class="travelDaysHVTitlle-right-text column"
:style="{'font-size': getFontSize(orderMsg.lineName),'color':textColor}">
<div class="HVTitlle-header0 row nowrap">
<span>
{{orderMsg.lineName}}
</span>
</div>
</div>
</div>
</div>
<!-- <!--
<div class="travelDaysTitlle row-aic"> <div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left"> <div class="travelDaysTitlle-left">
...@@ -43,6 +72,7 @@ ...@@ -43,6 +72,7 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<div :class="[dataAll.featurePageType==1?'travelDaysHVMasterMap2-box':'']">
<div style="margin: 0 30px;"> <div style="margin: 0 30px;">
<div class="trip-adviser" style="margin-top: 20px;"> <div class="trip-adviser" style="margin-top: 20px;">
<!-- <h1 class="trip-nav-title"> <!-- <h1 class="trip-nav-title">
...@@ -54,7 +84,8 @@ ...@@ -54,7 +84,8 @@
在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！ 在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！
</p> </p>
</div> </div>
<table class="baseTable trip-v3-base"> <table class="baseTable trip-v3-base"
:class="[dataAll.featurePageType==1?'baseTableHV':'']">
<tbody> <tbody>
<tr> <tr>
<td class="essential-item jianju"> <td class="essential-item jianju">
...@@ -147,7 +178,8 @@ ...@@ -147,7 +178,8 @@
<div class="trip-v3-title small-margin"> <div class="trip-v3-title small-margin">
参考航班 参考航班
</div> </div>
<div class="hangban-info"> <div class="hangban-info"
:class="[dataAll.featurePageType==1?'hangban-infoHV':'']">
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list" <table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list"
:class="{'guoneiLine':lineId==90}"> :class="{'guoneiLine':lineId==90}">
<thead class="flight_header"> <thead class="flight_header">
...@@ -217,9 +249,11 @@ ...@@ -217,9 +249,11 @@
</div> </div>
</template> </template>
</div> </div>
</div>
<!-- otherJourney-footer --> <!-- otherJourney-footer -->
<div> <div v-if="dataAll.featurePageType==2">
<div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}"> <div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.tripColor}">&nbsp;</div> <div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.tripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.tripColor}">&nbsp;</div> <div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.tripColor}">&nbsp;</div>
......
src/components/LeaveGroupDownload/travelDaysHV.vue 0 → 100644
View file @ ed9e64d1
<template>
<div id="pdf_3" v-if="vshowD">
<div style="width: 1750px;">
<template v-for="(i,index) in feature.detailsImageList">
<img :key="index+100000" :src="i" style="width:100%;display: block;">
</template>
</div>
</div>
</template>
<script>
import Header from "./components/header";
export default {
components: {
Header
},
props: ['dataAll', 'tripList', 'orderMsg', 'orderTripdiff', 'vshowD', 'vshowK','feature'],
data() {
return {
title: '北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）',
day: 'DAY',
backgroundColor: '',
backgroundColor2: '',
textColor: '',
textColorOne: '',
};
},
methods: {
getHtmlPlainText(html_str) {
//提取字符串中的文字
let re = new RegExp('<[^<>]+>', 'g')
if (html_str) {
let text = html_str.replace(re, '')
return text
} else {
return ''
}
},
getFontSize(title) {
let size = 30;
if (title && title.length > 0 && title.length > 80) {
var tempSize = Number(80) / Number(title.length);
tempSize = tempSize * 30;
size = tempSize.toFixed(1);
}
return size + "px";
},
getImgColor(img, id) {
return "#fff"
},
// 获取图片颜色
canvasImgColor(imgs, ids, callback) {
var imgSrc = imgs
var upload = document.getElementById(ids)
const imgEle = document.createElement('img')
const canvas = document.createElement('canvas')
imgEle.src = imgSrc
imgEle.crossOrigin = '';
imgEle.onload = () => {
var ctx = canvas.getContext("2d");
var naturalImgSize = [imgEle.naturalWidth, imgEle.naturalHeight];
canvas.width = naturalImgSize[0];
canvas.height = naturalImgSize[1];
//绘制到canvas
ctx.drawImage(imgEle, 0, 0);
//获取imageData：rgba像素点
var imgData = ctx.getImageData(0, 0, canvas.width, canvas.height);
const leftSectionData = []
const rightSectionData = []
const oneLineImgDataLen = canvas.width * 4;
imgData.data.forEach((colorVal, i) => {
if (i % oneLineImgDataLen <= 0.5 * oneLineImgDataLen || i % oneLineImgDataLen >= 0.6 *
oneLineImgDataLen) {
const inLeft = i % oneLineImgDataLen <= 0.5 * oneLineImgDataLen
if (i % 4 === 0) {
// 获取rgb均值
const curAverageRGB = (imgData.data[i] + imgData.data[i + 1] + imgData.data[i + 2]) / 3;
let leftOrRightRef = inLeft ? leftSectionData : rightSectionData;
//每个数组里存四个值：本颜色值中的r、g、b的均值，以及r、g、b三个值。
//均值一方面用于累加计算本区域的整体均值，然后再跟每个均值对比拿到与整体均值最接近的项的索引，再取该数组里的后三个值：rgb，对应着颜色
leftOrRightRef[leftOrRightRef.length] = [curAverageRGB, imgData.data[i], imgData.data[i + 1],
imgData.data[i + 2]
]
}
}
})
//generate average rgb
const averageOfLeft = Math.round(leftSectionData.reduce((_cur, item) => {
return _cur + item[0]
}, 0) / leftSectionData.length)
const averageOfRight = Math.round(rightSectionData.reduce((_cur, item) => {
return _cur + item[0]
}, 0) / rightSectionData.length)
//find the most near color
const findNearestIndex = (averageVal, arrBox) => {
let _gapValue = Math.abs(averageVal - arrBox[0])
let _nearColorIndex = 0
arrBox.forEach((item, index) => {
const curGapValue = Math.abs(item - averageVal)
if (curGapValue < _gapValue) {
_gapValue = curGapValue
_nearColorIndex = index
}
})
return _nearColorIndex
}
const leftNearestColor = leftSectionData[findNearestIndex(averageOfLeft, leftSectionData)]
const rightNearestColor = rightSectionData[findNearestIndex(averageOfRight, rightSectionData)]
upload.style.backgroundColor =
`rgba(${leftNearestColor[1]},${leftNearestColor[2]},${leftNearestColor[3]},1) 0%,rgba(${rightNearestColor[1]},${rightNearestColor[2]},${rightNearestColor[3]},1)`
callback(upload.style.backgroundColor)
}
}
},
computed: {},
watch: {
dataAll: {
handler(val, oldVal) {
if (val && val.tripColor) {
this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
this.backgroundColor2 = this.hexToRgb(val.tripColor, 0.1)
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
},
tripList: {
handler(val, oldVal) {
},
deep: true,
immediate: true
},
},
mounted() {
}
};
</script>
<style>
</style>
src/components/commonPage/pptIframe/index.vue
View file @ ed9e64d1
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<div class="dialogPptistVisible-box" <div class="dialogPptistVisible-box"
style="width: 100%;height: 100%;"> style="width: 100%;height: 100%;">
<div class="closePptist-box"> <div class="closePptist-box">
<div class="closePptist"> <div class="closePptist">
<el-tooltip class="item" effect="dark" content="关闭窗口" placement="bottom"> <el-tooltip class="item" effect="dark" content="关闭窗口" placement="bottom">
<i class="el-icon-close" <i class="el-icon-close"
...@@ -11,14 +12,14 @@ ...@@ -11,14 +12,14 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<iframe :src="Url" <iframe name="myTemplateUrl" :src="Url"
class="TemplateIframe"> class="TemplateIframe">
</iframe> </iframe>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:['Url'], props:['Url','FeaturePageType'],
data() { data() {
return { return {
dialogPptistVisible: false, dialogPptistVisible: false,
...@@ -27,6 +28,21 @@ ...@@ -27,6 +28,21 @@
TemplateUrlImg:'', TemplateUrlImg:'',
isPostMessage: false isPostMessage: false
} }
},
watch: {
FeaturePageType: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
if(document.all.myTemplateUrl){
document.all.myTemplateUrl.src = this.Url
}
},
deep: true,
immediate:true
},
},
mounted() {
}, },
methods: { methods: {
close() { close() {
......
src/components/confirmationOrderDownLoadNew.vue
View file @ ed9e64d1
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
</style> </style>
<template> <template>
<div class="travelControlTrip"> <div class="travelControlTrip"
:style="{'width':dataAll&&dataAll.featurePageType==2?'1123px':'1754px'}">
<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" class="row-aic"> <el-col :span="14" class="row-aic">
...@@ -72,21 +73,21 @@ ...@@ -72,21 +73,21 @@
<el-checkbox class="marginL11" style="display:none;" v-model="isShowTime">显示行程日期</el-checkbox> <el-checkbox class="marginL11" style="display:none;" 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 LeaveGroupDownload-formHV">
<div id="pdfDom"> <div id="pdfDom">
<!-- 首页 --> <!-- 首页 -->
<LeaveGroupDownload :dataAll="dataAll" :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"
:priceList="priceList"> :priceList="priceList">
</LeaveGroupDownload> </LeaveGroupDownload>
<!-- 行程特色 --> <!-- 行程特色 -->
<ItineraryFeatures :feature="feature" :vshowC="vshowC" :showType="showType"></ItineraryFeatures> <ItineraryFeatures :dataAll="dataAll" :feature="feature" :vshowC="vshowC" :showType="showType"></ItineraryFeatures>
<!-- 行程天数 --> <!-- 行程天数 -->
<travelDays :dataAll="dataAll" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :tripList="tripList" <travelDays v-if="dataAll&&dataAll.featurePageType==2" :dataAll="dataAll" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :tripList="tripList"
:vshowD="vshowD" :vshowK="vshowK" :feature="feature"></travelDays> :vshowD="vshowD" :vshowK="vshowK" :feature="feature"></travelDays>
<travelDaysHV v-if="dataAll&&dataAll.featurePageType==1" :dataAll="dataAll" :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :tripList="tripList"
:vshowD="vshowD" :vshowK="vshowK" :feature="feature"></travelDaysHV>
<!-- 团队费用说明 --> <!-- 团队费用说明 -->
<TourFareDescription :vshowE="vshowE" :vshowF="vshowF" :dataList="dataList" :feature="feature"> <TourFareDescription :vshowE="vshowE" :vshowF="vshowF" :dataList="dataList" :feature="feature">
</TourFareDescription> </TourFareDescription>
...@@ -209,6 +210,7 @@ ...@@ -209,6 +210,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 travelDaysHV from './LeaveGroupDownload/travelDaysHV'
import TourFareDescription from './LeaveGroupDownload/TourFareDescription' import TourFareDescription from './LeaveGroupDownload/TourFareDescription'
import OrderNotice from './LeaveGroupDownload/OrderNotice' import OrderNotice from './LeaveGroupDownload/OrderNotice'
import VisaInformation from './LeaveGroupDownload/VisaInformation' import VisaInformation from './LeaveGroupDownload/VisaInformation'
...@@ -221,6 +223,7 @@ ...@@ -221,6 +223,7 @@
LeaveGroupDownload, LeaveGroupDownload,
ItineraryFeatures, ItineraryFeatures,
travelDays, travelDays,
travelDaysHV,
TourFareDescription, TourFareDescription,
OrderNotice, OrderNotice,
VisaInformation VisaInformation
...@@ -1018,6 +1021,7 @@ ...@@ -1018,6 +1021,7 @@
@import url("../assets/css/UpgradedVersion.css"); @import url("../assets/css/UpgradedVersion.css");
@import url("../assets/css/tripIndexNew2.css"); @import url("../assets/css/tripIndexNew2.css");
@import url('../assets/css/detail.css'); @import url('../assets/css/detail.css');
@import url('../assets/css/tripIndexNewHV.css');
.edit_form_box { .edit_form_box {
......
src/components/index.vue
View file @ ed9e64d1
...@@ -1991,7 +1991,7 @@ ...@@ -1991,7 +1991,7 @@
// 添加编辑模版 // 添加编辑模版
journeyTemplate(){ journeyTemplate(){
let href = this.domainManager().PptUrl let href = this.domainManager().PptUrl
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1` this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1&TempType=0`
this.dialogPptistVisible = true this.dialogPptistVisible = true
}, },
GetExaminePriceOrderPageList(type) { GetExaminePriceOrderPageList(type) {
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ ed9e64d1
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="_VideoStr_box"> <div class="_VideoStr_box" v-if="false">
<el-form-item label="行程主题色"> <el-form-item label="行程主题色">
<el-color-picker style='vertical-align: middle;' v-model="PostConfig.TripColor"></el-color-picker> <el-color-picker style='vertical-align: middle;' v-model="PostConfig.TripColor"></el-color-picker>
</el-form-item> </el-form-item>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ ed9e64d1
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</div> </div>
<!-- ppt 模版新增编辑窗口 --> <!-- ppt 模版新增编辑窗口 -->
<pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" <pptIframe v-show="dialogPptistVisible" :FeaturePageType="dataAll.FeaturePageType" :Url="TemplateUrl"
@close="closeIframe()"></pptIframe> @close="closeIframe()"></pptIframe>
</div> </div>
</template> </template>
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
UpgradedVersion, UpgradedVersion,
pptIframe pptIframe
}, },
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"], props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType", "dataAll"],
inject: ['loadConfigInfo'], inject: ['loadConfigInfo'],
data() { data() {
return { return {
...@@ -339,9 +339,9 @@ ...@@ -339,9 +339,9 @@
this.isPostMessage = false this.isPostMessage = false
let href = this.domainManager().PptUrl let href = this.domainManager().PptUrl
if(type&&type==1){ if(type&&type==1){
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1` this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1&TempType=0`
}else{ }else{
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0` this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}`
} }
this.dialogPptistVisible = true this.dialogPptistVisible = true
}, },
...@@ -674,6 +674,12 @@ ...@@ -674,6 +674,12 @@
} }
}, },
watch: { watch: {
dataAll:{
handler: function (val, oldVal) {
},
deep: true,
immediate:true
},
FeatureData: { FeatureData: {
//深度监听，可监听到对象、数组的变化 //深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) { handler: function (val, oldVal) {
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ ed9e64d1
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
:IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity"
:UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData"
:TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect> :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature" <TravelFeature :TripColor="PostConfig.TripColor" :dataAll="PostConfig" :class="{'showOther':(TeamType==3)}" ref="TravelFeature"
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"
@ConfigInfo="firstLoadConfigInfo"> @ConfigInfo="firstLoadConfigInfo">
...@@ -222,6 +222,7 @@ ...@@ -222,6 +222,7 @@
TripCityList: [], //行程城市 TripCityList: [], //行程城市
TripMapList: [], TripMapList: [],
NotQueryCityList:[],//使用系统中的经纬度城市 NotQueryCityList:[],//使用系统中的经纬度城市
FeaturePageType:0,//1横版 2竖版
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -422,6 +423,7 @@ ...@@ -422,6 +423,7 @@
basicData.RemoveChild = this.PostConfig.RemoveChild; basicData.RemoveChild = this.PostConfig.RemoveChild;
basicData.OfferId = this.PostConfig.OfferId; basicData.OfferId = this.PostConfig.OfferId;
basicData.TeamType = this.PostConfig.TeamType; basicData.TeamType = this.PostConfig.TeamType;
basicData.FeaturePageType = this.PostConfig.FeaturePageType
basicData.TripMapList = this.PostConfig.TripMapList; basicData.TripMapList = this.PostConfig.TripMapList;
basicData.TripCountryList = this.PostConfig.TripCountryList; basicData.TripCountryList = this.PostConfig.TripCountryList;
...@@ -457,7 +459,6 @@ ...@@ -457,7 +459,6 @@
basicData.WCountryId = this.PostConfig.WCountryId; basicData.WCountryId = this.PostConfig.WCountryId;
basicData.WLocationId = this.PostConfig.WLocationId; basicData.WLocationId = this.PostConfig.WLocationId;
basicData.WCityId = this.PostConfig.WCityId; basicData.WCityId = this.PostConfig.WCityId;
this.journeyList.FeaturePageType = this.PostDaysTrip.FeaturePageType;
this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip; this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip;
//行程特色数据 //行程特色数据
var TripFeature = {}; var TripFeature = {};
...@@ -685,13 +686,12 @@ ...@@ -685,13 +686,12 @@
this.journeyList.isFileUpload = true; this.journeyList.isFileUpload = true;
this.journeyList.DayNum = configData.Days.length; this.journeyList.DayNum = configData.Days.length;
this.journeyList.NightNum = this.journeyList.DayNum - 1; this.journeyList.NightNum = this.journeyList.DayNum - 1;
let _this = this
let arrDayList = function(list){ let arrDayList = function(list){
list.forEach(x=>{ list.forEach(x=>{
x.IsBlowUp = false x.IsBlowUp = false
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){ if(this.PostConfig.FeaturePageType==2){
x.zoom = 0.44 x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){ }else if(this.PostConfig.FeaturePageType==1){
x.zoom = 0.285 x.zoom = 0.285
} }
}) })
...@@ -883,6 +883,7 @@ ...@@ -883,6 +883,7 @@
this.PostConfig.LineteamId = tempData.LineteamId; this.PostConfig.LineteamId = tempData.LineteamId;
this.PostConfig.CountryID = tempData.CountryID; this.PostConfig.CountryID = tempData.CountryID;
this.PostConfig.TeamType = tempData.TeamType; this.PostConfig.TeamType = tempData.TeamType;
this.PostConfig.FeaturePageType = tempData.FeaturePageType;
//视频地址 //视频地址
this.PostConfig.VideoStr = tempData.VideoStr; this.PostConfig.VideoStr = tempData.VideoStr;
this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe; this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
...@@ -949,18 +950,16 @@ ...@@ -949,18 +950,16 @@
//默认不联动行程特色 //默认不联动行程特色
this.journeyList.IsUpdateTrip = 0; this.journeyList.IsUpdateTrip = 0;
this.journeyList.FeaturePageType = 2;
this.journeyList.DayNum = tempData.DayNum; this.journeyList.DayNum = tempData.DayNum;
this.journeyList.NightNum = tempData.NightNum; this.journeyList.NightNum = tempData.NightNum;
this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId; this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
this.journeyList.StartCityId = tempData.StartCityId; this.journeyList.StartCityId = tempData.StartCityId;
let _this = this
let arrDayList = function(list){ let arrDayList = function(list){
list.forEach(x=>{ list.forEach(x=>{
x.IsBlowUp = false x.IsBlowUp = false
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){ if(tempData.FeaturePageType==2){
x.zoom = 0.44 x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){ }else if(tempData.FeaturePageType==1){
x.zoom = 0.285 x.zoom = 0.285
} }
}) })
...@@ -1055,6 +1054,13 @@ ...@@ -1055,6 +1054,13 @@
'$route'(to, from) { //监听路由是否变化 '$route'(to, from) { //监听路由是否变化
location.reload() location.reload()
}, },
PostDaysTrip:{
handler: function (val, oldVal) {
},
deep: true,
immediate:true
}
}, },
mounted() { mounted() {
this.CurrentUserInfo = this.getLocalStorage();; this.CurrentUserInfo = this.getLocalStorage();;
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ ed9e64d1
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.ReturnCity')}}</span> <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.ReturnCity')}}</span>
<span :class="{'showOther':TeamType==3}"> <span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="ReturnArriveCityId">
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId" <el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option>
<el-option v-for="item in StartCity" :label="item.startCityName" :value="item.ID" :key="item.ID"> <el-option v-for="item in StartCity" :label="item.startCityName" :value="item.ID" :key="item.ID">
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span> <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
<span :class="{'showOther':TeamType==3}"> <span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="ReturnArriveCityId">
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip"> <el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-option :label="$t('op.notUpdate')" :value="0"></el-option> <el-option :label="$t('op.notUpdate')" :value="0"></el-option>
<el-option :label="$t('op.Update')" :value="1"></el-option> <el-option :label="$t('op.Update')" :value="1"></el-option>
</el-select> </el-select>
...@@ -182,9 +182,9 @@ ...@@ -182,9 +182,9 @@
<template v-if="false"> <template v-if="false">
<span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span> <span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
<span :class="{'showOther':TeamType==3}"> <span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="FeaturePageType">
<el-select placeholder="请选择版型" v-model="subConfig.FeaturePageType" <el-select class="w90" placeholder="请选择版型" v-model="dataAll.FeaturePageType"
style="width: 80px;"> @change="getFeaturePageType()">
<el-option label="横版" :value="1"></el-option> <el-option label="横版" :value="1"></el-option>
<el-option label="竖版" :value="2"></el-option> <el-option label="竖版" :value="2"></el-option>
</el-select> </el-select>
...@@ -206,14 +206,14 @@ ...@@ -206,14 +206,14 @@
<span class="el-icon-full-screen absolute BlowUpTravelDays" <span class="el-icon-full-screen absolute BlowUpTravelDays"
@click="clickBlowUpTravelDays(item)"></span> @click="clickBlowUpTravelDays(item)"></span>
</el-tooltip> </el-tooltip>
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item"> <travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV> </travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item"> <travelDays v-if="dataAll.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays> </travelDays>
<div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox"> <div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox">
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item"> <travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV> </travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item"> <travelDays v-if="dataAll.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays> </travelDays>
<span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose" <span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose"
@click="clickBlowUpTravelDays(item)"></span> @click="clickBlowUpTravelDays(item)"></span>
...@@ -270,10 +270,24 @@ ...@@ -270,10 +270,24 @@
travelDaysHV travelDaysHV
}, },
methods: { methods: {
getFeaturePageType(){
this.subConfig.DayList.forEach(x=>{
if(this.dataAll.FeaturePageType==1){
x.zoom = 0.285
}
if(this.dataAll.FeaturePageType==2){
x.zoom = 0.44
}
})
this.$forceUpdate()
},
clickBlowUpTravelDays(item){ clickBlowUpTravelDays(item){
item.IsBlowUp=!item.IsBlowUp item.IsBlowUp=!item.IsBlowUp
if(item.IsBlowUp) item.zoom = 1 if(item.IsBlowUp) item.zoom = 1
else item.zoom = 0.44 else{
if(this.dataAll.FeaturePageType==1) item.zoom = 0.285
if(this.dataAll.FeaturePageType==2) item.zoom = 0.44
}
this.$forceUpdate() this.$forceUpdate()
}, },
handlerChangeDateList(data) { handlerChangeDateList(data) {
...@@ -443,6 +457,7 @@ ...@@ -443,6 +457,7 @@
WarmTipList: WarmTipList, WarmTipList: WarmTipList,
TitleList: TitleList, TitleList: TitleList,
IsUpdateTrip:this.subConfig.IsUpdateTrip, IsUpdateTrip:this.subConfig.IsUpdateTrip,
FeaturePageType: this.dataAll.FeaturePageType
}; };
this.HotelList = HotelList; this.HotelList = HotelList;
this.DinnerList = DinnerList; this.DinnerList = DinnerList;
...@@ -466,6 +481,14 @@ ...@@ -466,6 +481,14 @@
} }
}, },
watch: { watch: {
'dataAll.FeaturePageType': {
deep: true,
immediate: true,
handler: function (newVal, oldVal) {
}
},
'subConfig.DayList': { 'subConfig.DayList': {
deep: true, deep: true,
handler: function (newVal, oldVal) { handler: function (newVal, oldVal) {
......
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