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

src/assets/css/tripIndexNew2.css

@@ -417,7 +417,12 @@ html, body{
     height: 0;
     padding-top: 100%;
 }
-
+.travelDaysMasterMap-oneImg img{
+  width: 100%;
+  height: auto;
+  min-height: 100%;
+  position: absolute;
+}
 .travelDaysMasterMap-text {
     left: 15px;
     right: 15px;
@@ -846,6 +851,9 @@ html, body{
 }
 .img100{
   width: 100%;
+  height: auto;
+  left: 0;
+  min-height: 100%;
 }
 .hidden{
   overflow: hidden;

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -274,6 +274,12 @@
     methods: {
       getFeaturePageType(){
         this.subConfig.DayList.forEach(x=>{
+          x.ScenicArray.forEach(y=>{
+            y.ScenicJson = {
+              x: 0,
+              y:0
+            }
+          })
           if(this.dataAll.FeaturePageType==1){
             x.zoom = 0.285
           }

src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue

@@ -229,10 +229,10 @@
                                 <VueDraggableResizable
                                   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="0"
-                                  :z="2" @dragstop="onViewSpotDragstopY">
+                                  :active="false" :parent="false" axis="y" @activated="onActivated(0)"
+                                  :x="0"
+                                  :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"
@@ -280,10 +280,10 @@
                                   <VueDraggableResizable
                                     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">
+                                    :active="false" :parent="false" axis="y" @activated="onActivated(1)"
+                                    :x="0"
+                                    :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"
@@ -332,10 +332,10 @@
                                   <VueDraggableResizable
                                     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="0"
-                                    :z="2" @dragstop="onViewSpotDragstopY">
+                                    :active="false" :parent="false" axis="y" @activated="onActivated(2)"
+                                    :x="0"
+                                    :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"