Merge remote-tracking branch 'origin/feature/0905_登录注册流程重构' into test

# Conflicts:
#	src/App.vue
#	src/layouts/components/siderBar/menu-list.ts
#	src/views/components/login/index.vue

src/utils/user.ts

@@ -11,14 +11,25 @@ import { useChatStore } from '@/stores/modules/chat';
 
 // 登录
 export function goUserLogin(query?: any) {
+  // console.log('goUserLogin', router)
   router.push({ name: 'UserLogin', query });
 }
 
+// 首页
+export function handleUserHome(params?: any) {
+  const enterpriseStore = useEnterpriseStore();
+  // 已开通
+  if (enterpriseStore.isOpenEnterprise) {
+    router.push({ name: 'Home', params });
+  } else {
+    router.push({ name: 'Trial' });
+  }
+}
+
 export const getUserEnterpriseInfo = async () => {
   const enterpriseStore = useEnterpriseStore();
   // const sidebarStore = useSidebarStore();
   // const userStore = useUserStore();
-
   await enterpriseStore.getEnterpriseInfo(); // 初始化企业信息
   // sidebarStore.getUserNavbarMenuList(); // 初始化navbar菜单
   // userStore.getUserAllowAccessRoutes(); // 初始化允许访问的路由
@@ -27,30 +38,30 @@ export const getUserEnterpriseInfo = async () => {
 export async function initApp() {
   const userStore = useUserStore();
   const chatStore = useChatStore();
+  const sidebarStore = useSidebarStore();
+  const enterpriseStore = useEnterpriseStore();
 
-  chatStore.getAgentInfo(); // 初始化智能体信息
   await userStore.getUserInfo(); // 初始化用户信息
-  await getUserEnterpriseInfo(); // 初始化企业信息、navbar菜单、允许访问的路由
+
+  if (enterpriseStore.isOpenEnterprise) {
+    await getUserEnterpriseInfo(); // 初始化企业信息
+    chatStore.getAgentInfo(); // 初始化智能体信息
+
+    sidebarStore.startUnreadInfoPolling(); // 初始化未读信息
+  }
 }
 
 // 登录处理
 export async function handleUserLogin() {
-  const sidebarStore = useSidebarStore();
-
   await initApp();
 
-  sidebarStore.startUnreadInfoPolling(); // 初始化未读信息
-
   handleUserHome();
 }
 
-// 首页
-export function handleUserHome(params?: any) {
-  router.push({ name: 'Home', params });
-}
-
 // 登出处理
 export function handleUserLogout() {
+  goUserLogin();
+
   const userStore = useUserStore();
   const enterpriseStore = useEnterpriseStore();
   const sidebarStore = useSidebarStore();
@@ -64,6 +75,4 @@ export function handleUserLogout() {
   sidebarStore.stopUnreadInfoPolling(); // 清除未读消息
   sidebarStore.clearActiveMenuKey(); // 清除active菜单id
   sidebarStore.clearMenuCollapse(); // 清除active菜单id
-
-  goUserLogin();
 }