From 31c44d8df7d07d6ce8a706be11dee6edeeb37a46 Mon Sep 17 00:00:00 2001
From: Gsh <15170702455@163.com>
Date: Mon, 28 Jul 2025 12:59:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E5=8A=9F=E8=83=BD=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/LoginDialog/index.vue      | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/Yi.Ai.Vue3/src/components/LoginDialog/index.vue b/Yi.Ai.Vue3/src/components/LoginDialog/index.vue
index 18358c61..1a130b28 100644
--- a/Yi.Ai.Vue3/src/components/LoginDialog/index.vue
+++ b/Yi.Ai.Vue3/src/components/LoginDialog/index.vue
@@ -85,10 +85,12 @@ function handleThirdPartyLogin(type: any) {
         const resUserInfo = await getUserInfo();
         userStore.setUserInfo(resUserInfo.data);
         // 关闭弹窗
-        if (popup && !popup.closed)
-          popup.close();
+
         // 后续逻辑
         ElMessage.success('登录成功');
+        if (popup && !popup.closed) {
+          popup.close();
+        }
         userStore.closeLoginDialog();
         await sessionStore.requestSessionList(1, true);
         await router.replace('/');
@@ -105,14 +107,14 @@ function handleThirdPartyLogin(type: any) {
   window.addEventListener('message', messageHandler);
 
   // 超时自动清理
-  setTimeout(() => {
-    if (!isHandled) {
-      window.removeEventListener('message', messageHandler);
-      if (popup && !popup.closed)
-        popup.close();
-      ElMessage.warning('登录超时');
-    }
-  }, 60 * 1000); // 60分钟超时关闭
+  // setTimeout(() => {
+  //   if (!isHandled) {
+  //     window.removeEventListener('message', messageHandler);
+  //     if (popup && !popup.closed)
+  //       popup.close();
+  //     ElMessage.warning('登录超时');
+  //   }
+  // }, 60 * 1000); // 60分钟超时关闭
 }
 
 // 让意社区重新登录，先让意社区退出登录，再重新登录
@@ -161,14 +163,14 @@ function handleLoginAgainYi() {
   window.addEventListener('message', messageHandler);
 
   // 超时自动清理
-  setTimeout(() => {
-    if (!isHandled) {
-      window.removeEventListener('message', messageHandler);
-      if (popup && !popup.closed)
-        popup.close();
-      ElMessage.warning('登录超时');
-    }
-  }, 60 * 1000); // 60分钟超时关闭
+  // setTimeout(() => {
+  //   if (!isHandled) {
+  //     window.removeEventListener('message', messageHandler);
+  //     if (popup && !popup.closed)
+  //       popup.close();
+  //     ElMessage.warning('登录超时');
+  //   }
+  // }, 60 * 1000); // 60分钟超时关闭
 }
 
 const wxSrc = computed(