ホーム エクスプローラ ヘルプ
登録 サインイン
lion
/
site_8g
1
0
フォーク 0
ファイル 課題 0 プルリクエスト 0 Wiki
ソースを参照

Merge remote-tracking branch 'origin/dev' into dev

Before 1 年間 前
親
20071e1af9 fcdb252d2a
コミット
292b04f3d2
7 ファイル変更、30 行追加、36 行削除
分割表示 差分情報を表示
  1. 3 3
      src/app/[locale]/(ordinary)/profile/page.tsx
  2. 17 13
      src/app/[locale]/layout.tsx
  3. 2 1
      src/app/[locale]/login/page.tsx
  4. 1 2
      src/app/[locale]/register/page.tsx
  5. 6 4
      src/app/[locale]/resetPhone/page.tsx
  6. 0 7
      src/app/[locale]/verification/page.scss
  7. 1 6
      src/app/[locale]/verification/page.tsx

+ 3 - 3
src/app/[locale]/(ordinary)/profile/page.tsx
ファイルの表示 

@@ -24,14 +24,14 @@ const Profile: FC<Props> = () => {
 
     };
 
 
     let [money, setMoney] = useState({
 
-        deposit: 0,
 
+        Score: 0,
 
         point: 0,
 
     });
 
     const userMoneyRequest = async () => {
 
         getUserMoneyApi().then((res) => {
 
             res.code == 200 &&
 
                 setMoney({
 
-                    deposit: res.data?.deposit || 0.0,
 
+                    Score: res.data?.Score || 0.0,
 
                     point: res.data?.point || 0.0
 
                 });
 
         });
 
@@ -92,7 +92,7 @@ const Profile: FC<Props> = () => {
 
                                 <span>{t("Saldo")}</span>
 
                                 <div className="num">
 
                                     <span className="uppercase">brl </span>
 
-                                    <span>{money.deposit || 0.0}</span>
 
+                                    <span>{money.Score || 0.0}</span>
 
                                 </div>
 
                             </div>
 
                         </div>

+ 17 - 13
src/app/[locale]/layout.tsx
ファイルの表示 

@@ -4,7 +4,6 @@ import { NextIntlClientProvider } from "next-intl";
 
 import { getMessages } from "next-intl/server";
 
 import { Inter as FontSans } from "next/font/google";
 
 import { ReactNode } from "react";
 
-import Head from "next/head";
 
 import "../globals.css";
 
 
 import PageTransitionEffect from "@/components/PageTransitionEffect";
 
@@ -21,6 +20,23 @@ export const viewport: Viewport = {
 
         { media: "(prefers-color-scheme: dark)", color: "black" },
 
     ],
 
 };
 
+
 
+export const metadata = {
 
+    keywords: ["Next.js"],
 
+    description: ["Next.js"],
 
+    appleWebApp: {
 
+        statusBarStyle: "black",
 
+    },
 
+    formatDetection: {
 
+        email: false,
 
+        address: false,
 
+        telephone: false,
 
+    },
 
+    other: {
 
+        viewport: ["width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover"],
 
+    },
 
+}
 
+
 
 export default async function LocaleLayout({
 
     children,
 
     params: { locale },
 
@@ -32,18 +48,6 @@ export default async function LocaleLayout({
 
 
     return (
 
         <html lang={locale} suppressHydrationWarning>
 
-            <Head>
 
-                <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-                <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover" />
 
-                <meta name="keywords" content=""/>
 
-                <meta name="description" content=""/>
 
-                <meta http-equiv="Cache-control" content="no-cache, no-store, must-revalidate"/>
 
-                <meta http-equiv="Pragma" content="no-cache"/>
 
-                <meta http-equiv="Expires" content="0"/>
 
-                <meta name="apple-mobile-web-app-status-bar-style" content="black" />
 
-                <meta name="format-detection" content="telphone=no, email=no" />
 
-                <meta name="viewport" content="viewport-fil=cover" />
 
-            </Head>
 
             <body className={clsx("font-sans", fontSans.variable)}>
 
                 <Providers themeProps={{ defaultTheme: "dark", attribute: "class" }}>
 
                     <NextIntlClientProvider messages={messages}>

+ 2 - 1
src/app/[locale]/login/page.tsx
ファイルの表示 

@@ -43,10 +43,11 @@ const Login: FC<Props> = () => {
 
                     setTimeout(() => {
 
                         router.replace("/" + redirect);
 
                     }, 1000);
 
+                    setMsgError(res.msg || "");
 
                 }
 
             });
 
+            setMsgError(res.msg || "");
 
         }
 
-        setMsgError(res.msg || "");
 
     };
 
 
     return (

+ 1 - 2
src/app/[locale]/register/page.tsx
ファイルの表示 

@@ -26,8 +26,7 @@ const Register: FC<Props> = () => {
 
             setTimeout(() => {
 
                 router.replace("/login");
 
             }, 1000);
 
-        } else {
 
-            setMsgError(msg);
 
+            setMsgError(msg || "");
 
         }
 
     };
 
     return (

+ 6 - 4
src/app/[locale]/resetPhone/page.tsx
ファイルの表示 

@@ -34,11 +34,13 @@ const ResetPhone: FC<Props> = () => {
 
     const checkUserPhoneRequest = async () => {
 
         if (!phoneRegex(userPhone)) return;
 
         let { code, msg, data } = await getCheckUserPhoneExistApi({ user_phone: userPhone });
 
-        if (code == 200 && data) {
 
-            router.push(`/verification?userPhone=${userPhone}`);
 
-            return;
 
+        if (code == 200) {
 
+            if(data) {
 
+                router.push(`/verification?userPhone=${userPhone}`);
 
+                return;
 
+            }
 
+            setMsgError(msg);
 
         }
 
-        setMsgError(msg);
 
     };
 
     return (
 
         <div className="resetPhone-box">

+ 0 - 7
src/app/[locale]/verification/page.scss
ファイルの表示 

@@ -69,13 +69,6 @@
 
       }
 
     }
 
 
-    .tips {
 
-      width: 100%;
 
-      color: #e53535;
 
-      font-size: 0.12rem;
 
-      margin-top: .02rem;
 
-    }
 
-
 
     .btnContent {
 
       margin: .29rem 0 .19rem;
 
     }

+ 1 - 6
src/app/[locale]/verification/page.tsx
ファイルの表示 

@@ -21,16 +21,13 @@ const ResetPhone: FC<Props> = () => {
 
 
     let searchParams = useSearchParams();
 
     let user_phone = searchParams.get("userPhone");
 
-    let [msgError, setMsgError] = useState("");
 
     const sendCodeRequest = () => {
 
         if (!user_phone) return;
 
         getSendCodeApi({ user_phone }).then((res) => {
 
             if (res.code == 200) {
 
                 setTime(60);
 
                 setIsNote(true);
 
-                return;
 
             }
 
-            setMsgError(res.msg);
 
         });
 
     };
 
     useEffect(() => {
 
@@ -82,11 +79,9 @@ const ResetPhone: FC<Props> = () => {
 
                         maxLength={6}
 
                     />
 
                     <span className="after" onClick={sendCodeFun}>
 
-                        {" "}
 
-                        {isNote ? `${time}s` : t("Envie")}{" "}
 
+                        {isNote ? `${time}s` : t("Envie")}
 
                     </span>
 
                 </div>
 
-                {msgError && <div className="tips"> {msgError} </div>}
 
                 <div className="btnContent">
 
                     <ButtonOwn active={code.length == 6} callbackFun={goPage}>
 
                         {t("Completar")}