From 53eb9519b9186478600b495ce04454a9a9087ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 22 Sep 2025 23:10:44 +0800
Subject: [PATCH] =?UTF-8?q?```=20fix(qr-login):=E4=BC=98=E5=8C=96=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E7=99=BB=E5=BD=95=E7=A1=AE=E8=AE=A4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=8E=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整 confirmWechatQRLogin 接口返回类型，去除冗余日志输出
- 修改登录确认判断条件为 status === 'confirmed'- 更新成功与失败时的提示信息，提升用户体验
-优化错误处理文案，移除不必要的数字前缀```
---
 src/api/qr-login/index.ts     | 5 ++---
 src/hooks/useUnifiedQRScan.ts | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/api/qr-login/index.ts b/src/api/qr-login/index.ts
index 13c15e3..f76c47f 100644
--- a/src/api/qr-login/index.ts
+++ b/src/api/qr-login/index.ts
@@ -158,17 +158,16 @@ export async function confirmWechatQRLogin(token: string, userId: number) {
       deviceInfo: await getDeviceInfo()
     };
 
-    const res = await request.post<ApiResult<ConfirmLoginResult>>(
+    const res = await request.post<ApiResult<any>>(
       SERVER_API_URL + '/qr-login/confirm',
       data
     );
-    console.log(res,'ConfirmLoginParamResult>')
     if (res.code === 0 && res.data) {
       return res.data;
     }
     return Promise.reject(new Error(res.message));
   } catch (error: any) {
-    return Promise.reject(new Error(error.message || '22确认登录失败'));
+    return Promise.reject(new Error(error.message || '确认登录失败'));
   }
 }
 
diff --git a/src/hooks/useUnifiedQRScan.ts b/src/hooks/useUnifiedQRScan.ts
index b34d055..b770dd4 100644
--- a/src/hooks/useUnifiedQRScan.ts
+++ b/src/hooks/useUnifiedQRScan.ts
@@ -111,12 +111,11 @@ export function useUnifiedQRScan() {
     }
 
     const confirmResult = await confirmWechatQRLogin(token, parseInt(userId));
-
-    if (confirmResult.success) {
+    if (confirmResult.status === 'confirmed') {
       return {
         type: ScanType.LOGIN,
         data: confirmResult,
-        message: '登录确认成功'
+        message: '登录成功'
       };
     } else {
       throw new Error(confirmResult.message || '登录确认失败');