Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
ae77bf87
Commit
ae77bf87
authored
Jan 09, 2022
by
季圣华
Browse files
优化系统:解决登录状态超时(获取清理浏览器缓存)之后重新登录,出现页面按钮丢失的bug
parent
a00a505b
Changes
3
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/defaultSettings.js
View file @
ae77bf87
...
...
@@ -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
:
fals
e
,
// sticky header
fixedHeader
:
tru
e
,
// sticky header
fixSiderbar
:
true
,
// sticky siderbar
autoHideHeader
:
false
,
// auto hide header
colorWeak
:
false
,
...
...
jshERP-web/src/permission.js
View file @
ae77bf87
...
...
@@ -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
}
}
...
...
jshERP-web/src/views/user/Login.vue
View file @
ae77bf87
...
...
@@ -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
)
=>
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment