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

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -55,9 +55,7 @@
                   @toNextZ="imgToNextZ"
                   @toHuan="imgToHuan"
                   @toXuan="imgToXuan"
-                  @toDelete="imgToDelete"
-                  @toReset="resetXY"
-                  :isReset='true'>
+                  @toDelete="imgToDelete">
                 </vToolBar>
                 <input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_0"' @change="uploadpic">
               </div>
@@ -497,9 +495,7 @@
                 @toNextZ="imgToNextZ"
                 @toHuan="imgToHuan"
                 @toXuan="imgToXuan"
-                @toDelete="imgToDelete"
-                @toReset="resetXY"
-                :isReset='true'>
+                @toDelete="imgToDelete">
               </vToolBar>
               <input type="file" style="display:none" :id='"viewSpotfile_"+(item*4)+"_0"' @change="uploadpic">
             </div>
@@ -660,9 +656,7 @@
                   @toNextZ="imgToNextZ"
                   @toHuan="imgToHuan"
                   @toXuan="imgToXuan"
-                  @toDelete="imgToDelete"
-                  @toReset="resetXY"
-                  :isReset='true'>
+                  @toDelete="imgToDelete">
                 </vToolBar>
                 <input type="file" style="display:none" :id='"viewSpotfile_"+(item*4-2)+"_0"' @change="uploadpic">
               </div>
@@ -939,9 +933,7 @@
                 @toNextZ="imgToNextZ"
                 @toHuan="imgToHuan"
                 @toXuan="imgToXuan"
-                @toDelete="imgToDelete"
-                @toReset="resetXY"
-                :isReset='true'>
+                @toDelete="imgToDelete">
               </vToolBar>
               <input type="file" style="display:none" :id='"restaurantfile_"+(item*2)+"_0"' @change="uploadpic">
             </div>
@@ -1215,7 +1207,7 @@
           let restaurantObj = json.restaurantObj;
           let list = [];
           restaurantObj.list.forEach(item => {  // 餐饮筛选
-            if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName == "酒店内享用早餐" || item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上享用早餐' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
+            if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName == "酒店内享用早餐" || item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
               let obj = {
                 name: '',
                 MD5Sign: '',
@@ -1854,18 +1846,6 @@
         blockList.splice(index1,1);
         blockList.push(JSON.parse(nowBlock))
       },
-      // 图片高度重置
-      resetXY: function (name, index1, index2) {
-        let blockList = [];
-        if (name === 'hotel') {
-          blockList = this.hotelObj.list
-        } else if (name === 'viewSpot') {
-          blockList = this.viewSpotObj.list
-        } else if (name === 'restaurant') {
-          blockList = this.restaurantObj.list
-        }
-        this.imgTopReset(name, index1, index2);
-      },
       // 版块删除
       bolckToDelete: function (name, index1, index2) {
         console.log(name, index1)