diff --git a/jshERP-web/src/defaultSettings.js b/jshERP-web/src/defaultSettings.js index 46a177f2..c074825b 100644 --- a/jshERP-web/src/defaultSettings.js +++ b/jshERP-web/src/defaultSettings.js @@ -18,7 +18,7 @@ export default { navTheme: 'light', // theme for nav menu layout: 'sidemenu', // nav menu position: sidemenu or topmenu contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu - fixedHeader: false, // sticky header + fixedHeader: true, // sticky header fixSiderbar: true, // sticky siderbar autoHideHeader: false, // auto hide header colorWeak: false, diff --git a/jshERP-web/src/permission.js b/jshERP-web/src/permission.js index 45d490ba..2e8c6976 100644 --- a/jshERP-web/src/permission.js +++ b/jshERP-web/src/permission.js @@ -42,7 +42,7 @@ router.beforeEach((to, from, next) => { description: '请求用户信息失败,请重试!' })*/ store.dispatch('Logout').then(() => { - next({ path: '/user/login', query: { redirect: to.fullPath } }) + next({ path: '/user/login' }) }) }) } else { @@ -57,7 +57,7 @@ router.beforeEach((to, from, next) => { // 在免登录白名单,直接进入 next() } else { - next({ path: '/user/login', query: { redirect: to.fullPath } }) + next({ path: '/user/login' }) NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } } diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue index 2cf0c2e6..a16f8dca 100644 --- a/jshERP-web/src/views/user/Login.vue +++ b/jshERP-web/src/views/user/Login.vue @@ -139,7 +139,7 @@ loginParams.loginName = values.loginName loginParams.password = md5(values.password) //loginParams.remember_me = values.rememberMe - console.log("登录参数",loginParams) + //console.log("登录参数",loginParams) that.Login(loginParams).then((res) => { this.departConfirm(res, loginParams.loginName) }).catch((err) => {