tangning 2 år sedan
förälder
incheckning
b73e67571c
3 ändrade filer med 10 tillägg och 11 borttagningar
  1. 1 1
      src/enums/pageEnum.ts
  2. 1 1
      src/router/guard/permissionGuard.ts
  3. 8 9
      src/store/modules/user.ts

+ 1 - 1
src/enums/pageEnum.ts

@@ -2,7 +2,7 @@ export enum PageEnum {
   // basic login path
   BASE_LOGIN = '/login',
   // basic home path
-  BASE_HOME = '/',
+  BASE_HOME = '/index',
   // error page path
   ERROR_PAGE = '/exception',
   // error log page path

+ 1 - 1
src/router/guard/permissionGuard.ts

@@ -38,7 +38,7 @@ export function createPermissionGuard(router: Router) {
         try {
           await userStore.afterLoginAction();
           if (!isSessionTimeout) {
-            next((to.query?.redirect as string) || '/');
+            next((to.query?.redirect as string) || PageEnum.BASE_HOME || '/');
             return;
           }
         } catch {}

+ 8 - 9
src/store/modules/user.ts

@@ -94,11 +94,11 @@ export const useUserStore = defineStore({
         const { token } = data;
         this.setUserInfo({
           ...data,
-          userId:data.userId,
+          userId: data.userId,
           realName: data.roleName,
-          username:data.userName,
-          avatar:data.avatar||'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
-          roles:[data.roleId],
+          username: data.userName,
+          avatar: data.avatar || 'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
+          roles: [data.roleId],
         });
         // save token
         this.setToken(token);
@@ -111,7 +111,6 @@ export const useUserStore = defineStore({
       if (!this.getToken) return null;
       // get user info
       const userInfo = await this.getUserInfoAction();
-      console.log('getUserInfoAction',userInfo)
       const sessionTimeout = this.sessionTimeout;
       if (sessionTimeout) {
         this.setSessionTimeout(false);
@@ -132,14 +131,14 @@ export const useUserStore = defineStore({
     async getUserInfoAction(): Promise<UserInfo | null> {
       if (!this.getToken) return null;
       const userInfo = await getUserInfo();
-      const { roleId  } = userInfo;
-      if (isArray(roleId)) { 
+      const { roleId } = userInfo;
+      if (isArray(roleId)) {
         const roleList = roleId.map((item) => item.value) as RoleEnum[];
         this.setRoleList(roleList);
-      }else if(roleId) {
+      } else if (roleId) {
         userInfo.roles = [roleId];
         this.setRoleList([]);
-      }else{
+      } else {
         userInfo.roles = [];
         this.setRoleList([]);
       }