diff --git a/package.json b/package.json index d7633a9d..2e09bc23 100755 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "match-sorter": "6.3.0", "moment": "^2.29.1", "nouislider": "15.0.0", + "qrcode.react": "^4.2.0", "react": "18.3.1", "react-apexcharts": "^1.3.9", "react-big-calendar": "^0.33.2", diff --git a/src/components/Auth/AuthFormContent.js b/src/components/Auth/AuthFormContent.js index b4edc410..d6ebe7a6 100644 --- a/src/components/Auth/AuthFormContent.js +++ b/src/components/Auth/AuthFormContent.js @@ -239,6 +239,8 @@ export default function AuthFormContent() { credential: phone, verification_code: verificationCode, login_type: 'phone', + type: 'phone', + purpose: config.api.purpose, // 使用配置中的purpose }; // 调用API(根据模式选择不同的endpoint) diff --git a/src/components/Auth/WechatRegister.js b/src/components/Auth/WechatRegister.js index 9d80f31d..95640da8 100644 --- a/src/components/Auth/WechatRegister.js +++ b/src/components/Auth/WechatRegister.js @@ -10,6 +10,7 @@ import { } from "@chakra-ui/react"; import { FaQrcode } from "react-icons/fa"; import { useNavigate } from "react-router-dom"; +import { QRCodeSVG } from "qrcode.react"; import { authService, WECHAT_STATUS, STATUS_MESSAGES } from "../../services/authService"; // 配置常量 @@ -194,6 +195,8 @@ export default function WechatRegister() { const response = await authService.getWechatQRCode(); + console.log(`zdl getWechatQRCode ${JSON.stringify(response)}`) + // 检查组件是否已卸载 if (!isMountedRef.current) return; @@ -267,7 +270,11 @@ export default function WechatRegister() { {/* 灰色二维码底图 - 始终显示 */} {/* 根据 wechatStatus 渲染不同的内容 */} {wechatStatus === WECHAT_STATUS.WAITING ? ( - 微信二维码 + ) : ( )}