From ae77bf873a1132158509a9c28aa696b363dd5f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 9 Jan 2022 18:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=EF=BC=9A?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=EF=BC=88=E8=8E=B7=E5=8F=96=E6=B8=85=E7=90=86=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=BC=93=E5=AD=98=EF=BC=89=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=EF=BC=8C=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8C=89=E9=92=AE=E4=B8=A2=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/defaultSettings.js   | 2 +-
 jshERP-web/src/permission.js        | 4 ++--
 jshERP-web/src/views/user/Login.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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) => {