Merge branch '1028_bugfix' into feature

* 1028_bugfix:
  手机号格式适配-前端修改
  添加微信扫码的几种其他状态
  整合register端口进入login端口

src/components/Auth/AuthFormContent.js

@@ -143,7 +143,10 @@ export default function AuthFormContent() {
             return;
         }
 
-        if (!/^1[3-9]\d{9}$/.test(credential)) {
+        // 清理手机号格式字符（空格、横线、括号等）
+        const cleanedCredential = credential.replace(/[\s\-\(\)\+]/g, '');
+
+        if (!/^1[3-9]\d{9}$/.test(cleanedCredential)) {
             toast({
                 title: "请输入有效的手机号",
                 status: "warning",
@@ -156,7 +159,7 @@ export default function AuthFormContent() {
             setSendingCode(true);
 
             const requestData = {
-                credential: credential.trim(),  // 添加 trim() 防止空格
+                credential: cleanedCredential,  // 使用清理后的手机号
                 type: 'phone',
                 purpose: config.api.purpose
             };
@@ -189,13 +192,13 @@ export default function AuthFormContent() {
             if (response.ok && data.success) {
                 // ❌ 移除成功 toast，静默处理
                 logger.info('AuthFormContent', '验证码发送成功', {
-                    credential: credential.substring(0, 3) + '****' + credential.substring(7),
+                    credential: cleanedCredential.substring(0, 3) + '****' + cleanedCredential.substring(7),
                     dev_code: data.dev_code
                 });
 
                 // ✅ 开发环境下在控制台显示验证码
                 if (data.dev_code) {
-                    console.log(`%c✅ [验证码] ${credential} -> ${data.dev_code}`, 'color: #16a34a; font-weight: bold; font-size: 14px;');
+                    console.log(`%c✅ [验证码] ${cleanedCredential} -> ${data.dev_code}`, 'color: #16a34a; font-weight: bold; font-size: 14px;');
                 }
 
                 setVerificationCodeSent(true);
@@ -205,7 +208,7 @@ export default function AuthFormContent() {
             }
         } catch (error) {
             logger.api.error('POST', '/api/auth/send-verification-code', error, {
-                credential: credential.substring(0, 3) + '****' + credential.substring(7)
+                credential: cleanedCredential.substring(0, 3) + '****' + cleanedCredential.substring(7)
             });
 
             // ✅ 显示错误提示给用户
@@ -247,7 +250,10 @@ export default function AuthFormContent() {
                 return;
             }
 
-            if (!/^1[3-9]\d{9}$/.test(phone)) {
+            // 清理手机号格式字符（空格、横线、括号等）
+            const cleanedPhone = phone.replace(/[\s\-\(\)\+]/g, '');
+
+            if (!/^1[3-9]\d{9}$/.test(cleanedPhone)) {
                 toast({
                     title: "请输入有效的手机号",
                     status: "warning",
@@ -258,13 +264,13 @@ export default function AuthFormContent() {
 
             // 构建请求体
             const requestBody = {
-                credential: phone.trim(),  // 添加 trim() 防止空格
+                credential: cleanedPhone,  // 使用清理后的手机号
                 verification_code: verificationCode.trim(),  // 添加 trim() 防止空格
                 login_type: 'phone',
             };
 
             logger.api.request('POST', '/api/auth/login-with-code', {
-                credential: phone.substring(0, 3) + '****' + phone.substring(7),
+                credential: cleanedPhone.substring(0, 3) + '****' + cleanedPhone.substring(7),
                 verification_code: verificationCode.substring(0, 2) + '****',
                 login_type: 'phone'
             });

src/components/Auth/WechatRegister.js

@@ -35,6 +35,8 @@ const getStatusColor = (status) => {
         case WECHAT_STATUS.EXPIRED: return "orange.600";      // ✅ 橙色文字
         case WECHAT_STATUS.LOGIN_SUCCESS: return "green.600"; // ✅ 绿色文字
         case WECHAT_STATUS.REGISTER_SUCCESS: return "green.600";
+        case WECHAT_STATUS.AUTH_DENIED: return "red.600";     // ✅ 红色文字
+        case WECHAT_STATUS.AUTH_FAILED: return "red.600";     // ✅ 红色文字
         default: return "gray.600";
     }
 };
@@ -215,6 +217,33 @@ export default function WechatRegister() {
                     });
                 }
             }
+            // 处理用户拒绝授权
+            else if (status === WECHAT_STATUS.AUTH_DENIED) {
+                clearTimers();
+                if (isMountedRef.current) {
+                    toast({
+                        title: "授权已取消",
+                        description: "您已取消微信授权登录",
+                        status: "warning",
+                        duration: 3000,
+                        isClosable: true,
+                    });
+                }
+            }
+            // 处理授权失败
+            else if (status === WECHAT_STATUS.AUTH_FAILED) {
+                clearTimers();
+                if (isMountedRef.current) {
+                    const errorMsg = response.error || "授权过程出现错误";
+                    toast({
+                        title: "授权失败",
+                        description: errorMsg,
+                        status: "error",
+                        duration: 5000,
+                        isClosable: true,
+                    });
+                }
+            }
         } catch (error) {
             logger.error('WechatRegister', 'checkWechatStatus', error, { sessionId: currentSessionId });
             // 轮询过程中的错误不显示给用户，避免频繁提示

src/services/authService.js

@@ -147,6 +147,8 @@ export const WECHAT_STATUS = {
     LOGIN_SUCCESS: 'authorized',        // ✅ 与后端保持一致，统一使用 'authorized'
     REGISTER_SUCCESS: 'authorized',     // ✅ 与后端保持一致，统一使用 'authorized'
     EXPIRED: 'expired',
+    AUTH_DENIED: 'auth_denied',      // 用户拒绝授权
+    AUTH_FAILED: 'auth_failed',      // 授权失败
 };
 
 /**
@@ -157,6 +159,8 @@ export const STATUS_MESSAGES = {
     [WECHAT_STATUS.SCANNED]: '扫码成功，请在手机上确认',
     [WECHAT_STATUS.AUTHORIZED]: '授权成功，正在登录...',
     [WECHAT_STATUS.EXPIRED]: '二维码已过期',
+    [WECHAT_STATUS.AUTH_DENIED]: '用户取消授权',
+    [WECHAT_STATUS.AUTH_FAILED]: '授权失败，请重试',
 };
 
 export default authService;