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

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

@@ -454,7 +454,7 @@
               </div>
             </div>
             <!-- 5张 -->
-            <div v-if="item.ScenicArray.length>4">
+            <div v-if="item.ScenicArray.length==5||item.ScenicArray.length>5">
                 <div class="row-sb MB31">
                   <div class="">
                     <div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap5_1 hidden relative borderRadius18">
@@ -910,10 +910,9 @@
                 that.ScenicArrayList[that.imgIndex].NewImaArray[0].Url = allPath
                 that.ScenicArrayList[that.imgIndex].NewImaArray[0].x = 0
                 that.ScenicArrayList[that.imgIndex].NewImaArray[0].y = 0
-                that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray);
+                that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[that.imgIndex].NewImaArray);
                 if (that.item.ScenicArray && that.item.ScenicArray.length > 0) {
-                  that.item.ScenicArray[that.defaultScenicIndex] = JSON.parse(JSON.stringify(that.ScenicArrayList[
-                    0]));
+                  that.item.ScenicArray[that.defaultScenicIndex] = JSON.parse(JSON.stringify(that.ScenicArrayList[that.defaultScenicIndex]));
                 }
               } else {
                 that.item.TrafficObj.trafficIntroduce.IntroduceImage = allPath
@@ -949,7 +948,7 @@
             that.ScenicArrayList[that.imgIndex].NewImaArray.push(obj);
             that.ScenicArrayList[that.imgIndex].ScenicJson.x = 0
             that.ScenicArrayList[that.imgIndex].ScenicJson.y = 0
-            that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray);
+            that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[that.imgIndex].NewImaArray);
           });
         } else {
           this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path
@@ -959,7 +958,7 @@
         }
         this.isShowScenicImg = false;
         if (this.item.ScenicArray && this.item.ScenicArray.length > 0) {
-          this.item.ScenicArray[this.defaultScenicIndex] = JSON.parse(JSON.stringify(this.ScenicArrayList[0]));
+          this.item.ScenicArray[this.defaultScenicIndex] = JSON.parse(JSON.stringify(this.ScenicArrayList[that.defaultScenicIndex]));
         }
       }
     },