Merge branch 'feature-chaojie' into dev

src/app/[locale]/login/component/FromCom/index.tsx

@@ -1,6 +1,7 @@
 "use client";
 import { FC, PropsWithChildren, useState } from "react";
 import clsx from "clsx";
+import Link from "next/link";
 import ButtonOwn from "@/components/ButtonOwn";
 import "./style.scss";
 
@@ -41,10 +42,10 @@ const FromCom: FC<PropsWithChildren<FromComProps>> = ({type = 'login', callbackF
                 {
                     type == 'login' ? (
                         <>
-                            <span>Esqueci minha senha?</span>
-                            <span>Criar Conta Nova</span>
+                            <Link href="/br/resetPhone">Esqueci minha senha?</Link>
+                            <Link href="/br/register">Criar Conta Nova</Link>
                         </>
-                    ) : <span className="active">Já tem uma conta? Log in</span>
+                    ) : <Link href="/br/login" className="active">Já tem uma conta? Log in</Link>
                 }     
             </div>
         </div>

src/app/[locale]/login/component/FromCom/style.scss

@@ -57,7 +57,7 @@
     -ms-flex-pack: justify;
     justify-content: space-between;
 
-    span {
+    a {
       font-size: .12rem;
       color: #fff;
       text-align: center;

src/app/[locale]/(ordinary)/resetPhone/page.scss → src/app/[locale]/resetPhone/page.scss

@@ -47,6 +47,7 @@
         box-sizing: border-box;
       }
     }
+    
     input {
       flex: 1;
       background-color: #494949;
@@ -58,6 +59,14 @@
         color: #868686;
       }
     }
+
+    .tips {
+      width: 100%;
+      color: #e53535;
+      font-size: 0.12rem;
+      margin-top: .02rem;
+    }
+
     .btnContent {
       margin: .29rem 0 .19rem;
     }

src/app/[locale]/(ordinary)/resetPhone/page.tsx → src/app/[locale]/resetPhone/page.tsx

@@ -1,4 +1,5 @@
 import { FC, PropsWithChildren } from "react";
+import HeaderBack from "@/components/HeaderBack";
 import ButtonOwn from "@/components/ButtonOwn";
 import DomainFooter from "@/components/DomainFooter";
 import './page.scss'
@@ -6,12 +7,11 @@ import React from "react";
 
 interface Props {}
 
-const ResetPhone: FC<PropsWithChildren<Props>> = (props) => {
-    let amount = 50
-    let amountList = [10,20,50,100,200,500,1000,5000,10000]
+const ResetPhone: FC<PropsWithChildren<Props>> = () => {
 
     return (
         <div className="resetPhone-box">
+            <HeaderBack />
             <div className="main">
                 <div className="title">
                     <h2>Encontre sua conta</h2>
@@ -21,6 +21,7 @@ const ResetPhone: FC<PropsWithChildren<Props>> = (props) => {
                     <span className="after">+55</span>
                     <input type="tel" placeholder="Número de Celular" />
                 </div>
+                <div className="tips"> O número de telefone não existe. </div>
                 <div className="btnContent">
                     <ButtonOwn active={true}>Continuar</ButtonOwn>
                 </div>

src/components/HeaderBack/index.tsx

@@ -1,5 +1,7 @@
 "use client";
 import { FC, PropsWithChildren, ReactNode } from "react";
+import Router from 'next/router';
+import { useRouter } from "@/i18n";
 import clsx from "clsx";
 import styles from "./style.module.scss";
 
@@ -22,14 +24,24 @@ const HeaderBack: FC<PropsWithChildren<HeaderBackProps>> = ({title = '', childre
     const iconClassName2 = clsx({
         [styles.iconfontIcon2]: true,
     },'iconfont icon-company_nav_icon_home');
+
+    const router:any = useRouter()
+    const goPage = (path = '') => {
+        if (path) {
+            router.replace('/')
+            return
+        }
+        router.back()
+    }
+
     return (
         <div className={styles.headerBack}>
-            <div className={styles.left}>
+            <div className={styles.left} onClick={() => goPage()}>
                 <span className={iconClassName1}></span>
             </div>
             {title && <span className={styles.title}>{title}</span>}
             {children}
-            <span className={styles.right}>
+            <span className={styles.right} onClick={() => goPage('home')}>
                 <span className={iconClassName2}></span>
             </span>
         </div>