Merge remote-tracking branch 'origin/ai-hub' into ai-hub

Yi.Ai.Vue3/src/components/LoginDialog/index.vue

@@ -85,12 +85,12 @@ function handleThirdPartyLogin(type: any) {
         const resUserInfo = await getUserInfo();
         userStore.setUserInfo(resUserInfo.data);
         // 关闭弹窗
-
-        // 后续逻辑
-        ElMessage.success('登录成功');
         if (popup && !popup.closed) {
           popup.close();
         }
+
+        // 后续逻辑
+        ElMessage.success('登录成功');
         userStore.closeLoginDialog();
         await sessionStore.requestSessionList(1, true);
         await router.replace('/');

Yi.Ai.Vue3/src/layouts/index.vue

@@ -16,6 +16,11 @@ const designStore = useDesignStore();
 // const { isMobile } = useScreenStore();
 /** 获取布局格式 */
 const layout = computed((): LayoutType => designStore.layout);
+onMounted(() => {
+  console.log('111--');
+  // 通知 index.html 的 loading 动画进度拉满并淡出
+  (window as any)?.finishLoading();
+});
 </script>
 
 <template>

Yi.Ai.Vue3/src/main.ts

@@ -29,6 +29,3 @@ app.use(store);
 // 挂载 Vue 应用
 // mount 完成说明应用初始化完毕，此时手动通知 loading 动画结束
 app.mount('#app');
-
-// 通知 index.html 的 loading 动画进度拉满并淡出
-(window as any).finishLoading?.();