浏览代码

fix: merge

ansoni 2 月之前
父节点
当前提交
3514a4f4c8
共有 2 个文件被更改,包括 49 次插入20 次删除
  1. 21 10
      .env.local
  2. 28 10
      src/app/[locale]/(TabBar)/promo/layout.tsx

+ 21 - 10
.env.local

@@ -1,13 +1,24 @@
+# 环境
 #baseurl
-NEXT_PUBLIC_BASE_URL=https://hk-api.tiktokjakjkl.icu
+# NEXT_PUBLIC_BASE_URL=http://192.168.0.71:8800
+NEXT_PUBLIC_BASE_URL=http://192.168.0.84:8800
+# NEXT_PUBLIC_BASE_URL=https://3rd-api.tiktokjakjkl.icu
 #share link
-NEXT_PUBLIC_SHARE_URL=https://hk-site.tiktokjakjkl.icu
+NEXT_PUBLIC_SHARE_URL=http://192.168.0.84:3000
+
 #firebase
-NEXT_PUBLIC_FIREBASE_APIKEY=AIzaSyCIE8xtySsYztsSgmQJx_aqPrrpHEuvgvw
-NEXT_PUBLIC_FIREBASE_AUTHDOMAIN=bcwin777-1bdda.firebaseapp.com
-NEXT_PUBLIC_FIREBASE_PROJECTID=bcwin777-1bdda
-NEXT_PUBLIC_FIREBASE_STORAGEBUCKET=bcwin777-1bdda.firebasestorage.app
-NEXT_PUBLIC_FIREBASE_MESSAGINGSENDERID=542456379513
-NEXT_PUBLIC_FIREBASE_APPID=1:542456379513:web:851a46fc639085170bfca8
-NEXT_PUBLIC_FIREBASE_MEASUREMENTID=G-GV6Y8DXHHD
-NEXT_PUBLIC_FIREBASE_KEYS=BOCfpA08vK6uxhMdRblnx9gPVBLx9WpTn9AutVNhHQQpVtXzDIKW0X6cmsNRaFDhyFDJfMqWjqC7mq6uDFIKU_M
+NEXT_PUBLIC_FIREBASE_APIKEY=AIzaSyDAWORGKhdyzb5KeqTi535VmD5gN2Cdle8
+NEXT_PUBLIC_FIREBASE_AUTHDOMAIN=bcwin-a99b1.firebaseapp.com
+
+
+
+
+NEXT_PUBLIC_FIREBASE_PROJECTID=bcwin-a99b1
+NEXT_PUBLIC_FIREBASE_STORAGEBUCKET=bcwin-a99b1.appspot.com
+NEXT_PUBLIC_FIREBASE_MESSAGINGSENDERID=1055413612814
+NEXT_PUBLIC_FIREBASE_APPID=1:1055413612814:web:7a563237de8e43849d275f
+
+
+
+NEXT_PUBLIC_FIREBASE_MEASUREMENTID=G-467M2BYJMS
+NEXT_PUBLIC_FIREBASE_KEYS=BAOsT7kii-ctLzGrgXe_wYhfuxlme1v4njnD0uPSKp3DpSnrUa2e709b9dRaeYVU7jF_qIx1y9tEv0CvilDCdnM

+ 28 - 10
src/app/[locale]/(TabBar)/promo/layout.tsx

@@ -1,23 +1,41 @@
+"use client";
 import HeaderBack from "@/components/HeaderBack";
-import { getTranslations } from "next-intl/server";
-import { ReactNode, Suspense } from "react";
+import { useRouter } from "@/i18n/routing";
+import { useTranslations } from "next-intl";
+import { ReactNode } from "react";
 
-export default async function Layout({
+export default function Layout({
     children,
     params: { locale },
 }: {
     children: ReactNode;
     params: { locale: string };
 }) {
-    const t = await getTranslations("Sidebar");
+    const t = useTranslations("Sidebar");
+    const router = useRouter();
+
+    const goRecord = () => {
+        router.push({
+            pathname: "/promo/record",
+        });
+    };
+
     return (
         <>
-            <HeaderBack useBg={true} showBack={true} title={t("promocoes")} />
-            <main className={"main-header"}>
-              <Suspense fallback={<div></div>}>
-                {children}
-              </Suspense>
-            </main>
+            <HeaderBack
+                useBg={true}
+                showBack={true}
+                title={t("promocoes")}
+                // Right={() => (
+                //     <div
+                //         onClick={goRecord}
+                //         className="whitespace-nowrap text-[.12rem] text-[#00eaff]"
+                //     >
+                //         Recorde de prêmios
+                //     </div>
+                // )}
+            />
+            <main className={"main-header"}>{children}</main>
         </>
     );
 }