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

src/assets/css/UpgradedVersion.css

+html, body{
+  background: #fff;
+}
 .UpgradedVersion-box .edit_div {
   min-width: 30px;
   height: 100%;
@@ -36,6 +39,7 @@
 .introduceFooter-text img {
   width: 28px;
   height: 28px;
+  object-fit: cover;
   display: inline-block;
   margin: 0 9px;
 }
@@ -235,6 +239,7 @@ img {
     width: 100%;
     height: 100%;
     display: block;
+    object-fit: cover;
   }
 
   .featureHome-right {
@@ -454,6 +459,7 @@ img {
     top: 0;
     width: 100%;
     height: 100%;
+    object-fit: cover;
   }
 
   .MasterMapList-4 .MasterMapList-2 {
@@ -559,6 +565,7 @@ img {
     top: 0;
     width: 100%;
     height: 100%;
+    object-fit: cover;
   }
 
   .UpgradedVersionDetails-detailsTop {
@@ -591,6 +598,7 @@ img {
   .UpgradedVersionDetails-num {
     height: 38px;
     overflow: hidden;
+    margin-top: 5px;
   }
 
   .UpgradedVersionDetails-num span {
@@ -604,8 +612,7 @@ img {
   .UpgradedVersionDetails-Img-two {
     width: 264px;
     height: 21px;
-
-    margin-top: 77px;
+    margin-top: 38px;
     margin-bottom: 20px;
   }
 
@@ -804,7 +811,8 @@ img {
 
   .UpgradedVersion-subIdeImgBoxL img {
     width: 44px;
-    height: 1005;
+    height: 100%;
+    object-fit: cover;
   }
 
   .UpgradedVersion-subIdeImgBoxR {
@@ -879,6 +887,7 @@ img {
     top: 0;
     width: 100%;
     height: 100%;
+    object-fit: cover;
   }
 
   .subIdeImgForm1Box {
@@ -1100,6 +1109,8 @@ img {
 
 .Template-img img {
   width: 100%;
+  height: 100%;
+  object-fit: cover;
   padding: 10px;
   display: block;
 }

src/assets/css/tripIndexNew.css

+html, body{
+  background: #fff;
+}
 .LeaveGroupDownload-form div, .LeaveGroupDownload-form dl,
 .LeaveGroupDownload-form dt, .LeaveGroupDownload-form dd,
 .LeaveGroupDownload-form ul, .LeaveGroupDownload-form ol,
@@ -341,7 +344,8 @@
 
 .travelDaysMasterMap-twoImg {
     max-width: 335px;
-    max-height: 189px;
+    /* max-height: 189px; */
+    height: 44.5%;
     overflow: hidden;
     border: 2px solid #FFFFFF;
     border-radius: 18px;
@@ -491,7 +495,7 @@
 
 .UpgradedVersion-box {
     width: 1123px;
-    height: 1588px;
+    height: 1478px;
     overflow: hidden;
 }
 

src/components/LeaveGroupDownload/travelDays.vue

@@ -39,7 +39,6 @@
             <div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
           </div>
           <div class="travelDaysMasterMap-two absolute z-index2">
-            <template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgOne">
             <div class="travelDaysMasterMap-twoImg relative bjF6"
             :style="{'color':'#fff'}"
             :id="'travelDaysImg_two'+index"
@@ -59,8 +58,6 @@
                 </template>
               </template>
             </div>
-            </template>
-            <template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgTwo">
             <div class="travelDaysMasterMap-twoImg relative bjF6" style="margin-top: 47px;"
             :style="{'color':'#fff'}"
             :id="'travelDaysImg_three'+index"
@@ -81,7 +78,6 @@
               </template>
             </template>
             </div>
-            </template>
           </div>
       </div>
 
@@ -154,31 +150,6 @@
     },
 
     methods: {
-      getShow(Id,HeightNum,item){
-        item.imgMapId = Id
-        if(HeightNum>=243){
-          item.showImgOne = true
-        }else{
-          item.showImgOne = false
-        }
-        if(HeightNum>=478){
-          item.showImgTwo = true
-        }else{
-          item.showImgTwo = false
-        }
-        this.$forceUpdate()
-      },
-      getHeigthNum(Id,item){
-        let that = this
-        setTimeout(()=>{
-          var Height = document.getElementById(Id);
-          if(Height){
-            let HeightNum = Height.offsetHeight
-            that.getShow(Id,HeightNum,item)
-          }
-        },300)
-
-      },
       getFontSize(title){
         if(title.length>60){
           return 929/60 +'px'
@@ -285,9 +256,7 @@
       },
       tripList: {
         handler(val, oldVal) {
-          this.tripList.forEach((x,index)=>{
-            this.getHeigthNum(`'travelDaysMasterMap_'+${this.index}`)
-          })
+
         },
         deep: true,
         immediate: true

src/components/confirmationOrderDownLoadNew.vue

@@ -351,14 +351,6 @@
       },
       //初始化行程
       initTrip(res, data) {
-        let arrlist = function (arr) {
-          arr.forEach(x => {
-            x.showImgOne = true
-            x.showImgTwo = true
-            x.imgMapId = null
-          })
-        }
-        arrlist(res.data.data.dayList)
         this.tripList = res.data.data.dayList;
         this.feature = res.data.data.feature
         this.showType = this.feature.featureType;

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue

@@ -31,17 +31,17 @@
         </div>
         <!-- UpgradedVersionDetails-two 02  UpgradedVersionDetails-three 03-->
         <div class="UpgradedVersionDetails-Title UpgradedVersionDetails-two">
-          <div class="UpgradedVersionDetails-Img-one relative">
+          <div class="UpgradedVersionDetails-Img-one">
             <div class="UpgradedVersionDetails-num relative" :style="{'color':TripColor}">
               <span class="absolute">{{'0'+(i+1)}}</span>
             </div>
-            <div class="UpgradedVersionDetails-T absolute">
+            <div class="UpgradedVersionDetails-T">
               <vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv>
             </div>
           </div>
-          <div class="UpgradedVersionDetails-Img-two relative">
+          <div class="UpgradedVersionDetails-Img-two">
             <template v-for="(items,indexs) in subscriptText">
-              <p :key="indexs+10000" class="absolute row-sb" v-if="indexs==i" :style="{'color':TripColor}">
+              <p :key="indexs+10000" class="row-sb" v-if="indexs==i" :style="{'color':TripColor}">
                 <span v-for="(t,i) in items.Name" :key="i+100000">{{t}}</span>
               </p>
             </template>