调整行程多图

src/assets/css/tripIndexNew2.css

@@ -275,7 +275,6 @@ html, body{
 }
 .travelDaysTitlle{
   margin-top: 47px;
-  overflow: hidden;
 }
 .travelDaysTitlle-left {
     width: 173px;
@@ -288,7 +287,7 @@ html, body{
     height: 173px;
     /* background: url('https://imgfile.oytour.com/Static/NewTripFeature/Shape.png')no-repeat center #FFF; */
     background: url('../img/trip/xclogo.png')no-repeat center;
-    background-size: 100% 100%;
+    background-size: auto 100%;
     overflow: hidden;
     border-radius: 50%;
     -webkit-border-radius: 50%;

src/components/LeaveGroupDownload/index.vue

@@ -4,6 +4,27 @@
       <div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
         <Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
 
+        <div class="travelDaysTitlle row-aic" :style="{'background':backgroundColor}">
+          <div class="travelDaysTitlle-left">
+            <div class="relative">
+              <div class="travelDaysTitlle-left-text column-ajc absolute">
+                <div class="travelDaysTitlle-left-textOne">
+                  <span></span>
+                </div>
+                <div class="travelDaysTitlle-left-textTwo">
+                  <span></span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="travelDaysTitlle-right">
+            <div class="travelDaysTitlle-right-text row-aic"
+              :style="{'font-size': getFontSize(orderMsg.lineteamName+orderMsg.dayNum),'color':textColor}">
+              {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
+            </div>
+          </div>
+        </div>
+        <!--
         <div class="travelDaysTitlle row-aic">
           <div class="travelDaysTitlle-left">
             <div class="travelDaysTitlle-left-text column-ajc">
@@ -21,7 +42,7 @@
               {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
             </div>
           </div>
-        </div>
+        </div> -->
         <div style="margin: 0 30px;">
           <div class="trip-adviser" style="margin-top: 20px;">
             <!-- <h1 class="trip-nav-title">
@@ -244,11 +265,19 @@
 
     methods: {
       getFontSize(title) {
-        if (title.length + 2 > 60) {
-          return 929 / 60 + 'px'
-        } else {
-          return '30px'
+        if (!title) return
+        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";
+        // if (title.length + 2 > 60) {
+        //   return 929 / 60 + 'px'
+        // } else {
+        //   return '30px'
+        // }
       },
     },
     computed: {},
@@ -262,7 +291,7 @@
             let rgba0 = rgba[0].split('(')
             let arr = [rgba0[1], rgba[1], rgba[2]]
             if (this.getRgbLevel(arr) > 50) {
-              this.textColor = "#fff"
+              this.textColor = "#333"
             } else {
               this.textColor = "#333"
             }

src/components/confirmationOrderDownLoadNew.vue

@@ -979,7 +979,7 @@
 <style>
   @import url('../assets/css/tripIndex.css');
   @import url("../assets/css/UpgradedVersion.css");
-  @import url("../assets/css/tripIndexNew.css");
+  @import url("../assets/css/tripIndexNew2.css");
   @import url('../assets/css/detail.css');
 
 

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -313,9 +313,6 @@
         } else {
           this.$refs.TravelFeature.setNewDate(data);
         }
-      },
-      getConfig() {
-
       },
       /*获取组件配置信息【回调方法】*/
       getConfig(configObj) {

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -151,7 +151,7 @@
                 </div>
                 <div class="newDayContent"
                 :style="{'width':!item.isHide?'520px':'1020px'}">
-                  <travelDaysTrip v-bind:dayObj="item" v-bind:CurrentIndex="index"
+                  <travelDaysTrip :dataAll="dataAll" v-bind:dayObj="item" v-bind:CurrentIndex="index"
                     v-bind:TotalCount="subConfig.DayList.length" v-bind:isOpenGroup="isOpenGroup"
                     v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" v-bind:UseTypeArray="UseTypeArray"
                     v-bind:AirPickUp="AirPickUp" v-bind:AirSend="AirSend" v-bind:DayList="subConfig.DayList"
@@ -364,7 +364,7 @@
           TrafficList: TrafficList,
           WarmTipList: WarmTipList,
           TitleList: TitleList,
-          IsUpdateTrip:this.subConfig.IsUpdateTrip
+          IsUpdateTrip:this.subConfig.IsUpdateTrip,
         };
         this.HotelList = HotelList;
         this.DinnerList = DinnerList;
@@ -406,7 +406,7 @@
           this.emitData();
         },
         deep: true
-      }
+      },
     }
   };
 

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -26,7 +26,7 @@
             </div>
           </div>
           <!-- 一张图 1-单张图，2-多张图-->
-          <div v-if="dataAll.ShowTripType==1||(item.ScenicArray.length==0||item.ScenicArray.length==1)">
+          <div v-if="item.TitleObj.ShowTripType==1">
             <div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden">
               <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
                 <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
@@ -80,7 +80,7 @@
               </div>
             </div>
           </div>
-          <template v-else>
+          <template  v-if="item.TitleObj.ShowTripType==2">
             <div class="column travelDaysMasterMap2-box">
               <!-- 2张 -->
               <div v-if="item.ScenicArray.length==2">
@@ -793,6 +793,37 @@
 
     },
     methods: {
+      infor(){
+        this.RenderingOk = false;
+          this.ScenicArrayList = []
+          this.item.ScenicArray.forEach((x, index) => {
+            if(this.item.TitleObj.ShowTripType==1&&this.item.ScenicArray&&this.item.ScenicArray.length>0){
+              if (x.DefaultNum > 0) {
+                this.defaultScenicIndex = index;
+                this.ScenicArrayList.push(x)
+              }
+            }else{
+              this.ScenicArrayList.push(x)
+            }
+          });
+          if (this.ScenicArrayList.length == 0) {
+            this.item.ScenicArray.forEach((x, index) => {
+              if(this.item.TitleObj.ShowTripType==1&&this.item.ScenicArray&&this.item.ScenicArray.length>0){
+                if (index == 0) {
+                  x.DefaultNum = 1;
+                  this.defaultScenicIndex = index;
+                  this.ScenicArrayList.push(x)
+                }
+              }else{
+                this.ScenicArrayList.push(x)
+              }
+            });
+          }
+          this.RenderingOk = true;
+          setTimeout(()=>{
+            this.pageHeight = document.querySelector(`#LineOfTravel${this.item * 4}_0${this.index}`).offsetHeight
+          },500)
+      },
       getHtmlPlainText(html_str) {
         //提取字符串中的文字
         let re = new RegExp('<[^<>]+>', 'g')
@@ -943,37 +974,7 @@
     watch: {
       item: {
         handler(val, oldVal) {
-
-          this.RenderingOk = false;
-          this.ScenicArrayList = []
-          this.item.ScenicArray.forEach((x, index) => {
-            if(this.item.ScenicArray&&this.item.ScenicArray.length==1){
-              if (x.DefaultNum > 0) {
-                this.defaultScenicIndex = index;
-                this.ScenicArrayList.push(x)
-              }
-            }else{
-              this.ScenicArrayList.push(x)
-            }
-          });
-          if (this.ScenicArrayList.length == 0) {
-            this.item.ScenicArray.forEach((x, index) => {
-              if(this.item.ScenicArray&&this.item.ScenicArray.length==1){
-                if (index == 0) {
-                  x.DefaultNum = 1;
-                  this.defaultScenicIndex = index;
-                  this.ScenicArrayList.push(x)
-                }
-              }else{
-                this.ScenicArrayList.push(x)
-              }
-            });
-          }
-          console.log(this.ScenicArrayList,'-----')
-          this.RenderingOk = true;
-          setTimeout(()=>{
-            this.pageHeight = document.querySelector(`#LineOfTravel${this.item * 4}_0${this.index}`).offsetHeight
-          },500)
+          this.infor()
         },
         deep: true,
         immediate: true

src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue

@@ -222,9 +222,16 @@
                 </li>
               </ul>
             </div>
-            <div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.ScenicArray.length>0&&dayObj.ScenicArray.length==1">
+            <div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.ScenicArray.length>0">
+              <span>是否展示多景</span>
+              <div style="margin-left: 5px;">
+                <el-checkbox v-model="dayObj.TitleObj.ShowTripType" border size="mini"
+                :true-label="ShowTripType[0]" :false-label="ShowTripType[1]"></el-checkbox>
+              </div>
+            </div>
+            <div class="row-aic marginT10" style="width: 100%;" v-if="dayObj.TitleObj.ShowTripType==1&&dayObj.ScenicArray.length>0">
               <span v-if="ishasScenic">默认展示图</span>
-              <el-select v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini"
+              <el-select style="margin-left: 5px;" v-if="ishasScenic&&NoticeParameters.IsDirect==1" class="w220 Ht_hotelSelect" size="mini"
                 :placeholder="$t('pub.pleaseSel')" v-model="ScenicArraySingle" filterable @change="setDefaultScenic">
                 <el-option v-for="(item,index) in dayObj.ScenicArray" :label="item.CouponsName" :value="item.CouponsId"
                   :key="index">
@@ -284,6 +291,7 @@
 
   export default {
     props: [
+      "dataAll",
       "CurrentIndex", //当前索引
       "TotalCount", //总索引
       "dayObj", //行程每天对象
@@ -301,6 +309,7 @@
     ],
     data() {
       return {
+        ShowTripType:[2,1],
         ScenicArraySingle: this.dayObj.ScenicArrayImg ? this.dayObj.ScenicArrayImg : '', //单选默认图
         ScenicArray: this.dayObj.ScenicArrayImg ? this.dayObj.ScenicArrayImg : [], //默认展示图
         DefaultSelectValue: 0,
@@ -322,6 +331,9 @@
       };
     },
     methods: {
+      hasTripTypeChange(){
+
+      },
       //设置默认显示的景点图
       setDefaultScenic() {
         this.dayObj.ScenicArray.forEach(x => {
@@ -723,6 +735,12 @@
         },
         deep: true
       },
+      dataAll: {
+        handler: function (val, oldVal) {
+
+        },
+        deep: true
+      },
     },
     mounted() {},
     components: {