From fc75aad6f7e7fb89329a12354ad50ccb78a014da Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Fri, 31 Mar 2023 17:21:22 +0800 Subject: [PATCH] =?UTF-8?q?3.31=20=E7=94=9F=E4=BA=A7=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E6=96=B9=E8=BF=90=E7=BB=B4=E7=99=BB=E5=BD=95=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../login/components/Login/LoginItem.tsx | 15 ++++++------ src/pages/usercooper/login/index.tsx | 24 +++++++++++++++---- src/services/login.ts | 4 +--- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/pages/usercooper/login/components/Login/LoginItem.tsx b/src/pages/usercooper/login/components/Login/LoginItem.tsx index a4ea42a..55f2bc7 100644 --- a/src/pages/usercooper/login/components/Login/LoginItem.tsx +++ b/src/pages/usercooper/login/components/Login/LoginItem.tsx @@ -75,13 +75,12 @@ const LoginItem: React.FC = (props) => { ...restProps } = props; - const onGetCaptcha = useCallback(async (mobile: string) => { - const result = await getFakeCaptcha(mobile); - if (result === false) { - return; + const onGetCaptcha = useCallback(async (values: any) => { + const result = await getFakeCaptcha(values); + if (result?.success) { + message.success('获取验证码成功!'); + setTiming(true); } - message.success('获取验证码成功!'); - setTiming(true); }, []); useEffect(() => { @@ -127,8 +126,8 @@ const LoginItem: React.FC = (props) => { className={styles.getCaptcha} size="large" onClick={() => { - validateFields(['mobile']).then(values => { - const value = values?.mobile; + validateFields(['mobile', 'code', 'tmpToken']).then(values => { + const value = { strmobileNumber: values?.mobile, code: values?.code, codeKey: values?.tmpToken }; onGetCaptcha(value); }) }} diff --git a/src/pages/usercooper/login/index.tsx b/src/pages/usercooper/login/index.tsx index 729e9ef..811925c 100644 --- a/src/pages/usercooper/login/index.tsx +++ b/src/pages/usercooper/login/index.tsx @@ -35,8 +35,9 @@ const Login: React.FC = (props) => { const [type, setType] = useState('account'); const [dis, disSet] = useState(false); const [imgUrl, setImgUrl] = useState(''); - const [tmpToken, setTmpToken] = useState(''); + // const [tmpToken, setTmpToken] = useState(''); const remainingTime = 3 //刷新token的剩余时间,单位小时 + const [form] = Form.useForm(); const genRandomString = (len: number) => { const text = 'abcdefghijklmnopqrstuvwxyz0123456789'; @@ -48,7 +49,7 @@ const Login: React.FC = (props) => { const changeCaptcha = () => { let tmpToken = genRandomString(16); let url = '/api/auth/captcha?token=' + tmpToken; - setTmpToken(tmpToken); + form.setFieldsValue({ tmpToken }); setImgUrl(url); }; useEffect(() => { @@ -109,7 +110,7 @@ const Login: React.FC = (props) => { }) } else { disSet(true); - await CooperfakeAccountLogin({ ...values, tmpToken }).then((res) => { + await CooperfakeAccountLogin({ ...values }).then((res) => { if (res?.success) { if (moment(res?.data?.expiration).diff(moment(), 'hours') < remainingTime) { refreshToken(res?.data) @@ -137,7 +138,7 @@ const Login: React.FC = (props) => { /> 合作方登录 - + {status === 'error' && loginType === 'account' && !submitting && ( @@ -172,8 +173,21 @@ const Login: React.FC = (props) => { }, ]} /> + {START_ENV == 'sim' || START_ENV == 'PROD' ? ( <> + + + + + + + + changeCaptcha()} /> + + = (props) => {