fix(projects): fix login success notification. fixed #688

soybeanjs · Dec 26, 2024 · 60dd226 · 60dd226
1 parent 5676024
commit 60dd226
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/hooks/common/router.ts b/src/hooks/common/router.ts
@@ -102,9 +102,9 @@ export function useRouterPush(inSetup = true) {
     const redirect = route.value.query?.redirect as string;
 
     if (needRedirect && redirect) {
-      routerPush(redirect);
+      await routerPush(redirect);
     } else {
-      toHome();
+      await toHome();
     }
   }
 

diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
@@ -71,13 +71,11 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
       if (pass) {
         await redirectFromLogin(redirect);
 
-        if (routeStore.isInitAuthRoute) {
-          window.$notification?.success({
-            title: $t('page.login.common.loginSuccess'),
-            content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
-            duration: 4500
-          });
-        }
+        window.$notification?.success({
+          title: $t('page.login.common.loginSuccess'),
+          content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
+          duration: 4500
+        });
       }
     } else {
       resetStore();