Merge branch 'feature-chaojie' into dev

src/app/[locale]/resetPhone/page.tsx

@@ -6,7 +6,7 @@ import DomainFooter from "@/components/DomainFooter";
 import './page.scss'
 import React from "react";
 import { phoneRegex } from "@/utils";
-import {getCheckUserPhoneExistApi, getSendCodeApi} from "@/api/user";
+import {getCheckUserPhoneExistApi} from "@/api/user";
 import { useRouter } from "@/i18n";
 
 interface Props {}

src/app/[locale]/verification/page.scss

@@ -33,16 +33,28 @@
       justify-content: center;
       overflow: hidden;
       margin-top: 0.2rem;
+      position: relative;
+
       .after {
-        margin-left: .1rem;
-        font-size: .14rem;
-        color: #868686;
+          color: #fcde26;
+          font-size: .14rem;
+          border: .01rem solid #fcde26;
+          position: absolute;
+          height: .26rem;
+          line-height: .26rem;
+          padding: 0 .08rem;
+          text-align: center;
+          right: .1rem;
+          top: .11rem;
+          border-radius: .13rem;
       }
+
       input {
         padding-left: .14rem;
         -webkit-box-sizing: border-box;
         box-sizing: border-box;
       }
+      
     }
     
     input {

src/app/[locale]/verification/page.tsx

@@ -5,37 +5,26 @@ import ButtonOwn from "@/components/ButtonOwn";
 import DomainFooter from "@/components/DomainFooter";
 import './page.scss'
 import React from "react";
-import { phoneRegex } from "@/utils";
-import {getCheckUserPhoneExistApi, getSendCodeApi} from "@/api/user";
+import {getSendCodeApi} from "@/api/user";
+import { useRouter } from "@/i18n";
 
 interface Props {}
 
 const ResetPhone: FC<PropsWithChildren<Props>> = () => {
-
-    let [userPhone, setUserPhone] = useState('')
-    const changeUserPhone = (e: { target: { value: any; }; }) => {
-        setUserPhone(e.target.value)
+    const router:any = useRouter()
+    let [code, setCode] = useState('')
+    const changeCode = (e: { target: { value: any; }; }) => {
+        setCode(e.target.value)
     }
-    let [verifyInfo, setVerifyInfo] = useState({
-        msgError: '',
-        check: false
-    })
-
+    let [msgError, setMsgError] = useState('')
     const checkUserPhoneRequest = async () => {
-        let { code, msg } = await getCheckUserPhoneExistApi({user_phone: userPhone})
-        if(code == 200) {
-            getSendCodeApi({user_phone: userPhone}).then((res) => {
-                if(res.code == 200) {
-                    alert('验证码发送成功')
-                     router.push('/verification')
-                }
-            })
-            router.push('/verification')
-            return
-        }
-        setVerifyInfo({
-            ...verifyInfo,
-            msgError: msg,
+        getSendCodeApi({user_phone: userPhone}).then((res) => {
+            if(res.code == 200) {
+                alert('验证码发送成功')
+                router.push('/verification')
+                return
+            }
+            setMsgError(res.MSG)
         })
     }
     return (
@@ -47,12 +36,12 @@ const ResetPhone: FC<PropsWithChildren<Props>> = () => {
                     <div>A senha de verificação foi enviado para o teu telemóvel 16982013895</div>
                 </div>
                 <div className="phoneInput">
-                    <input type="tel" value={userPhone} onChange={changeUserPhone} placeholder="Reenviar código" maxLength={6} />
-                    <span className="after">+55</span>
+                    <input type="tel" value={code} onChange={changeCode} placeholder="Reenviar código" maxLength={6} />
+                    <span className="after">Envie de novo</span>
                 </div>
-                { verifyInfo.msgError && <div className="tips"> {verifyInfo.msgError} </div> }
+                { msgError && <div className="tips"> {msgError} </div> }
                 <div className="btnContent">
-                    <ButtonOwn active={verifyInfo.check} callbackFun={checkUserPhoneRequest}>Completar</ButtonOwn>
+                    <ButtonOwn active={code.length==6} callbackFun={checkUserPhoneRequest}>Completar</ButtonOwn>
                 </div>
             </div>
             <DomainFooter />

src/app/globals.css

@@ -25,7 +25,7 @@ html, body {
 }
 
 html {
-    font-size: 100px;
+    font-size: 144px;
 }
 
 ::-webkit-scrollbar {