Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/routes.js

@@ -23,9 +23,10 @@ var axois_init = {
                 // 直接丢sessionStorage
                 // 直接丢sessionStorage
                 if (!sessionStorage.getItem("token")) {
                 if (!sessionStorage.getItem("token")) {
                     // 若是接口访问的时候没有发现有鉴权的基础信息,直接返回登录页
                     // 若是接口访问的时候没有发现有鉴权的基础信息,直接返回登录页
-                    router.push({
-                        path: "/login"
-                    });
+                    // router.push({
+                    //     // path: "/login"
+                    //     path: "/main"
+                    // });
                 }
                 }
 
 
                 // 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面
                 // 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面
@@ -86,20 +87,20 @@ var axois_init = {
     init_router: (router,axios) => {
     init_router: (router,axios) => {
         router.beforeEach((to, from, next) => {
         router.beforeEach((to, from, next) => {
             //NProgress.start();
             //NProgress.start();
-            if (to.path == '/login') {
-                sessionStorage.removeItem('user');
-                sessionStorage.removeItem('menu');
-                sessionStorage.removeItem('token');
-            }else{
-                let user = JSON.parse(sessionStorage.getItem('user'));
-                if(sessionStorage.getItem('token')){
-                    axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
-                }
-
-                if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
-                    next({ path: '/login' })
-                }
-            }
+            // if (to.path == '/login') {
+            //     sessionStorage.removeItem('user');
+            //     sessionStorage.removeItem('menu');
+            //     sessionStorage.removeItem('token');
+            // }else{
+            //     let user = JSON.parse(sessionStorage.getItem('user'));
+            //     if(sessionStorage.getItem('token')){
+            //         axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
+            //     }
+            //
+            //     if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
+            //         next({ path: '/login' })
+            //     }
+            // }
             next()
             next()
         });
         });
     }
     }

@@ -143,7 +143,7 @@ let routes = [
         name: '订舱系统',
         name: '订舱系统',
         iconCls: 'el-icon-delete-location',
         iconCls: 'el-icon-delete-location',
         children: [
         children: [
-            // { path: '/booking', component: booking, name: '在线订舱' },
+            { path: '/booking', component: booking, name: '在线订舱' },
             { path: '/order', component: order, name: '订舱信息' },
             { path: '/order', component: order, name: '订舱信息' },
             { path: '/airlift', component: airlift, name: '空运专线' },
             { path: '/airlift', component: airlift, name: '空运专线' },
         ]
         ]

@@ -134,7 +134,7 @@
                 }
                 }
             };
             };
             return {
             return {
-                sysName:'易通链快速通关申报平台',
+                sysName:'代理人申报平台',
                 collapsed:false,
                 collapsed:false,
                 sysUserName: '',
                 sysUserName: '',
                 sysUserId:'',
                 sysUserId:'',
@@ -431,7 +431,7 @@
             aside {
             aside {
                 .el-menu{
                 .el-menu{
                     height: 100%;
                     height: 100%;
-                    background: #606060;
+                    background: #26384c;
                     .el-menu-item {
                     .el-menu-item {
                         i{
                         i{
                             color: white;
                             color: white;