Merge remote-tracking branch 'refs/remotes/origin/dev' into feature-Before

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

@@ -30,8 +30,8 @@ const Profile: FC<Props> = () => {
         getUserMoneyApi().then((res) => {
             res.code == 200 &&
                 setMoney({
-                    deposit: res.data.deposit,
-                    point: res.data.point,
+                    deposit: res.data?.deposit || 0.0,
+                    point: res.data?.point || 0.0
                 });
         });
     };
@@ -41,7 +41,7 @@ const Profile: FC<Props> = () => {
             userMoneyRequest();
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    }, [token]);
 
     const router = useRouter();
     const goPage = (path = "/") => {

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

@@ -12,6 +12,8 @@
     box-sizing: border-box;
     .title {
       font-size: .18rem;
+      text-align: center;
+      margin-bottom: .4rem;
       h2 {
         color: #fcde26;
         line-height: .22rem;

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

@@ -88,7 +88,7 @@ const ResetPhone: FC<Props> = () => {
             <HeaderBack />
             <div className="main">
                 <div className="title">
-                    {/* <h2>修改密码</h2> */}
+                    <h2>Mudar a Contrasinha</h2>
                     {/* <div>修改密码 {user_phone}</div> */}
                 </div>
                 <div className="phoneInput">
@@ -98,7 +98,7 @@ const ResetPhone: FC<Props> = () => {
                         value={fromParam.pwd}
                         onChange={setInputVal}
                         onInput={verifyPwd}
-                        placeholder="请输入新密码"
+                        placeholder="Por favor, introduz uma nova senha"
                         maxLength={12}
                     />
                 </div>
@@ -108,7 +108,7 @@ const ResetPhone: FC<Props> = () => {
                         type="password"
                         value={fromParam.againPwd}
                         onChange={setInputVal}
-                        placeholder="请再次输入新密码"
+                        placeholder="Por favor, introduz a nova senha novamente"
                         maxLength={12}
                     />
                 </div>