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>( + const res = await request.post>( 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 || '登录确认失败');