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

# Conflicts:
#	src/components/SalesModule/groupTourOrderByTuan.vue
#	src/components/SalesModule/productQuery.vue
#	src/components/TravelManager/TravelList/RegistrationList.vue
#	src/components/busManagement/BusApportionManagement.vue

src/plug/index.js

@@ -553,7 +553,7 @@ export default {
           co(function* () {
             for (let index = 0; index < files.length; index++) {
               let fileName = nameList[index]
-              fileName = path + fileName + "." + files[index].name.split('.').pop()
+              fileName ="/New"+ path + fileName + "." + files[index].name.split('.').pop()
               var result = yield oss.multipartUpload(fileName, files[index], {
                 progress: function* (p) {},
                 mime: 'application/octet-stream'

src/router/config.js

@@ -1032,14 +1032,14 @@ export default {
                 title: '机票列表'
               },
             }, 
-            {
-              path: '/individualTicket',  //散客机票
-              name: 'individualTicket',
-              component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
-              meta: {
-                title: '散客机票'
-              },
-            },
+            // {
+            //   path: '/individualTicket',  //散客机票
+            //   name: 'individualTicket',
+            //   component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
+            //   meta: {
+            //     title: '散客机票'
+            //   },
+            // },
             // ,{
             //   path: '/IndividualTicketOrder',  //散客今日机票订单
             //   name: 'IndividualTicketOrder',