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

src/assets/css/tripIndexNew2.css

@@ -161,7 +161,7 @@ html, body{
   height: 0px;
   border-bottom: 2px dashed red;
   left: 0;
-  top: 1453px;
+  top: 1754px;
   right: 0;
 }
 .UpgradedVersion2Line span{
@@ -610,13 +610,13 @@ html, body{
     color: #2A2A2A;
 }
 .UpgradedVersion-boxHeight{
-  width: 1123px;
-  min-height: 1450px;
+  width: 1240px;
+  min-height: 1754px;
   margin: auto;
 }
 .UpgradedVersion-box2 {
-    width: 1123px;
-    min-height: 1478px;
+    width: 1240px;
+    min-height: 1754px;
     height: 100%;
 }
 
@@ -810,17 +810,17 @@ html, body{
   height: 280px;
 }
 .travelDaysMasterMap4_1{
-  width: 696px;
+  width: 772px;
   height: 449px;
 }
 .travelDaysMasterMap4_2{
-  width: 331px;
+  width: 370px;
   height: 214px;
 }
 /* .width331{
   width: 331px;
 } */
 .travelDaysMasterMap5_1{
-  width: 514px;
+  width: 571px;
   height: 291px;
 }

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -690,7 +690,7 @@
             list.forEach(x=>{
               x.IsBlowUp = false
               if(this.PostConfig.FeaturePageType==2){
-                x.zoom = 0.44
+                x.zoom = 0.40
               }else if(this.PostConfig.FeaturePageType==1){
                 x.zoom = 0.285
               }
@@ -958,7 +958,7 @@
                   list.forEach(x=>{
                     x.IsBlowUp = false
                     if(tempData.FeaturePageType==2){
-                      x.zoom = 0.44
+                      x.zoom = 0.40
                     }else if(tempData.FeaturePageType==1){
                       x.zoom = 0.285
                     }

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -278,7 +278,7 @@
             x.zoom = 0.285
           }
           if(this.dataAll.FeaturePageType==2){
-            x.zoom = 0.44
+            x.zoom = 0.40
           }
         })
         this.$forceUpdate()
@@ -291,7 +291,7 @@
         }
         else{
           if(this.dataAll.FeaturePageType==1) item.zoom = 0.285
-          if(this.dataAll.FeaturePageType==2) item.zoom = 0.44
+          if(this.dataAll.FeaturePageType==2) item.zoom = 0.40
         }
         this.$forceUpdate()
       },

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

@@ -29,7 +29,7 @@
               </div>
             </div>
           </div>
-          <div style="min-height:1000px">
+          <div style="min-height:1440px">
             <!-- 一张图 1-单张图，2-多张图-->
             <template v-if="
           (item.TitleObj.ShowTripType==2&&(item.ScenicArray.length==1||item.ScenicArray.length==0))
@@ -43,12 +43,12 @@
                       <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                         <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
                           :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                          @toSelectImg="SelectImg(0)" :x="1059" :y="632"></FeatureControls>
+                          @toSelectImg="SelectImg(0)" :x="1176" :y="632"></FeatureControls>
                         <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
                           @change="uploadpic">
                       </div>
                       <VueDraggableResizable
-                        v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="1059"
+                        v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="1176"
                         :h="632" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
                         :active="false" :parent="false" axis="y" @activated="onActivated(0)"
                         :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
@@ -108,12 +108,12 @@
                           <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                             <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                               :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                              @toSelectImg="SelectImg(0)" :x="1060" :y="583"></FeatureControls>
+                              @toSelectImg="SelectImg(0)" :x="1176" :y="583"></FeatureControls>
                             <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
                               @change="uploadpic">
                           </div>
                           <VueDraggableResizable
-                            v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="1060"
+                            v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="1176"
                             :h="583" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
                             :active="false" :parent="false" axis="y" @activated="onActivated(0)"
                             :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
@@ -340,16 +340,16 @@
                             <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                               <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                 :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                                @toSelectImg="SelectImg(0)" :x="696" :y="449"></FeatureControls>
+                                @toSelectImg="SelectImg(0)" :x="772" :y="449"></FeatureControls>
                               <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
                                 @change="uploadpic">
                             </div>
-                            <VueDraggableResizable v-if="item.ScenicArray.length==4" :h="449" :w="696"
+                            <VueDraggableResizable v-if="item.ScenicArray.length==4" :h="449" :w="772"
                               :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
                               :active="false" parent=".travelDaysMasterMap4_1" axis="y" @activated="onActivated(0)"
                               :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                               :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
-                              :z="2" @dragstop="onViewSpotDragstop" :min-width="696">
+                              :z="2" @dragstop="onViewSpotDragstop" :min-width="772">
                               <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
                                 <img
                                   v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
@@ -388,12 +388,12 @@
                               <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                                 <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                   :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)" :x="331" :y="214">
+                                  @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)" :x="370" :y="214">
                                 </FeatureControls>
                               </div>
                               <VueDraggableResizable
                                 v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0"
+                                :w="370" :h="214" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0"
                                 :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(1)"
                                 :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                                 :y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -435,12 +435,12 @@
                               <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                                 <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                   :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :x="331" :y="214">
+                                  @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :x="370" :y="214">
                                 </FeatureControls>
                               </div>
                               <VueDraggableResizable
                                 v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0"
+                                :w="370" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0"
                                 :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(2)"
                                 :x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                                 :y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -482,12 +482,12 @@
                               <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                                 <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                   :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :x="331" :y="214">
+                                  @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :x="370" :y="214">
                                 </FeatureControls>
                               </div>
                               <VueDraggableResizable
                                 v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0"
+                                :w="370" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0"
                                 :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(3)"
                                 :x="ScenicArrayList&&ScenicArrayList.length>3?ScenicArrayList[3].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                                 :y="ScenicArrayList&&ScenicArrayList.length>3?ScenicArrayList[3].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -533,12 +533,12 @@
                             <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                               <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                 :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
-                                @toSelectImg="SelectImg(0)" :x="514" :y="291"></FeatureControls>
+                                @toSelectImg="SelectImg(0)" :x="571" :y="291"></FeatureControls>
                               <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
                                 @change="uploadpic">
                             </div>
                             <VueDraggableResizable
-                              v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="514"
+                              v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="571"
                               :h="291" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
                               :active="false" :parent="false" axis="y" @activated="onActivated(0)"
                               :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
@@ -576,10 +576,10 @@
                             <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                               <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                 :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
-                                @toSelectImg="SelectImg(1)" :x="514" :y="291"></FeatureControls>
+                                @toSelectImg="SelectImg(1)" :x="571" :y="291"></FeatureControls>
                             </div>
                             <VueDraggableResizable
-                              v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="514"
+                              v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="571"
                               :h="291" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
                               :active="false" :parent="false" axis="y" @activated="onActivated(1)"
                               :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
@@ -620,12 +620,12 @@
                               <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                                 <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                   :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :x="331" :y="214">
+                                  @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :x="370" :y="214">
                                 </FeatureControls>
                               </div>
                               <VueDraggableResizable
                                 v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0"
+                                :w="370" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0"
                                 :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(2)"
                                 :x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                                 :y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -667,12 +667,12 @@
                               <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                                 <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                   :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :x="331" :y="214">
+                                  @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :x="370" :y="214">
                                 </FeatureControls>
                               </div>
                               <VueDraggableResizable
                                 v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0"
+                                :w="370" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0"
                                 :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(3)"
                                 :x="ScenicArrayList&&ScenicArrayList.length>3?ScenicArrayList[3].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                                 :y="ScenicArrayList&&ScenicArrayList.length>3?ScenicArrayList[3].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -714,12 +714,12 @@
                               <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
                                 <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
                                   :isTemplate="false" :isUploadImg="true" :isSelectImg="true"
-                                  @toUploadImg="UploadImg(4)" @toSelectImg="SelectImg(4)" :x="331" :y="214">
+                                  @toUploadImg="UploadImg(4)" @toSelectImg="SelectImg(4)" :x="370" :y="214">
                                 </FeatureControls>
                               </div>
                               <VueDraggableResizable
                                 v-if="item.ScenicArray.length>4||item.TrafficObj.trafficIntroduce.IntroduceImage"
-                                :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_4'+index" tabindex="0"
+                                :w="370" :h="214" :ref="'viewSpotVds_' + item * 4 + '_4'+index" tabindex="0"
                                 :resizable="false" :active="false" :parent="false" axis="y" @activated="onActivated(4)"
                                 :x="ScenicArrayList&&ScenicArrayList.length>4?ScenicArrayList[4].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
                                 :y="ScenicArrayList&&ScenicArrayList.length>4?ScenicArrayList[4].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
@@ -825,10 +825,10 @@
         </div>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc">
-        <span>{{pageHeight>1453?'超出内容分割到下一页':'底线'}}</span>
+        <span>{{pageHeight>1754?'超出内容分割到下一页':'底线'}}</span>
       </div>
-      <div v-if="pageHeight>(1453+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
-        :style="{'top': pageHeight>1453&&pageHeight<2906?pageHeight+'px':'2906px'}">
+      <div v-if="pageHeight>(1754+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
+        :style="{'top': pageHeight>1754&&pageHeight<3508?pageHeight+'px':'3508px'}">
         <span>底线</span>
       </div>
     </div>