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

ed9e64d1 · liudong1993 · fc9e46fb · 659fc233 · ed9e64d1 · ed9e64d1
Commit ed9e64d1 authored Dec 14, 2023 by liudong1993
14 changed files
--- a/src/assets/css/tripIndexNewHV.css
+++ b/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;
+}
--- a/src/components/FinancialModule/RecPayQuery.vue
+++ b/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">

--- a/src/components/Hotel/roomReservationsDetails.vue
+++ b/src/components/Hotel/roomReservationsDetails.vue
@@ -28,6 +28,17 @@
    padding: 5px;
  }

+  .roomReservationsDetailsTalbe {
+    table-layout: fixed;
+  
+  }
+
+  .roomReservationsDetailsTalbe thead tr th {
+    position: sticky;
+    top: 0;
+    z-index: 1000;
+  }
+
 </style>

 <template>
@@ -49,15 +60,16 @@
    </div>
    <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
      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>
-          <th class="fz14" colspan="5">
+            <th class="fz14" style="border:none;" >
              {{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
-            &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th>
-          <th class="fz14" colspan="17">
+              &nbsp;&nbsp;{{$t('leader.leader_Guide')}}: {{GuideName}} </th>
+            <th class="fz14"  style="border:none;">
              <el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start"
                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">
                  <table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
                    <tr>
@@ -66,11 +78,12 @@
                    </tr>
                    <template v-for="(lItem,lIndex) in list">
                      <tr v-for="(subItem,subIndex) in lItem.HotelOrderList" :key="subIndex+lIndex">
-                      <td style="width:100px;">
+                        <td style="width:120px;">
                          {{lItem.UseTimeStr}}
                        </td>
                        <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>
                        </td>
                      </tr>
@@ -89,8 +102,6 @@
                  </el-button>
                </el-popover>
              </el-tooltip>
-            <span style="margin-top:6px;display:inline-block;">{{$t('ground.dijiecaozuoxinxi')}}</span>
-
              <el-tooltip class="item" effect="dark" content="批量修改" placement="top-start"
                style="float:left;margin-left:20px;">
                <el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click"
@@ -130,6 +141,10 @@
              </el-tooltip>
            </th>
          </tr>
+        </thead>
+      </table>
+      <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
+        <thead>
          <tr>
            <th width="120">{{$t('hotel.table_CheckInDate')}}</th>
            <th width="180">{{$t('hotel.hotel_name')}}</th>
@@ -140,7 +155,6 @@
            <th width="100">{{$t('ground.fangjianleixing')}}</th>
            <th width="80">{{$t('ground.fangjian')}}<br />{{$t("ground.yudingshu")}}</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.mianjianrenshu')}}</th>
            <th width="80">{{$t('ground.jinexiaoji')}}</th>
@@ -154,6 +168,8 @@
            <th width="250">{{$t('ground.fukuanbzdth')}}</th>
            <th width="80">{{$t('system.table_operation')}}</th>
          </tr>
+        </thead>
+        <tbody>
          <template v-for="(item,index) in list">
            <template v-for="(subItem,subIndex) in item.HotelOrderList">
              <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
@@ -193,7 +209,8 @@
                      </td>
                    </tr>
                  </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>
                </td>
                <!-- 机位总数/(Y/E/F) -->
@@ -575,7 +592,8 @@
                    </el-tooltip>
                    <el-tooltip class="item" effect="dark" :content="$t('pub.addBtn')" v-if="subItem.OPState!=1"
                      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 v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark"
                      :content="$t('system.table_delete')" placement="top-start">
@@ -592,6 +610,7 @@
              </tr>
            </template>
          </template>
+        </tbody>
      </table>
      <div class="noDataNotice" v-if="list.length<1">
        <i class="iconfont icon-kong"></i>

--- a/src/components/LeaveGroupDownload/ItineraryFeatures.vue
+++ b/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'

--- a/src/components/LeaveGroupDownload/index.vue
+++ b/src/components/LeaveGroupDownload/index.vue
 <template>
  <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;">
+        <template v-if="dataAll.featurePageType==2">
          <Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
-
          <div class="travelDaysTitlle row-aic" :style="{'background':backgroundColor}">
            <div class="travelDaysTitlle-left">
              <div class="relative">
@@ -24,6 +27,32 @@
              </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-left">
@@ -43,6 +72,7 @@
            </div>
          </div>
        </div> -->
+        <div :class="[dataAll.featurePageType==1?'travelDaysHVMasterMap2-box':'']">
          <div style="margin: 0 30px;">
            <div class="trip-adviser" style="margin-top: 20px;">
              <!-- <h1 class="trip-nav-title">
@@ -54,7 +84,8 @@
                在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！
              </p>
            </div>
-          <table class="baseTable trip-v3-base">
+            <table class="baseTable trip-v3-base"
+            :class="[dataAll.featurePageType==1?'baseTableHV':'']">
              <tbody>
                <tr>
                  <td class="essential-item jianju">
@@ -147,7 +178,8 @@
              <div class="trip-v3-title small-margin">
                参考航班
              </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"
                  :class="{'guoneiLine':lineId==90}">
                  <thead class="flight_header">
@@ -217,9 +249,11 @@
              </div>
            </template>
          </div>
+        </div>
+

        <!-- otherJourney-footer -->
-        <div>
+        <div v-if="dataAll.featurePageType==2">
          <div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
            <div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.tripColor}">&nbsp;</div>
            <div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.tripColor}">&nbsp;</div>

--- a/src/components/LeaveGroupDownload/travelDaysHV.vue
+++ b/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>
--- a/src/components/commonPage/pptIframe/index.vue
+++ b/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() {

--- a/src/components/confirmationOrderDownLoadNew.vue
+++ b/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
@@ -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 {

--- a/src/components/index.vue
+++ b/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) {

--- a/src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
+++ b/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>

--- a/src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
+++ b/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) {

--- a/src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
+++ b/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();;

--- a/src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
+++ b/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) {

--- a/src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
+++ b/src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
@@ -142,10 +142,14 @@
                              </div>
                            </div>
                          </div>
-                          <div style="margin-top: 23px;" v-if="item.ScenicArray.length>0">
-                            <div class="fz21 fontBold travelDaysHV-CouponsName color2A2A2A"
-                            :style="{'color':dataAll.TripColor}">【{{item.ScenicArray[0].CouponsName}}】</div>
-                            <div class="travelDaysHV-Description" style="margin-top: 21px;">
+                          <div style="margin-top: 18px;" v-if="item.ScenicArray.length>0">
+                            <div class="fz21 fontBold travelDaysHV-CouponsName"
+                            :style="{'color':dataAll.TripColor}">
+                              <span class="CouponsNameM">【</span>
+                              <span class="CouponsNameT">{{item.ScenicArray[0].CouponsName}}</span>
+                              <span class="CouponsNameM">】</span>
+                            </div>
+                            <div class="travelDaysHV-Description" >
                              <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
                            </div>
                          </div>
@@ -186,664 +190,46 @@
                              </div>
                            </div>
                          </div>
-                          <div class="ML26 flexG">
-                            <template v-if="item.ScenicArray.length>1">
-                              <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
-                              <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                                <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
-                              </div>
-                            </template>
-                          </div>
-                        </div>
-                      </div>
-
-                      <!-- 3张 -->
-                      <div v-if="item.ScenicArray.length>2">
-                        <div class="row MB32">
-                          <div class="flexS">
-                            <div :id="'viewSpotBox_'+(item*4)+'_0'+index"
-                              class="travelDaysMasterMap3_1 hidden relative borderRadius18">
-                              <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                                <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                                  <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                                    <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                      :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                                      @toSelectImg="SelectImg(0)" :x="517" :y="280"></FeatureControls>
-                                    <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
-                                      @change="uploadpic">
-                                  </div>
-                                  <VueDraggableResizable v-if="item.ScenicArray.length==3" :w="517" :h="280"
-                                    :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
-                                    :active="false" :parent="false" axis="y" @activated="onActivated(1)"
-                                    :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                    :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                    :z="2" @dragstop="onViewSpotDragstop">
-                                    <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
-                                      <img
-                                        v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
-                                        class="absolute img100" :src="ScenicArrayList[0].NewImaArray[0].Url"
-                                        :id="'viewSpotImg_'+(item*4)+'_0'+index">
-                                    </template>
-                                    <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
-                                      :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                      :id="'viewSpotImg_'+(item*4)+'_0'+index">
-                                  </VueDraggableResizable>
-                                  <img
-                                    v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                    class="absolute img100"
-                                    :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div class="ML26 flexG">
-                            <template v-if="item.ScenicArray.length>0">
-                              <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
-                              <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                                <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
-                              </div>
-                            </template>
-                          </div>
-                        </div>
-                        <div class="row MB32">
-                          <div class="flexG">
-                            <template v-if="item.ScenicArray.length>1">
-                              <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
-                              <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                                <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
-                              </div>
-                            </template>
-                          </div>
-                          <div class="ML26 flexS">
-                            <div :id="'viewSpotBox_'+(item*4)+'_1'+index"
-                              class="travelDaysMasterMap3_1 hidden relative borderRadius18">
-                              <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                                <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                                  <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                                    <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                      :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
-                                      @toSelectImg="SelectImg(1)" :x="517" :y="280"></FeatureControls>
-                                  </div>
-                                  <VueDraggableResizable
-                                    v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="517"
-                                    :h="280" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
-                                    :active="false" :parent="false" axis="y" @activated="onActivated(1)"
-                                    :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                    :y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                    :z="2" @dragstop="onViewSpotDragstop">
-                                    <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
-                                      <img
-                                        v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
-                                        class="absolute img100" :src="ScenicArrayList[1].NewImaArray[0].Url"
-                                        :id="'viewSpotImg_'+(item*4)+'_1'+index">
-                                    </template>
-                                    <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
-                                      :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                      :id="'viewSpotImg_'+(item*4)+'_1'+index">
-                                  </VueDraggableResizable>
-                                  <img
-                                    v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                    class="absolute img100"
-                                    :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div class="row">
-                          <div class="flexS">
-                            <div :id="'viewSpotBox_'+(item*4)+'_2'+index"
-                              class="travelDaysMasterMap3_1 hidden relative borderRadius18">
-                              <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                                <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                                  <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                                    <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                      :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)"
-                                      @toSelectImg="SelectImg(2)" :x="517" :y="280"></FeatureControls>
-                                  </div>
-                                  <VueDraggableResizable
-                                    v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="517"
-                                    :h="280" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
-                                    :active="false" :parent="false" axis="y" @activated="onActivated(2)"
-                                    :x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                    :y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                    :z="2" @dragstop="onViewSpotDragstop">
-                                    <template v-if="ScenicArrayList&&ScenicArrayList.length>2">
-                                      <img
-                                        v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
-                                        class="absolute img100" :src="ScenicArrayList[2].NewImaArray[0].Url"
-                                        :id="'viewSpotImg_'+(item*4)+'_2'+index">
-                                    </template>
-                                    <img v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2" class="absolute img100"
-                                      :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                      :id="'viewSpotImg_'+(item*4)+'_2'+index">
-                                  </VueDraggableResizable>
-                                  <img
-                                    v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                    class="absolute img100"
-                                    :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                          <div class="ML26 flexG">
-                            <template v-if="item.ScenicArray.length>2">
-                              <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
-                              <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                                <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
-                              </div>
-                            </template>
-                          </div>
-                        </div>
-                      </div>
-                </div>
-                <div class="travelDaysHVdetails">
-                  <div class="travelDaysHVdetailsBJ column">
-                    <div class="travelDaysHVTdetails-textBox row-sb">
-                      <div class="travelDaysdetails-text row">
-                        <div class="travelDaysHVdetails-icon">
-                          <span class="iconfont icon-b-meals"
-                          :style="{'color':backgroundColor2}"></span>
-                        </div>
-                        <span class="travelDaysHVdetails-text0">早餐：</span>
-                        <div class="trtravelDaysHVdetails-textC">
-                          <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>0">
-                            {{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}
-                          </template>
-                        </div>
-                      </div>
-                      <div class="travelDaysdetails-text row">
-                        <span class="travelDaysHVdetails-text0">午餐：</span>
-                        <div class="trtravelDaysHVdetails-textC">
-                          <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>1">
-                            {{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}
-                          </template>
-                        </div>
-                      </div>
-                      <div class="travelDaysdetails-text row">
-                        <span class="travelDaysHVdetails-text0 iconfont icon-qianming">晚餐：</span>
-                        <div class="trtravelDaysHVdetails-textC"> <template
-                            v-if="item&&item.DinnerArray&&item.DinnerArray.length>2">
-                            {{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}
-                          </template>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="travelDaysHVdetails-textBox"></div>
-                    <div class="travelDaysHVTdetails-textBox row">
-                      <div class="travelDaysdetails-text right0 row">
-                        <div class="travelDaysHVdetails-icon">
-                          <span class="iconfont icon-zhusu"
-                          :style="{'color':backgroundColor2}"></span>
-                        </div>
-                        <span class="travelDaysHVdetails-text0">住宿：</span>
-                        <div class="trtravelDaysHVdetails-textC" v-if="item.HotelArray">
-                          <template v-if="item.HotelArray.length==1">
-                            {{item.HotelArray[0].HotelName!='温馨的家'?item.HotelArray[0].HotelName+"/或同级":"温馨的家"}}
-                          </template>
-                          <template v-else>
-                            <template v-for="(j) in item.HotelArray">{{j.HotelName}}、</template> /或同级
-                          </template>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-          <template v-if="false">
-            <template v-if="item.TitleObj.ShowTripType==2&&item.ScenicArray.length>1">
-              <div class="column travelDaysHVMasterMap2-box">
-                <!-- 2张 -->
-                <div v-if="item.ScenicArray.length==2">
-                  <div class="MB25">
-                    <div :id="'viewSpotBox_'+(item*4)+'_0'+index"
-                      class="travelDaysHVMasterMap2 hidden relative">
-                      <div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
-                        <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                          <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                            <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                              :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                              @toSelectImg="SelectImg(0)" :x="786" :y="524"></FeatureControls>
-                            <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
-                              @change="uploadpic">
-                          </div>
-                          <VueDraggableResizable
-                            v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="786"
-                            :h="524" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
-                            :active="false" :parent="false" axis="y" @activated="onActivated(0)"
-                            :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                            :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                            :z="2" @dragstop="onViewSpotDragstop">
-                            <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
-                              <img
-                                v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
-                                class="absolute img100" :src="ScenicArrayList[0].NewImaArray[0].Url"
-                                :id="'viewSpotImg_'+(item*4)+'_0'+index">
-                            </template>
-                            <img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute img100"
-                              :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                              :id="'viewSpotImg_'+(item*4)+'_0'+index">
-                          </VueDraggableResizable>
-                          <img
-                            v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                            class="absolute img100"
-                            :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                        </div>
-                      </div>
-                    </div>
-                    <div class="MT28" v-if="item.ScenicArray.length>0">
-                      <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
-                      <div class="fz18 MT15 lineHeight25 color444 fontFamilyUI">
-                        <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="row" v-if="ScenicArrayList.length>1">
-                    <div class="flexS">
-                      <div :id="'viewSpotBox_'+(item*4)+'_1'+index"
-                        class="travelDaysMasterMap2_2 hidden relative borderRadius18">
-                        <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                          <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                            <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                              <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
-                                @toSelectImg="SelectImg(1)" :x="524" :y="250"></FeatureControls>
-                            </div>
-                            <VueDraggableResizable
-                              v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="524"
-                              :h="250" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
-                              :active="false" :parent="false" axis="y" @activated="onActivated(1)"
-                              :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                              :y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                              :z="2" @dragstop="onViewSpotDragstop">
-                              <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
-                                <img
-                                  v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
-                                  class="absolute img100" :src="ScenicArrayList[1].NewImaArray[0].Url"
-                                  :id="'viewSpotImg_'+(item*4)+'_1'+index">
-                              </template>
-                              <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
-                                :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :id="'viewSpotImg_'+(item*4)+'_1'+index">
-                            </VueDraggableResizable>
-                            <img
-                              v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                              class="absolute img100"
-                              :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="ML26 flexG">
-                      <template v-if="item.ScenicArray.length>1">
-                        <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
-                        <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                          <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
-                        </div>
-                      </template>
-                    </div>
-                  </div>
-                </div>
-
-                <!-- 3张 -->
-                <div v-if="item.ScenicArray.length>2">
-                  <div class="row MB32">
-                    <div class="flexS">
-                      <div :id="'viewSpotBox_'+(item*4)+'_0'+index"
-                        class="travelDaysMasterMap3_1 hidden relative borderRadius18">
-                        <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                          <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                            <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                              <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                                @toSelectImg="SelectImg(0)" :x="517" :y="280"></FeatureControls>
-                              <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
-                                @change="uploadpic">
-                            </div>
-                            <VueDraggableResizable v-if="item.ScenicArray.length==3" :w="517" :h="280"
-                              :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
-                              :active="false" :parent="false" axis="y" @activated="onActivated(1)"
-                              :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                              :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                              :z="2" @dragstop="onViewSpotDragstop">
-                              <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
-                                <img
-                                  v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
-                                  class="absolute img100" :src="ScenicArrayList[0].NewImaArray[0].Url"
-                                  :id="'viewSpotImg_'+(item*4)+'_0'+index">
-                              </template>
-                              <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
-                                :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :id="'viewSpotImg_'+(item*4)+'_0'+index">
-                            </VueDraggableResizable>
-                            <img
-                              v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                              class="absolute img100"
-                              :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="ML26 flexG">
-                      <template v-if="item.ScenicArray.length>0">
-                        <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
-                        <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                          <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
-                        </div>
-                      </template>
-                    </div>
-                  </div>
-                  <div class="row MB32">
-                    <div class="flexG">
-                      <template v-if="item.ScenicArray.length>1">
-                        <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
-                        <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                          <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
-                        </div>
-                      </template>
-                    </div>
-                    <div class="ML26 flexS">
-                      <div :id="'viewSpotBox_'+(item*4)+'_1'+index"
-                        class="travelDaysMasterMap3_1 hidden relative borderRadius18">
-                        <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                          <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                            <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                              <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
-                                @toSelectImg="SelectImg(1)" :x="517" :y="280"></FeatureControls>
-                            </div>
-                            <VueDraggableResizable
-                              v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="517"
-                              :h="280" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
-                              :active="false" :parent="false" axis="y" @activated="onActivated(1)"
-                              :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                              :y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                              :z="2" @dragstop="onViewSpotDragstop">
-                              <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
-                                <img
-                                  v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
-                                  class="absolute img100" :src="ScenicArrayList[1].NewImaArray[0].Url"
-                                  :id="'viewSpotImg_'+(item*4)+'_1'+index">
-                              </template>
-                              <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
-                                :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :id="'viewSpotImg_'+(item*4)+'_1'+index">
-                            </VueDraggableResizable>
-                            <img
-                              v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                              class="absolute img100"
-                              :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="row">
-                    <div class="flexS">
-                      <div :id="'viewSpotBox_'+(item*4)+'_2'+index"
-                        class="travelDaysMasterMap3_1 hidden relative borderRadius18">
-                        <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                          <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                            <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                              <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)"
-                                @toSelectImg="SelectImg(2)" :x="517" :y="280"></FeatureControls>
-                            </div>
-                            <VueDraggableResizable
-                              v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="517"
-                              :h="280" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
-                              :active="false" :parent="false" axis="y" @activated="onActivated(2)"
-                              :x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                              :y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                              :z="2" @dragstop="onViewSpotDragstop">
-                              <template v-if="ScenicArrayList&&ScenicArrayList.length>2">
-                                <img
-                                  v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
-                                  class="absolute img100" :src="ScenicArrayList[2].NewImaArray[0].Url"
-                                  :id="'viewSpotImg_'+(item*4)+'_2'+index">
-                              </template>
-                              <img v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2" class="absolute img100"
-                                :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :id="'viewSpotImg_'+(item*4)+'_2'+index">
-                            </VueDraggableResizable>
-                            <img
-                              v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                              class="absolute img100"
-                              :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="ML26 flexG">
-                      <template v-if="item.ScenicArray.length>2">
-                        <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
-                        <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                          <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
-                        </div>
-                      </template>
-                    </div>
-                  </div>
-                </div>
-                <template v-if="false">
-                <!-- 4张 -->
-                <template v-if="item.ScenicArray.length==4">
-                  <div class="row">
-                    <div class="flexS">
-                      <div :id="'viewSpotBox_'+(item*4)+'_0'+index"
-                        class="travelDaysMasterMap4_1 hidden relative borderRadius18">
-                        <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                          <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                            <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                              <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                                @toSelectImg="SelectImg(0)" :x="696" :y="449"></FeatureControls>
-                              <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
-                                @change="uploadpic">
-                            </div>
-                            <VueDraggableResizable v-if="item.ScenicArray.length==4" :h="449" :w="696"
-                              :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
-                              :active="false" parent=".travelDaysMasterMap4_1" axis="y" @activated="onActivated(0)"
-                              :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                              :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                              :z="2" @dragstop="onViewSpotDragstop" :min-width="696">
-                              <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
-                                <img
-                                  v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
-                                  class="absolute img100 borderRadius18" :src="ScenicArrayList[0].NewImaArray[0].Url"
-                                  :id="'viewSpotImg_'+(item*4)+'_0'+index">
-                              </template>
-                              <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1"
-                                class="absolute img100 borderRadius18"
-                                :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :id="'viewSpotImg_'+(item*4)+'_0'+index">
-                            </VueDraggableResizable>
-                            <img
-                              v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                              class="absolute img100 borderRadius18"
-                              :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                          </div>
-                        </div>
-                      </div>
+                          <div style="margin-top: 18px;" v-if="item.ScenicArray.length>1">
+                              <div class="fz21 fontBold travelDaysHV-CouponsName"
+                              :style="{'color':dataAll.TripColor}">
+                              <span class="CouponsNameM">【</span>
+                              <span class="CouponsNameT">{{item.ScenicArray[1].CouponsName}}</span>
+                              <span class="CouponsNameM">】</span>
                            </div>
-                    <div class="ML37 flexG">
-                      <template v-if="item.ScenicArray.length>0">
-                        <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
-                        <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                          <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
-                        </div>
-                      </template>
-                    </div>
-                  </div>
-                  <div class="row-sb" style="margin-top: 32px;">
-                    <div class="flex1 column">
-                      <div>
-                        <div :id="'viewSpotBox_'+(item*4)+'_1'+index"
-                          class="travelDaysMasterMap4_2 hidden relative borderRadius18">
-                          <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                            <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                              <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                                <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                  :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)" :x="331" :y="214">
-                                </FeatureControls>
-                              </div>
-                              <VueDraggableResizable
-                                v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0"
-                                :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(1)"
-                                :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                :y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                :z="2" @dragstop="onViewSpotDragstop">
-                                <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
-                                  <img
-                                    v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
-                                    class="absolute img100" :src="ScenicArrayList[1].NewImaArray[0].Url"
-                                    :id="'viewSpotImg_'+(item*4)+'_1'+index">
-                                </template>
-                                <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1"
-                                  class="absolute img100" :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                  :id="'viewSpotImg_'+(item*4)+'_1'+index">
-                              </VueDraggableResizable>
-                              <img
-                                v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                class="absolute img100"
-                                :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="MT28 width331">
-                        <template v-if="item.ScenicArray.length>1">
-                          <div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title">
-                            {{item.ScenicArray[1].CouponsName}}</div>
-                          <div class="fz18 MT15 lineHeight25 color444 fontFamilyUI">
+                              <div class="travelDaysHV-Description" >
                                <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
                              </div>
-                        </template>
-                      </div>
-                    </div>
-                    <div class="flex1 column ML33 MR33">
-                      <div>
-                        <div :id="'viewSpotBox_'+(item*4)+'_2'+index"
-                          class="travelDaysMasterMap4_2 hidden relative borderRadius18">
-                          <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                            <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                              <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                                <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                  :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :x="331" :y="214">
-                                </FeatureControls>
-                              </div>
-                              <VueDraggableResizable
-                                v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0"
-                                :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(2)"
-                                :x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                :y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                :z="2" @dragstop="onViewSpotDragstop">
-                                <template v-if="ScenicArrayList&&ScenicArrayList.length>2">
-                                  <img
-                                    v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
-                                    class="absolute img100" :src="ScenicArrayList[2].NewImaArray[0].Url"
-                                    :id="'viewSpotImg_'+(item*4)+'_2'+index">
-                                </template>
-                                <img v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2"
-                                  class="absolute img100" :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                  :id="'viewSpotImg_'+(item*4)+'_2'+index">
-                              </VueDraggableResizable>
-                              <img
-                                v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                class="absolute img100"
-                                :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="MT28">
-                        <template v-if="item.ScenicArray.length>2">
-                          <div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title">
-                            {{item.ScenicArray[2].CouponsName}}</div>
-                          <div class="fz18 MT15 lineHeight25 color444 fontFamilyUI">
-                            <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
-                          </div>
-                        </template>
-                      </div>
-                    </div>
-                    <div class="flex1 column">
-                      <div>
-                        <div :id="'viewSpotBox_'+(item*4)+'_3'+index"
-                          class="travelDaysMasterMap4_2 hidden relative borderRadius18">
-                          <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                            <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                              <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                                <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                  :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :x="331" :y="214">
-                                </FeatureControls>
-                              </div>
-                              <VueDraggableResizable
-                                v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0"
-                                :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(3)"
-                                :x="ScenicArrayList&&ScenicArrayList.length>3?ScenicArrayList[3].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                :y="ScenicArrayList&&ScenicArrayList.length>3?ScenicArrayList[3].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                :z="2" @dragstop="onViewSpotDragstop">
-                                <template v-if="ScenicArrayList&&ScenicArrayList.length>3">
-                                  <img
-                                    v-if="!ScenicArrayList[3].NewImaArray[0].FileType&&ScenicArrayList[3].NewImaArray[0].Url"
-                                    class="absolute img100" :src="ScenicArrayList[3].NewImaArray[0].Url"
-                                    :id="'viewSpotImg_'+(item*4)+'_3'+index">
-                                </template>
-                                <img v-if="ScenicArrayList.length==3&&item.ScenicArray.length==3"
-                                  class="absolute img100" :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                  :id="'viewSpotImg_'+(item*4)+'_2'+index">
-                              </VueDraggableResizable>
-                              <img
-                                v-if="ScenicArrayList.length==3&&item.ScenicArray.length==3&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                class="absolute img100"
-                                :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
-                            </div>
-                          </div>
-                        </div>
                          </div>
-                      <div class="MT28">
-                        <template v-if="item.ScenicArray.length>3">
-                          <div class="fz21 fontBold fontFamilyLigh color2A2A2A card-title">
-                            {{item.ScenicArray[3].CouponsName}}</div>
-                          <div class="fz18 MT15 lineHeight25 color444 fontFamilyUI">
-                            <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[3].Description"></vEditSpan>
-                          </div>
-                        </template>
                        </div>
                      </div>
-                  </div>
-                </template>
-                <!-- 5张 -->
-                <div v-if="item.ScenicArray.length==5||item.ScenicArray.length>5">
-                  <div class="row-sb MB31">
-                    <div class="">
+
+                      <!-- 3张 -->
+                      <div v-if="item.ScenicArray.length>2" class="travelDaysHV2 row">
+                        <div class="travelDaysHV3-imgBox">
                          <div :id="'viewSpotBox_'+(item*4)+'_0'+index"
-                        class="travelDaysMasterMap5_1 hidden relative borderRadius18">
-                        <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
+                            class="travelDaysHVMasterMap3 hidden relative borderRadius18">
+                            <div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
                              <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                            <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
+                                <div class="featureDay-vToolBar absolute z-index3" style="zoom:3">
                                  <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                    :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                                @toSelectImg="SelectImg(0)" :x="514" :y="291"></FeatureControls>
+                                    @toSelectImg="SelectImg(0)" :x="516" :y="388"></FeatureControls>
                                  <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
                                    @change="uploadpic">
                                </div>
                                <VueDraggableResizable
-                              v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="514"
-                              :h="291" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
-                              :active="false" :parent="false" axis="y" @activated="onActivated(0)"
+                                  v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="516"
+                                  :h="388" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
+                                  :active="false" :parent="false" axis="x" @activated="onActivated(0)"
                                  :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                              :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                              :z="2" @dragstop="onViewSpotDragstop">
+                                  :y="0"
+                                  :z="2" @dragstop="onViewSpotDragstopY">
                                  <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
                                    <img
                                      v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
-                                  class="absolute img100" :src="ScenicArrayList[0].NewImaArray[0].Url"
+                                      class="absolute" :src="ScenicArrayList[0].NewImaArray[0].Url"
+                                      style="height: 100%;"
                                      :id="'viewSpotImg_'+(item*4)+'_0'+index">
                                  </template>
                                  <img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute img100"
@@ -852,242 +238,196 @@
                                </VueDraggableResizable>
                                <img
                                  v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                              class="absolute img100"
+                                  class="absolute"
+                                  style="height: 100%;"
                                  :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
                              </div>
                            </div>
                          </div>
-                      <div class="MT28" v-if="item.ScenicArray.length>0">
-                        <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
-                        <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
+                          <div style="margin-top: 18px;" v-if="item.ScenicArray.length>0">
+                            <div class="fz21 fontBold travelDaysHV-CouponsName travelDaysHV-CouponsName3"
+                            :style="{'color':dataAll.TripColor}">
+                              <span class="CouponsNameM">【</span>
+                              <span class="CouponsNameT">{{item.ScenicArray[0].CouponsName}}</span>
+                              <span class="CouponsNameM">】</span>
+                            </div>
+                            <div class="travelDaysHV-Description travelDaysHV-Description3">
                              <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
                            </div>
                          </div>
                        </div>
-                    <div class="ML33">
+                        <div class="travelDaysHV3-imgBox" style="margin-left: 49px;">
+                          <div class="flexS">
                            <div :id="'viewSpotBox_'+(item*4)+'_1'+index"
-                        class="travelDaysMasterMap5_1 hidden relative borderRadius18">
-                        <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
+                              class="travelDaysHVMasterMap3 hidden relative borderRadius18">
+                              <div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
                                <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                            <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
+                                  <div class="featureDay-vToolBar absolute z-index3" style="zoom:3">
                                    <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                      :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
-                                @toSelectImg="SelectImg(1)" :x="514" :y="291"></FeatureControls>
+                                      @toSelectImg="SelectImg(1)" :x="516" :y="388"></FeatureControls>
                                  </div>
                                  <VueDraggableResizable
-                              v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="514"
-                              :h="291" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
-                              :active="false" :parent="false" axis="y" @activated="onActivated(1)"
-                              :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                              :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                              :z="2" @dragstop="onViewSpotDragstop">
+                                    v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="516"
+                                    :h="388" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
+                                    :active="false" :parent="false" axis="x" @activated="onActivated(1)"
+                                    :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
+                                    :y="0"
+                                    :z="2" @dragstop="onViewSpotDragstopY">
                                    <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
                                      <img
                                        v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
-                                  class="absolute img100" :src="ScenicArrayList[1].NewImaArray[0].Url"
+                                        class="absolute"
+                                        style="height: 100%;" :src="ScenicArrayList[1].NewImaArray[0].Url"
                                        :id="'viewSpotImg_'+(item*4)+'_1'+index">
                                    </template>
-                              <img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute img100"
+                                    <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
                                      :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
                                      :id="'viewSpotImg_'+(item*4)+'_1'+index">
                                  </VueDraggableResizable>
                                  <img
                                    v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                              class="absolute img100"
+                                    class="absolute"
+                                    style="height: 100%;"
                                    :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
                                </div>
                              </div>
                            </div>
-                      <div class="MT28" v-if="item.ScenicArray.length>1">
-                        <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
-                        <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                          <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
                          </div>
+                          <div style="margin-top: 18px;" v-if="item.ScenicArray.length>1">
+                              <div class="fz21 fontBold travelDaysHV-CouponsName travelDaysHV-CouponsName3"
+                              :style="{'color':dataAll.TripColor}">
+                              <span class="CouponsNameM">【</span>
+                              <span class="CouponsNameT">{{item.ScenicArray[1].CouponsName}}</span>
+                              <span class="CouponsNameM">】</span>
+                            </div>
+                              <div class="travelDaysHV-Description travelDaysHV-Description3">
+                                <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
                              </div>
                          </div>
                        </div>
-                  <div class="row-sb">
-                    <div class="column">
-                      <div>
+                        <div class="travelDaysHV3-imgBox" v-if="ScenicArrayList.length>2" style="margin-left: 49px;">
+                          <div class="flexS">
                            <div :id="'viewSpotBox_'+(item*4)+'_2'+index"
-                          class="travelDaysMasterMap4_2 hidden relative borderRadius18">
-                          <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
+                              class="travelDaysHVMasterMap3 hidden relative borderRadius18">
+                              <div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
                                <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                              <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
+                                  <div class="featureDay-vToolBar absolute z-index3" style="zoom:3">
                                    <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                  :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :x="331" :y="214">
-                                </FeatureControls>
+                                      :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)"
+                                      @toSelectImg="SelectImg(2)" :x="516" :y="388"></FeatureControls>
                                  </div>
                                  <VueDraggableResizable
-                                v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0"
-                                :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(2)"
+                                    v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="516"
+                                    :h="388" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
+                                    :active="false" :parent="false" axis="x" @activated="onActivated(2)"
                                    :x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                :y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                :z="2" @dragstop="onViewSpotDragstop">
+                                    :y="0"
+                                    :z="2" @dragstop="onViewSpotDragstopY">
                                    <template v-if="ScenicArrayList&&ScenicArrayList.length>2">
                                      <img
                                        v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
-                                    class="absolute img100" :src="ScenicArrayList[2].NewImaArray[0].Url"
+                                        class="absolute"
+                                        style="height: 100%;" :src="ScenicArrayList[2].NewImaArray[0].Url"
                                        :id="'viewSpotImg_'+(item*4)+'_2'+index">
                                    </template>
-                                <img v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2"
-                                  class="absolute img100" :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
+                                    <img v-if="ScenicArrayList.length>2&&item.ScenicArray.length>2" class="absolute img100"
+                                      :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
                                      :id="'viewSpotImg_'+(item*4)+'_2'+index">
                                  </VueDraggableResizable>
                                  <img
                                    v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                class="absolute img100"
+                                    class="absolute"
+                                    style="height: 100%;"
                                    :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
                                </div>
                              </div>
                            </div>
                          </div>
-                      <div class="MT28">
-                        <template v-if="item.ScenicArray.length>2">
-                          <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}
+                          <div style="margin-top: 18px;">
+                              <div class="fz21 fontBold travelDaysHV-CouponsName travelDaysHV-CouponsName3"
+                              :style="{'color':dataAll.TripColor}">
+                              <span class="CouponsNameM">【</span>
+                              <span class="CouponsNameT">{{item.ScenicArray[2].CouponsName}}</span>
+                              <span class="CouponsNameM">】</span>
                            </div>
-                          <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
+                              <div class="travelDaysHV-Description travelDaysHV-Description3">
                                <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
                              </div>
-                        </template>
-                      </div>
                          </div>
-                    <div class="column ML33 MR33">
-                      <div>
-                        <div :id="'viewSpotBox_'+(item*4)+'_3'+index"
-                          class="travelDaysMasterMap4_2 hidden relative borderRadius18">
-                          <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                            <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                              <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                                <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                  :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :x="331" :y="214">
-                                </FeatureControls>
                        </div>
-                              <VueDraggableResizable
-                                v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0"
-                                :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(3)"
-                                :x="ScenicArrayList&&ScenicArrayList.length>3?ScenicArrayList[3].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                :y="ScenicArrayList&&ScenicArrayList.length>3?ScenicArrayList[3].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                :z="2" @dragstop="onViewSpotDragstop">
-                                <template v-if="ScenicArrayList&&ScenicArrayList.length>3">
-                                  <img
-                                    v-if="!ScenicArrayList[3].NewImaArray[0].FileType&&ScenicArrayList[3].NewImaArray[0].Url"
-                                    class="absolute img100" :src="ScenicArrayList[3].NewImaArray[0].Url"
-                                    :id="'viewSpotImg_'+(item*4)+'_3'+index">
-                                </template>
-                                <img v-if="ScenicArrayList.length==3&&item.ScenicArray.length==3"
-                                  class="absolute img100" :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                  :id="'viewSpotImg_'+(item*4)+'_2'+index">
-                              </VueDraggableResizable>
-                              <img
-                                v-if="ScenicArrayList.length==3&&item.ScenicArray.length==3&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                class="absolute img100"
-                                :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
                      </div>
                  </div>
+                <div class="travelDaysHVdetails" :style="{'margin-top':(item.TitleObj.ShowTripType==2&&
+                (item.ScenicArray.length==1||item.ScenicArray.length==0))
+                ||((item.TitleObj.ShowTripType==1||item.TitleObj.ShowTripType==0)&&
+                (item.ScenicArray.length>0||item.ScenicArray.length==0))?'47px':'33px'}">
+                  <div class="travelDaysHVdetailsBJ column">
+                    <div class="travelDaysHVTdetails-textBox row-sb">
+                      <div class="travelDaysdetails-text row nowrap">
+                        <div>
+                          <div class="travelDaysHVdetails-icon">
+                            <span class="iconfont icon-b-meals"
+                            :style="{'color':backgroundColor2}"></span>
                          </div>
                        </div>
-                      <div class="MT28">
-                        <template v-if="item.ScenicArray.length>3">
-                          <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[3].CouponsName}}
+                        <span class="travelDaysHVdetails-text0">早餐：</span>
+                        <div class="trtravelDaysHVdetails-textC">
+                          <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>0">
+                            {{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}
+                          </template>
                        </div>
-                          <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                            <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[3].Description"></vEditSpan>
                      </div>
+                      <div class="travelDaysdetails-text row nowrap">
+                        <span class="travelDaysHVdetails-text0">午餐：</span>
+                        <div class="trtravelDaysHVdetails-textC">
+                          <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>1">
+                            {{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}
                          </template>
                        </div>
                      </div>
-                    <div class="column">
-                      <div>
-                        <div :id="'viewSpotBox_'+(item*4)+'_4'+index"
-                          class="travelDaysMasterMap4_2 hidden relative borderRadius18">
-                          <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-                            <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
-                              <div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
-                                <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
-                                  :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(4)" @toSelectImg="SelectImg(4)" :x="331" :y="214">
-                                </FeatureControls>
-                              </div>
-                              <VueDraggableResizable
-                                v-if="item.ScenicArray.length>4||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_4'+index" tabindex="0"
-                                :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(4)"
-                                :x="ScenicArrayList&&ScenicArrayList.length>4?ScenicArrayList[4].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
-                                :y="ScenicArrayList&&ScenicArrayList.length>4?ScenicArrayList[4].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                                :z="2" @dragstop="onViewSpotDragstop">
-                                <template v-if="ScenicArrayList&&ScenicArrayList.length>4">
-                                  <img
-                                    v-if="!ScenicArrayList[4].NewImaArray[0].FileType&&ScenicArrayList[4].NewImaArray[0].Url"
-                                    class="absolute img100" :src="ScenicArrayList[4].NewImaArray[0].Url"
-                                    :id="'viewSpotImg_'+(item*4)+'_4'+index">
+                      <div class="travelDaysdetails-text row">
+                        <span class="travelDaysHVdetails-text0">晚餐：</span>
+                        <div class="trtravelDaysHVdetails-textC"> <template
+                            v-if="item&&item.DinnerArray&&item.DinnerArray.length>2">
+                            {{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}
                          </template>
-                                <img v-if="ScenicArrayList.length==4&&item.ScenicArray.length==4"
-                                  class="absolute img100" :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                  :id="'viewSpotImg_'+(item*4)+'_4'+index">
-                              </VueDraggableResizable>
-                              <img
-                                v-if="ScenicArrayList.length==4&&item.ScenicArray.length==4&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                class="absolute img100"
-                                :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
                        </div>
                      </div>
                    </div>
+                    <div class="travelDaysHVdetails-textBox"></div>
+                    <div class="travelDaysHVTdetails-textBox row">
+                      <div class="travelDaysdetails-text right0 row nowrap">
+                        <div>
+                          <div class="travelDaysHVdetails-icon">
+                            <span class="iconfont icon-zhusu"
+                            :style="{'color':backgroundColor2}"></span>
                          </div>
-                      <div class="MT28 width331">
-                        <template v-if="item.ScenicArray.length>4">
-                          <div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[4].CouponsName}}
-                          </div>
-                          <div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
-                            <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[4].Description"></vEditSpan>
                        </div>
+                        <span class="travelDaysHVdetails-text0">住宿：</span>
+                        <div class="trtravelDaysHVdetails-textC" v-if="item.HotelArray">
+                          <template v-if="item.HotelArray.length==1">
+                            {{item.HotelArray[0].HotelName!='温馨的家'?item.HotelArray[0].HotelName+"/或同级":"温馨的家"}}
+                          </template>
+                          <template v-else>
+                            <template v-for="(j) in item.HotelArray">{{j.HotelName}}、</template> /或同级
                          </template>
                        </div>
                      </div>
                    </div>
                  </div>
-                </template>
-              </div>
-            </template>
-
-              <div class="travelDaysdetails-tsTextBox"
-                v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
-                <div :id="'WarmTip_'+index" class="travelDaysdetails-tsText row relative"
-                  :style="{'background':'#EFECEC'}">
-                  <span class='travelDaysHVdetails-text0 absolute' style='line-height:25px;top: 15px;'>温馨提示：</span>
-                  <div v-html="item.WarmTipObj.Description" class="travelDaysHVdetails-text0-r"></div>
                </div>
              </div>
-            </template>
          </div>

        </div>

-        <!-- otherJourney-footer -->
-        <div v-if="false" :class="[item.zoom==1?'':'footer']">
-          <div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
-            <div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.TripColor}">&nbsp;</div>
-            <div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.TripColor}">&nbsp;</div>
-            <div class="introduceFooter-text row-aic">
-              <img src="http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png" />
-              <div class="edit_div">{{dataAll.LineShortName?dataAll.LineShortName:dataAll.LineName}}</div>
-            </div>
-            <div class="introduceFooterBJ introduceFootertThree" :style="{'background':dataAll.TripColor}">&nbsp;</div>
-            <div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.TripColor}">&nbsp;</div>
-          </div>
-        </div>
+
      </div>
-      <div class="UpgradedVersion2Line UpgradedVersion2LineHV absolute z-index3 row-ajc">
+      <div v-if="!item.IsBlowUp" class="UpgradedVersion2Line UpgradedVersion2LineHV absolute z-index3 row-ajc">
        <span>{{pageHeight>1240?'内容已超出底线':'底线'}}</span>
      </div>
-      <!-- <div v-if="pageHeight>(1240+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
-        :style="{'top': pageHeight>1240&&pageHeight<2480?pageHeight+'px':'2480px'}">
-        <span>底线</span>
-      </div> -->
+
    </div>
    <el-dialog custom-class="resourceImgAdd" :title="$t('sm.chooseImg')" center :visible.sync="isShowScenicImg">
      <!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
@@ -1244,6 +584,46 @@
          "viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
        ]._data.top = y;
      },
+      onViewSpotDragstopY(x, y) {
+        let imgWidth = document.querySelector(
+          "#viewSpotImg_" + (this.item * 4) + "_" + this.imgIndex + this.index
+        ).width;
+        let boxWidth = document.querySelector(
+          "#viewSpotBox_" + (this.item * 4) + "_" + this.imgIndex + this.index
+        ).offsetWidth;
+        let cha = boxWidth - imgWidth;
+        if (cha <= 0) {
+          if (x < 0 && x < cha) {
+            x = cha;
+          } else if (x > 0) {
+            x = 0;
+          }
+        } else {
+          if (x < 0) {
+            x = 0;
+          } else if (x > 0 && x > cha) {
+            x = cha;
+          }
+        }
+        if (this.ScenicArrayList && this.ScenicArrayList.length > 0) {
+          this.ScenicArrayList[this.imgIndex].ScenicJson.x = x
+          this.item.ScenicArray.forEach(x => {
+            this.ScenicArrayList.forEach(y => {
+              if (x.CouponsId == y.CouponsId) {
+                x.ScenicJson.x = y.ScenicJson.x
+              }
+            })
+          })
+        } else {
+          this.item.TrafficObj.trafficIntroduce.x = x
+          this.item.TrafficObj.trafficIntroduce.y = 0
+          this.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce);
+        }
+        this.$refs[
+          "viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
+        ]._data.left = x;
+      },
+
      SelectImg(index) {
        this.imgIndex = index
        this.isShowScenicImg = true
@@ -1362,192 +742,7 @@
 </script>

 <style>
-  .travelDaysHV-Description{
-    font-size: 24px;
-    line-height: 34px;
-    color: #484647;
-    font-family: DengXian;
-    font-weight: 400;
-  }
-  .travelDaysHV-CouponsName{
-    font-size: 30px;
-    text-align: center;
-    font-family: Microsoft YaHei;
-  }
-  .travelDaysHVMasterMap-one{
-    height: 524px;
-  }
-  .travelDaysHVMasterMap2 {
-    height: 524px;
-    border-radius: 50px 0px 50px 0px;
-  }
-  .travelDaysHV2-imgBox{
-    width: 767px;
-  }
-  .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;
-    line-height: 28px;
-  }
-  .travelDaysHVdetails-text0{
-    font-size: 26px;
-    font-family: Microsoft YaHei;
-    font-weight: bold;
-    color: #484647;
-    line-height: 28px;
-  }
-  .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;
-    margin-top: 42px;
-  }
-  .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: 1750px;
-  background: #fff;
-}
+  @import url('../../../../assets/css/tripIndexNewHV.css');