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

src/assets/css/tripIndexNewHV.css

+.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

@@ -458,6 +458,17 @@
             </el-popover>
           </template>
         </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="操作">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="查看" placement="top">

src/components/LeaveGroupDownload/ItineraryFeatures.vue

@@ -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" class="slider" style="margin:auto;width:100%">
         <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+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>
       </div>
     </div>
@@ -25,6 +25,7 @@
 
     },
     props: [
+      'dataAll',
       'feature',
       'vshowC',
       'showType'

src/components/LeaveGroupDownload/travelDaysHV.vue

+<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

@@ -3,6 +3,7 @@
   <div class="dialogPptistVisible-box"
   style="width: 100%;height: 100%;">
     <div class="closePptist-box">
+
       <div class="closePptist">
         <el-tooltip class="item" effect="dark" content="关闭窗口" placement="bottom">
           <i class="el-icon-close"
@@ -11,14 +12,14 @@
         </el-tooltip>
       </div>
     </div>
-    <iframe :src="Url"
+    <iframe name="myTemplateUrl" :src="Url"
       class="TemplateIframe">
     </iframe>
   </div>
 </template>
 <script>
   export default {
-    props:['Url'],
+    props:['Url','FeaturePageType'],
     data() {
       return {
         dialogPptistVisible: false,
@@ -27,6 +28,21 @@
         TemplateUrlImg:'',
         isPostMessage: false
       }
+    },
+    watch: {
+      FeaturePageType: {
+        //深度监听，可监听到对象、数组的变化
+        handler: function (val, oldVal) {
+          if(document.all.myTemplateUrl){
+            document.all.myTemplateUrl.src = this.Url
+          }
+        },
+        deep: true,
+        immediate:true
+      },
+    },
+    mounted() {
+
     },
     methods: {
       close() {

src/components/confirmationOrderDownLoadNew.vue

@@ -38,7 +38,8 @@
 </style>
 
 <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>
     <el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
       <el-col :span="14" class="row-aic">
@@ -72,21 +73,21 @@
         <el-checkbox class="marginL11" style="display:none;" v-model="isShowTime">显示行程日期</el-checkbox>
       </el-col>
     </el-row>
-    <div id="pdfNode" class="LeaveGroupDownload-form">
+    <div id="pdfNode" class="LeaveGroupDownload-form LeaveGroupDownload-formHV">
       <div id="pdfDom">
         <!-- 首页 -->
         <LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
           :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId"
           :priceList="priceList">
         </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>
-
+        <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>
@@ -209,6 +210,7 @@
   import LeaveGroupDownload from './LeaveGroupDownload/index'
   import ItineraryFeatures from './LeaveGroupDownload/ItineraryFeatures'
   import travelDays from './LeaveGroupDownload/travelDays'
+  import travelDaysHV from './LeaveGroupDownload/travelDaysHV'
   import TourFareDescription from './LeaveGroupDownload/TourFareDescription'
   import OrderNotice from './LeaveGroupDownload/OrderNotice'
   import VisaInformation from './LeaveGroupDownload/VisaInformation'
@@ -221,6 +223,7 @@
       LeaveGroupDownload,
       ItineraryFeatures,
       travelDays,
+      travelDaysHV,
       TourFareDescription,
       OrderNotice,
       VisaInformation
@@ -569,7 +572,7 @@
         //   objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
         //   that.downloadChengDuFileRename(objFileKey, fileName, res => {
         //     if (res.resultCode == 0) {
-            
+
         //     } else {
         //       that.pdfLoading = false;
         //     }
@@ -1018,6 +1021,7 @@
   @import url("../assets/css/UpgradedVersion.css");
   @import url("../assets/css/tripIndexNew2.css");
   @import url('../assets/css/detail.css');
+  @import url('../assets/css/tripIndexNewHV.css');
 
 
   .edit_form_box {

src/components/index.vue

@@ -1991,7 +1991,7 @@
       // 添加编辑模版
       journeyTemplate(){
         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
       },
       GetExaminePriceOrderPageList(type) {

src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue

@@ -224,7 +224,7 @@
                 </div>
               </div>
             </div>
-            <div class="_VideoStr_box">
+            <div class="_VideoStr_box" v-if="false">
               <el-form-item label="行程主题色">
                 <el-color-picker style='vertical-align: middle;' v-model="PostConfig.TripColor"></el-color-picker>
               </el-form-item>

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -140,7 +140,7 @@
     </div>
 
     <!-- ppt 模版新增编辑窗口 -->
-    <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl"
+    <pptIframe v-show="dialogPptistVisible" :FeaturePageType="dataAll.FeaturePageType" :Url="TemplateUrl"
     @close="closeIframe()"></pptIframe>
   </div>
 </template>
@@ -179,7 +179,7 @@
       UpgradedVersion,
       pptIframe
     },
-    props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"],
+    props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType", "dataAll"],
     inject: ['loadConfigInfo'],
     data() {
       return {
@@ -339,9 +339,9 @@
         this.isPostMessage = false
         let href = this.domainManager().PptUrl
         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{
-          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
       },
@@ -674,6 +674,12 @@
       }
     },
     watch: {
+      dataAll:{
+        handler: function (val, oldVal) {
+        },
+        deep: true,
+        immediate:true
+      },
       FeatureData: {
         //深度监听，可监听到对象、数组的变化
         handler: function (val, oldVal) {

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -55,7 +55,7 @@
         :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity"
         :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData"
         :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"
         :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"
         @ConfigInfo="firstLoadConfigInfo">
@@ -222,6 +222,7 @@
           TripCityList: [], //行程城市
           TripMapList: [],
           NotQueryCityList:[],//使用系统中的经纬度城市
+          FeaturePageType:0,//1横版 2竖版
         },
         //行程
         FeatureData: {
@@ -422,6 +423,7 @@
         basicData.RemoveChild = this.PostConfig.RemoveChild;
         basicData.OfferId = this.PostConfig.OfferId;
         basicData.TeamType = this.PostConfig.TeamType;
+        basicData.FeaturePageType = this.PostConfig.FeaturePageType
 
         basicData.TripMapList = this.PostConfig.TripMapList;
         basicData.TripCountryList = this.PostConfig.TripCountryList;
@@ -457,7 +459,6 @@
         basicData.WCountryId = this.PostConfig.WCountryId;
         basicData.WLocationId = this.PostConfig.WLocationId;
         basicData.WCityId = this.PostConfig.WCityId;
-        this.journeyList.FeaturePageType = this.PostDaysTrip.FeaturePageType;
         this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip;
         //行程特色数据
         var TripFeature = {};
@@ -685,13 +686,12 @@
           this.journeyList.isFileUpload = true;
           this.journeyList.DayNum = configData.Days.length;
           this.journeyList.NightNum = this.journeyList.DayNum - 1;
-          let _this = this
           let arrDayList = function(list){
             list.forEach(x=>{
               x.IsBlowUp = false
-              if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
+              if(this.PostConfig.FeaturePageType==2){
                 x.zoom = 0.44
-              }else if(_this.journeyList.FeaturePageType==1){
+              }else if(this.PostConfig.FeaturePageType==1){
                 x.zoom = 0.285
               }
             })
@@ -883,6 +883,7 @@
                 this.PostConfig.LineteamId = tempData.LineteamId;
                 this.PostConfig.CountryID = tempData.CountryID;
                 this.PostConfig.TeamType = tempData.TeamType;
+                this.PostConfig.FeaturePageType = tempData.FeaturePageType;
                 //视频地址
                 this.PostConfig.VideoStr = tempData.VideoStr;
                 this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
@@ -949,18 +950,16 @@
 
                 //默认不联动行程特色
                 this.journeyList.IsUpdateTrip = 0;
-                this.journeyList.FeaturePageType = 2;
                 this.journeyList.DayNum = tempData.DayNum;
                 this.journeyList.NightNum = tempData.NightNum;
                 this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
                 this.journeyList.StartCityId = tempData.StartCityId;
-                let _this = this
                 let arrDayList = function(list){
                   list.forEach(x=>{
                     x.IsBlowUp = false
-                    if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
+                    if(tempData.FeaturePageType==2){
                       x.zoom = 0.44
-                    }else if(_this.journeyList.FeaturePageType==1){
+                    }else if(tempData.FeaturePageType==1){
                       x.zoom = 0.285
                     }
                   })
@@ -1055,6 +1054,13 @@
       '$route'(to, from) { //监听路由是否变化
         location.reload()
       },
+      PostDaysTrip:{
+        handler: function (val, oldVal) {
+
+        },
+        deep: true,
+        immediate:true
+      }
     },
     mounted() {
       this.CurrentUserInfo = this.getLocalStorage();;

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -162,7 +162,7 @@
           <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.ReturnCity')}}</span>
           <span :class="{'showOther':TeamType==3}">
             <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>
                 <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">
@@ -173,7 +173,7 @@
           <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
           <span :class="{'showOther':TeamType==3}">
             <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.Update')" :value="1"></el-option>
               </el-select>
@@ -182,9 +182,9 @@
           <template v-if="false">
             <span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
             <span :class="{'showOther':TeamType==3}">
-              <el-form-item prop="ReturnArriveCityId">
-                <el-select placeholder="请选择版型" v-model="subConfig.FeaturePageType"
-                style="width: 80px;">
+              <el-form-item prop="FeaturePageType">
+                <el-select class="w90" placeholder="请选择版型" v-model="dataAll.FeaturePageType"
+                @change="getFeaturePageType()">
                   <el-option label="横版" :value="1"></el-option>
                   <el-option label="竖版" :value="2"></el-option>
                 </el-select>
@@ -206,14 +206,14 @@
                     <span class="el-icon-full-screen absolute BlowUpTravelDays"
                     @click="clickBlowUpTravelDays(item)"></span>
                   </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>
-                  <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>
                   <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>
-                    <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>
                     <span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose"
                       @click="clickBlowUpTravelDays(item)"></span>
@@ -270,10 +270,24 @@
       travelDaysHV
     },
     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){
         item.IsBlowUp=!item.IsBlowUp
         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()
       },
       handlerChangeDateList(data) {
@@ -443,6 +457,7 @@
           WarmTipList: WarmTipList,
           TitleList: TitleList,
           IsUpdateTrip:this.subConfig.IsUpdateTrip,
+          FeaturePageType: this.dataAll.FeaturePageType
         };
         this.HotelList = HotelList;
         this.DinnerList = DinnerList;
@@ -466,6 +481,14 @@
       }
     },
     watch: {
+      'dataAll.FeaturePageType': {
+        deep: true,
+        immediate: true,
+        handler: function (newVal, oldVal) {
+
+
+        }
+      },
       'subConfig.DayList': {
         deep: true,
         handler: function (newVal, oldVal) {