Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
ops_2024_vue
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
ops_2024_vue
Commits
5f7bcaa1
Commit
5f7bcaa1
authored
Mar 31, 2024
by
heduo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(hd):处理系统路由问题
parent
9e9e4f8f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
10 deletions
+13
-10
src/layouts/default/header/components/user-dropdown/index.vue
...layouts/default/header/components/user-dropdown/index.vue
+1
-1
src/router/guard/permissionGuard.ts
src/router/guard/permissionGuard.ts
+3
-1
src/store/modules/user.ts
src/store/modules/user.ts
+9
-8
No files found.
src/layouts/default/header/components/user-dropdown/index.vue
View file @
5f7bcaa1
...
...
@@ -76,7 +76,7 @@
const
{
getShowDoc
,
getUseLockPage
}
=
useHeaderSetting
();
const
userStore
=
useUserStore
();
const
getUserInfo
=
computed
(()
=>
{
console
.
log
(
'
------------
'
,
userStore
.
getUserInfo
);
//
console.log('------------', userStore.getUserInfo);
const
{
userName
:
realName
=
''
,
avatar
,
desc
}
=
userStore
.
getUserInfo
||
{};
return
{
realName
,
avatar
:
avatar
||
headerImg
,
desc
};
});
...
...
src/router/guard/permissionGuard.ts
View file @
5f7bcaa1
...
...
@@ -8,6 +8,8 @@ import { useUserStoreWithOut } from '/@/store/modules/user';
import
{
PAGE_NOT_FOUND_ROUTE
}
from
'
/@/router/routes/basic
'
;
import
{
RootRoute
}
from
'
/@/router/routes
'
;
import
{
getAuthCache
}
from
'
/@/utils/auth
'
;
import
{
USER_INFO_KEY
}
from
'
/@/enums/cacheEnum
'
;
const
LOGIN_PATH
=
PageEnum
.
BASE_LOGIN
;
...
...
@@ -83,7 +85,7 @@ export function createPermissionGuard(router: Router) {
// get userinfo while last fetch time is empty
if
(
userStore
.
getLastUpdateTime
===
0
)
{
try
{
await
userStore
.
getUserInfoAction
();
await
userStore
.
getUserInfoAction
(
getAuthCache
(
USER_INFO_KEY
)
);
}
catch
(
err
)
{
next
();
return
;
...
...
src/store/modules/user.ts
View file @
5f7bcaa1
...
...
@@ -7,7 +7,7 @@ import { PageEnum } from '/@/enums/pageEnum';
import
{
ROLES_KEY
,
TOKEN_KEY
,
USER_INFO_KEY
,
TMALLAB_TOKEN_KEY
}
from
'
/@/enums/cacheEnum
'
;
import
{
getAuthCache
,
setAuthCache
}
from
'
/@/utils/auth
'
;
import
{
GetUserInfoModel
,
LoginParams
}
from
'
/@/api/sys/model/userModel
'
;
import
{
doLogout
,
getUserInfo
,
loginApi
,
tmallabLoginApi
}
from
'
/@/api/sys/user
'
;
import
{
loginApi
,
tmallabLoginApi
}
from
'
/@/api/sys/user
'
;
import
{
useI18n
}
from
'
/@/hooks/web/useI18n
'
;
import
{
useMessage
}
from
'
/@/hooks/web/useMessage
'
;
import
{
router
}
from
'
/@/router
'
;
...
...
@@ -174,14 +174,15 @@ export const useUserStore = defineStore({
* @description: logout
*/
async
logout
(
goLogin
=
false
)
{
if
(
this
.
getToken
)
{
try
{
await
doLogout
();
}
catch
{
console
.
log
(
'
注销Token失败
'
);
}
}
//
if (this.getToken) {
//
try {
//
await doLogout();
//
} catch {
//
console.log('注销Token失败');
//
}
//
}
this
.
setToken
(
undefined
);
this
.
setTmallabToken
(
undefined
);
this
.
setSessionTimeout
(
false
);
this
.
setUserInfo
({});
goLogin
&&
router
.
push
(
PageEnum
.
BASE_LOGIN
);
...
...
Write
Preview
Markdown
is supported
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