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

# Conflicts:
#	src/components/LeaveGroupDownload/travelDays.vue

src/components/LeaveGroupDownload/travelDays.vue

@@ -32,9 +32,10 @@
         </div>
       </div>
       <div :id="'travelDaysMasterMap_'+index" class="travelDaysMasterMap relative">
+         <div style="display: none;">{{getHeigthNum('travelDaysMasterMap_'+index,item)}}</div>
           <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
-            <div class="travelDaysMasterMap-oneImg relative bjF6" :id="'travelDaysImg_one'+index">
-              <img class="absolute" :src="item.details[0].img?item.details[0].img:'https://imgfile.oytour.com/Static/NewTripFeature/acquiesce.jpg'">
+            <div class="travelDaysMasterMap-oneImg absolute bjF6" :id="'travelDaysImg_one'+index">
+              <img class="relative" :src="item.details[0].img">
             </div>
             <div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
           </div>
@@ -45,14 +46,14 @@
             :id="'travelDaysImg_two'+index"
             v-if="(item.details&&item.details.length>1&&item.details[1].img)||(item.jiu2&&item.jiu2.length>0&&item.jiu2[0].url)">
               <template v-if="item.details.length>1&&item.details[1].img">
-                <img class="" :src="item.details[1].img?item.details[1].img:'https://imgfile.oytour.com/Static/NewTripFeature/acquiesce.jpg'">
+                <img :src="item.details[1].img">
                 <div class="travelDaysMasterMap-text textTwo absolute z-index2">
                   【{{item.details[1].title}}】</div>
               </template>
               <template v-else>
                 <template v-for="(jiudian,j) in item.jiu2">
                   <template v-if="jiudian.url&&j==0">
-                    <img class="" v-if="jiudian.url" :src="jiudian.url?jiudian.url:'https://imgfile.oytour.com/Static/NewTripFeature/acquiesce.jpg'">
+                    <img v-if="jiudian.url" :src="jiudian.url">
                     <div class="travelDaysMasterMap-text textTwo absolute z-index2">
                       【{{jiudian.newTitle}}】</div>
                   </template>
@@ -66,7 +67,7 @@
             :id="'travelDaysImg_three'+index"
             v-if="(item.details&&item.details.length>2&&item.details[2].img)||(item.jiu2&&item.jiu2.length>1&&item.jiu2[0].url)">
             <template v-if="item.details.length>2&&item.details[2].img">
-              <img class="" :src="item.details[2].img?item.details[2].img:'https://imgfile.oytour.com/Static/NewTripFeature/acquiesce.jpg'">
+              <img :src="item.details[2].img">
               <div class="travelDaysMasterMap-text textTwo absolute z-index2">
                 【{{item.details[2].title}}】</div>
             </template>
@@ -74,7 +75,7 @@
             <template v-else>
               <template v-for="(jiudian,j) in item.jiu2">
                 <template v-if="jiudian.url&&j==1">
-                  <img class="" v-if="jiudian.url" :src="jiudian.url?item.details[2].img:'https://imgfile.oytour.com/Static/NewTripFeature/acquiesce.jpg'">
+                  <img v-if="jiudian.url" :src="jiudian.url">
                   <div class="travelDaysMasterMap-text textTwo absolute z-index2">
                     【{{jiudian.name}}】</div>
                 </template>
@@ -86,13 +87,16 @@
       </div>
 
       <div class="travelDaysContent column">
+        <!-- <template v-for="i in 1"></template> -->
+        <template v-for="i in 2">
         <div class="travelDaysContent-text" v-for="(jindian,j) in item.details">
-          <span v-if="jindian.title">【{{jindian.title}}】</span>
-          {{jindian.content?jindian.content:'暂无数据'}}
+          <span>【{{jindian.title}}】</span>
+          {{jindian.content}}
         </div>
+        </template>
       </div>
 
-      <div class="travelDaysdetails absolute">
+      <div class="travelDaysdetails">
         <div class="travelDaysdetailsBJ row"
         :style="{'background':backgroundColor}">
           <div class="travelDaysdetails-text row">
@@ -167,6 +171,7 @@
           item.showImgTwo = false
         }
         this.$forceUpdate()
+        return
       },
       getHeigthNum(Id,item){
         let that = this
@@ -285,9 +290,7 @@
       },
       tripList: {
         handler(val, oldVal) {
-          this.tripList.forEach((x,index)=>{
-            this.getHeigthNum('travelDaysMasterMap_'+index,x)
-          })
+
         },
         deep: true,
         immediate: true