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

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -247,12 +247,15 @@ export default {
       immediate: true
     }
   },
-  computed: {},
+  created(){
+
+  },
   mounted() {
     // 日本随机背景色
     this.setPaintRbBgList()
-    this.initMap();
+    this.initMap()
   },
+
   methods: {
     // 初始化地图
     initMap() {
@@ -834,7 +837,7 @@ export default {
                 }
               });
             }
-          },500)
+          },300)
         }
       });
     },

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -146,12 +146,11 @@
                 <div class="dayCircle">D{{item.DayNum}}</div>
               </div>
               <div class="dayPage-box row">
-                <div class="dayPage-form">
-                  <template v-if="!item.isHide">
-                    <travelDays :index="index" :dataAll="dataAll" :item="item"></travelDays>
-                  </template>
+                <div class="dayPage-form" v-if="!item.isHide">
+                  <travelDays :index="index" :dataAll="dataAll" :item="item"></travelDays>
                 </div>
-                <div class="newDayContent">
+                <div class="newDayContent"
+                :style="{'width':!item.isHide?'520px':'1020px'}">
                   <travelDaysTrip v-bind:dayObj="item" v-bind:CurrentIndex="index"
                     v-bind:TotalCount="subConfig.DayList.length" v-bind:isOpenGroup="isOpenGroup"
                     v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" v-bind:UseTypeArray="UseTypeArray"