作者 小范

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/routes.js
@@ -23,9 +23,10 @@ var axois_init = { @@ -23,9 +23,10 @@ var axois_init = {
23 // 直接丢sessionStorage 23 // 直接丢sessionStorage
24 if (!sessionStorage.getItem("token")) { 24 if (!sessionStorage.getItem("token")) {
25 // 若是接口访问的时候没有发现有鉴权的基础信息,直接返回登录页 25 // 若是接口访问的时候没有发现有鉴权的基础信息,直接返回登录页
26 - router.push({  
27 - path: "/login"  
28 - }); 26 + // router.push({
  27 + // // path: "/login"
  28 + // path: "/main"
  29 + // });
29 } 30 }
30 31
31 // 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面 32 // 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面
@@ -86,20 +87,20 @@ var axois_init = { @@ -86,20 +87,20 @@ var axois_init = {
86 init_router: (router,axios) => { 87 init_router: (router,axios) => {
87 router.beforeEach((to, from, next) => { 88 router.beforeEach((to, from, next) => {
88 //NProgress.start(); 89 //NProgress.start();
89 - if (to.path == '/login') {  
90 - sessionStorage.removeItem('user');  
91 - sessionStorage.removeItem('menu');  
92 - sessionStorage.removeItem('token');  
93 - }else{  
94 - let user = JSON.parse(sessionStorage.getItem('user'));  
95 - if(sessionStorage.getItem('token')){  
96 - axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');  
97 - }  
98 -  
99 - if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {  
100 - next({ path: '/login' })  
101 - }  
102 - } 90 + // if (to.path == '/login') {
  91 + // sessionStorage.removeItem('user');
  92 + // sessionStorage.removeItem('menu');
  93 + // sessionStorage.removeItem('token');
  94 + // }else{
  95 + // let user = JSON.parse(sessionStorage.getItem('user'));
  96 + // if(sessionStorage.getItem('token')){
  97 + // axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
  98 + // }
  99 + //
  100 + // if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
  101 + // next({ path: '/login' })
  102 + // }
  103 + // }
103 next() 104 next()
104 }); 105 });
105 } 106 }
@@ -143,7 +143,7 @@ let routes = [ @@ -143,7 +143,7 @@ let routes = [
143 name: '订舱系统', 143 name: '订舱系统',
144 iconCls: 'el-icon-delete-location', 144 iconCls: 'el-icon-delete-location',
145 children: [ 145 children: [
146 - // { path: '/booking', component: booking, name: '在线订舱' }, 146 + { path: '/booking', component: booking, name: '在线订舱' },
147 { path: '/order', component: order, name: '订舱信息' }, 147 { path: '/order', component: order, name: '订舱信息' },
148 { path: '/airlift', component: airlift, name: '空运专线' }, 148 { path: '/airlift', component: airlift, name: '空运专线' },
149 ] 149 ]
@@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
134 } 134 }
135 }; 135 };
136 return { 136 return {
137 - sysName:'易通链快速通关申报平台', 137 + sysName:'代理人申报平台',
138 collapsed:false, 138 collapsed:false,
139 sysUserName: '', 139 sysUserName: '',
140 sysUserId:'', 140 sysUserId:'',
@@ -431,7 +431,7 @@ @@ -431,7 +431,7 @@
431 aside { 431 aside {
432 .el-menu{ 432 .el-menu{
433 height: 100%; 433 height: 100%;
434 - background: #606060; 434 + background: #26384c;
435 .el-menu-item { 435 .el-menu-item {
436 i{ 436 i{
437 color: white; 437 color: white;