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

src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue

@@ -599,6 +599,7 @@
         } else {
           this.ishasScenic = false;
         }
+        this.getScenicArray()
       }
     },
     created() {

src/router/config.js

@@ -2261,22 +2261,22 @@ export default {
                 title: '签证已确认'
               },
             },
-            {
-              path: '/TravelManager', //团控配置
-              name: 'TravelManager',
-              component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManagerThree'], resolve),
-              meta: {
-                title: '团控配置'
-              },
-            },
             {
               path: '/TravelManager2', //团控配置
               name: 'TravelManager2',
-              component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManager2'], resolve),
+              component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManagerThree'], resolve),
               meta: {
-                title: '团控配置2'
+                title: '团控配置'
               },
             },
+            // {
+            //   path: '/TravelManager2', //团控配置
+            //   name: 'TravelManager2',
+            //   component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManager2'], resolve),
+            //   meta: {
+            //     title: '团控配置2'
+            //   },
+            // },
             {
               path: '/TravelManager3', //小包团开团
               name: 'TravelManager3',