From 9f6d2844bc01e41ce67a31771a2c00317e52efc7 Mon Sep 17 00:00:00 2001
From: yuliang_guo <anonymous@qq.com>
Date: Thu, 29 Jan 2026 15:38:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=92=89=E9=92=89?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95SDK=E5=B0=B1=E7=BB=AA=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/utils/dingtalk.ts     | 29 +++++++++++++++++++++++++----
 frontend/src/views/login/index.vue | 14 +++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/frontend/src/utils/dingtalk.ts b/frontend/src/utils/dingtalk.ts
index a0bffc3..11bad3f 100644
--- a/frontend/src/utils/dingtalk.ts
+++ b/frontend/src/utils/dingtalk.ts
@@ -58,21 +58,42 @@ export function getDingtalkPlatform(): string {
 }
 
 /**
- * 等待钉钉SDK就绪
+ * 等待钉钉SDK就绪（带超时）
  */
-export function waitDingtalkReady(): Promise<void> {
+export function waitDingtalkReady(timeout: number = 5000): Promise<void> {
   return new Promise((resolve, reject) => {
     if (!window.dd) {
       reject(new Error('钉钉SDK未加载'))
       return
     }
     
+    let resolved = false
+    
+    // 超时处理
+    const timer = setTimeout(() => {
+      if (!resolved) {
+        resolved = true
+        console.warn('钉钉SDK就绪超时，尝试继续执行')
+        resolve() // 超时后也尝试继续，可能SDK已经就绪
+      }
+    }, timeout)
+    
     window.dd.ready(() => {
-      resolve()
+      if (!resolved) {
+        resolved = true
+        clearTimeout(timer)
+        console.log('钉钉SDK就绪')
+        resolve()
+      }
     })
     
     window.dd.error((err) => {
-      reject(err)
+      if (!resolved) {
+        resolved = true
+        clearTimeout(timer)
+        console.error('钉钉SDK错误:', err)
+        reject(err)
+      }
     })
   })
 }
diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue
index a2e8848..83ffc7f 100644
--- a/frontend/src/views/login/index.vue
+++ b/frontend/src/views/login/index.vue
@@ -245,8 +245,10 @@ const handleDingtalkLoginSuccess = (response: any) => {
  * 钉钉免密登录（在钉钉环境中自动触发）
  */
 const autoDingtalkLogin = async () => {
+  console.log('[钉钉登录] 开始自动登录流程')
+  
   if (!dingtalkConfig.corp_id) {
-    console.warn('钉钉CorpId未配置')
+    console.warn('[钉钉登录] CorpId未配置')
     return
   }
   
@@ -254,13 +256,19 @@ const autoDingtalkLogin = async () => {
   
   try {
     // 等待钉钉SDK就绪
+    console.log('[钉钉登录] 等待SDK就绪...')
     await waitDingtalkReady()
+    console.log('[钉钉登录] SDK已就绪')
     
     // 获取免登授权码
+    console.log('[钉钉登录] 获取授权码...')
     const code = await getAuthCode(dingtalkConfig.corp_id)
+    console.log('[钉钉登录] 授权码获取成功')
     
     // 调用登录API
+    console.log('[钉钉登录] 调用登录API...')
     const response = await dingtalkLogin({ code })
+    console.log('[钉钉登录] API响应:', response)
     
     if (response.code === 200) {
       handleDingtalkLoginSuccess(response)
@@ -268,8 +276,8 @@ const autoDingtalkLogin = async () => {
       ElMessage.error(response.message || '钉钉登录失败')
     }
   } catch (error: any) {
-    console.error('钉钉自动登录失败:', error)
-    ElMessage.warning('钉钉自动登录失败，请使用账号密码登录')
+    console.error('[钉钉登录] 自动登录失败:', error)
+    ElMessage.warning(error.message || '钉钉自动登录失败，请使用账号密码登录')
   } finally {
     dingtalkLoading.value = false
   }