优化登录直接进入首页

zrch-risk-client-39/src/store/modules/user.ts

@@ -18,8 +18,8 @@ import { isArray } from '/@/utils/is';
 import { useGlobSetting } from '/@/hooks/setting';
 import { JDragConfigEnum } from '/@/enums/jeecgEnum';
 import { useSso } from '/@/hooks/web/useSso';
-import { isOAuth2AppEnv } from "/@/views/sys/login/useLogin";
-import { getUrlParam } from "@/utils";
+import { isOAuth2AppEnv } from '/@/views/sys/login/useLogin';
+import { getUrlParam } from '@/utils';
 interface dictType {
   [key: string]: any;
 }
@@ -60,8 +60,8 @@ export const useUserStore = defineStore({
   }),
   getters: {
     getUserInfo(): UserInfo {
-      if(this.userInfo == null){
-        this.userInfo = getAuthCache<UserInfo>(USER_INFO_KEY)!=null ? getAuthCache<UserInfo>(USER_INFO_KEY) : null;
+      if (this.userInfo == null) {
+        this.userInfo = getAuthCache<UserInfo>(USER_INFO_KEY) != null ? getAuthCache<UserInfo>(USER_INFO_KEY) : null;
       }
       return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {};
     },
@@ -194,27 +194,27 @@ export const useUserStore = defineStore({
         //   router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
         //   permissionStore.setDynamicAddedRoute(true);
         // }
-        
+
         await this.setLoginInfo({ ...data, isLogin: true });
         // 代码逻辑说明: 登录成功后缓存拖拽模块的接口前缀
         localStorage.setItem(JDragConfigEnum.DRAG_BASE_URL, useGlobSetting().domainUrl);
 
         // 代码逻辑说明: 修复登录成功后，没有正确重定向的问题
-        let redirect = router.currentRoute.value?.query?.redirect as string;
+        // let redirect = router.currentRoute.value?.query?.redirect as string;
         // 判断是否有 redirect 重定向地址
         // 代码逻辑说明: 【QQYUN-5195】登录之后直接刷新页面导致没有进入创建组织页面------------
-        if (redirect && goHome) {
-          // router.options.history.base可替代之前的publicPath
-          // 当前页面打开
-          window.open(`${router.options.history.base}${redirect}`, '_self');
-          return data;
-        }
+        // if (redirect && goHome) {
+        //   // router.options.history.base可替代之前的publicPath
+        //   // 当前页面打开
+        //   window.open(`${router.options.history.base}${redirect}`, '_self');
+        //   return data;
+        // }
 
         // 代码逻辑说明: 【issues/1102】设置单点登录后页面，进入首页提示404，也没有绘制侧边栏 #1102---
         let ticket = getUrlParam('ticket');
-        if(ticket){
-          goHome && (window.location.replace((userInfo && userInfo.homePath) || PageEnum.BASE_HOME));
-        }else{
+        if (ticket) {
+          goHome && window.location.replace((userInfo && userInfo.homePath) || PageEnum.BASE_HOME);
+        } else {
           goHome && (await router.replace((userInfo && userInfo.homePath) || PageEnum.BASE_HOME));
         }
       }
@@ -234,7 +234,7 @@ export const useUserStore = defineStore({
         const { goHome = true, mode, ...loginParams } = params;
         const data = await phoneLoginApi(loginParams, mode);
         // 代码逻辑说明: 【issues/7488】手机号码登录，在请求头中无法获取租户id---
-        const { token , userInfo } = data;
+        const { token, userInfo } = data;
         this.setTenant(userInfo!.loginTenantId);
         // save token
         this.setToken(token);
@@ -308,20 +308,20 @@ export const useUserStore = defineStore({
         await useSso().ssoLoginOut();
       }
       //退出登录的时候需要用的应用id
-      if(isOAuth2AppEnv()){
+      if (isOAuth2AppEnv()) {
         let tenantId = getAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID);
         removeAuthCache(OAUTH2_THIRD_LOGIN_TENANT_ID);
-        goLogin && await router.push({ name:"Login",query:{ tenantId:tenantId }})
-      }else{
+        goLogin && (await router.push({ name: 'Login', query: { tenantId: tenantId } }));
+      } else {
         // 代码逻辑说明: 修复登录成功后，没有正确重定向的问题
-        goLogin && (await router.push({
-          path: PageEnum.BASE_LOGIN,
-          query: {
-            // 传入当前的路由，登录成功后跳转到当前路由
-            redirect: router.currentRoute.value.fullPath,
-          }
-        }));
-
+        goLogin &&
+          (await router.push({
+            path: PageEnum.BASE_LOGIN,
+            query: {
+              // 传入当前的路由，登录成功后跳转到当前路由
+              redirect: router.currentRoute.value.fullPath,
+            },
+          }));
       }
     },
     /**