From 5728611c3868fcae37b4366ac3c56e2e1abf64a4 Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Tue, 13 Aug 2024 11:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9router=E8=A1=8C=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/bill/layout.jsx            | 10 ++++---
 app/my/addToHome/page.js       | 49 ++++++++++++++++++++++++----------
 app/my/unlockedWechat/page.jsx | 13 ++++++---
 app/my/wallet/page.js          |  7 -----
 4 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/app/bill/layout.jsx b/app/bill/layout.jsx
index 36e46ab..7fefe14 100644
--- a/app/bill/layout.jsx
+++ b/app/bill/layout.jsx
@@ -21,8 +21,6 @@ export default function BillLayout({ children }) {
             icon={faAngleLeft}
             size="xl"
             onClick={() => {
-              pathname.split("/").length < 4?
-              router.push("/my/wallet"):
               router.back();
             }}
           />
@@ -42,6 +40,7 @@ export default function BillLayout({ children }) {
                   : "text-[#FFFFFF80]"
               }`}
               href="recharge"
+              replace
             >
               充值
             </Link>
@@ -52,6 +51,7 @@ export default function BillLayout({ children }) {
                   : "text-[#FFFFFF80]"
               }`}
               href="cost"
+              replace
             >
               消费
             </Link>
@@ -62,6 +62,7 @@ export default function BillLayout({ children }) {
                   : "text-[#FFFFFF80]"
               }`}
               href="income"
+              replace
             >
               收益
             </Link>
@@ -72,6 +73,7 @@ export default function BillLayout({ children }) {
                   : "text-[#FFFFFF80]"
               }`}
               href="withdrawal"
+              replace
             >
               提现
             </Link>
@@ -80,7 +82,9 @@ export default function BillLayout({ children }) {
         </div>
       )}
 
-      {pathname.split("/").length >3 && <div className="mt-14 px-4 flex flex-1">{children}</div>}
+      {pathname.split("/").length > 3 && (
+        <div className="mt-14 px-4 flex flex-1">{children}</div>
+      )}
     </section>
   );
 }
diff --git a/app/my/addToHome/page.js b/app/my/addToHome/page.js
index 753df8c..003ec70 100644
--- a/app/my/addToHome/page.js
+++ b/app/my/addToHome/page.js
@@ -15,40 +15,61 @@ export default function AddToHome() {
             icon={faAngleLeft}
             size="xl"
             onClick={() => {
-              router.push("/my");
+              router.back();
             }}
           />
         </div>
         <p className="text-base text-center leading-9">添加到主屏幕</p>
-      </div> 
+      </div>
       {/* 内容 */}
       <div className="p-4 mt-14">
         <div>
-          <p className="text-base font-bold">在浏览器中如何将铁粉空间添加到主屏幕</p>
-          <p className="text-xs text-[red]">注：请勿在当前页面点击[添加到主屏幕]</p>
-          <p className="text-xs my-2 text-[#ffffff69]">以IOS的“Safari”浏览器为例</p>
+          <p className="text-base font-bold">
+            在浏览器中如何将铁粉空间添加到主屏幕
+          </p>
+          <p className="text-xs text-[red]">
+            注：请勿在当前页面点击[添加到主屏幕]
+          </p>
+          <p className="text-xs my-2 text-[#ffffff69]">
+            以IOS的“Safari”浏览器为例
+          </p>
         </div>
         <div>
-          <p className="text-xs mt-4 mb-2">1.在浏览器中打开主界面，点击浏览器中的[分享]按钮。</p>
+          <p className="text-xs mt-4 mb-2">
+            1.在浏览器中打开主界面，点击浏览器中的[分享]按钮。
+          </p>
           <div className="flex justify-center">
-          <Image
-              src={process.env.NEXT_PUBLIC_WEB_ASSETS_URL+"/images/addToHome1.png"}
+            <Image
+              src={
+                process.env.NEXT_PUBLIC_WEB_ASSETS_URL +
+                "/images/addToHome1.png"
+              }
               placeholder=""
               className="w-[60%]"
             />
           </div>
-          <p className="text-xs mt-4 mb-2">2.打开分享弹框后，点击[添加到主屏幕]。</p>
+          <p className="text-xs mt-4 mb-2">
+            2.打开分享弹框后，点击[添加到主屏幕]。
+          </p>
           <div className="flex justify-center">
-          <Image
-              src={process.env.NEXT_PUBLIC_WEB_ASSETS_URL+"/images/addToHome2.png"}
+            <Image
+              src={
+                process.env.NEXT_PUBLIC_WEB_ASSETS_URL +
+                "/images/addToHome2.png"
+              }
               placeholder=""
               className="w-[60%]"
             />
           </div>
-          <p className="text-xs mt-4 mb-2">3.打开添加到主屏幕弹框后，点击[添加]按钮即可成功添加到主屏幕。</p>
+          <p className="text-xs mt-4 mb-2">
+            3.打开添加到主屏幕弹框后，点击[添加]按钮即可成功添加到主屏幕。
+          </p>
           <div className="flex justify-center">
-          <Image
-              src={process.env.NEXT_PUBLIC_WEB_ASSETS_URL+"/images/addToHome3.png"}
+            <Image
+              src={
+                process.env.NEXT_PUBLIC_WEB_ASSETS_URL +
+                "/images/addToHome3.png"
+              }
               placeholder=""
               className="w-[60%]"
             />
diff --git a/app/my/unlockedWechat/page.jsx b/app/my/unlockedWechat/page.jsx
index 7a1d56a..1a9799a 100644
--- a/app/my/unlockedWechat/page.jsx
+++ b/app/my/unlockedWechat/page.jsx
@@ -67,8 +67,14 @@ export default function UnlockedWechat() {
         <ul className="p-4 overflow-y-auto scrollbarBox_hidden">
           {data.map((item, index) => (
             <li key={item.id + "_" + index}>
-              <div className="grid gap-2 items-center" style={{gridTemplateColumns:"calc(100% - 90px) 90px"}}>
-                <div className="grid w-full "  style={{gridTemplateColumns:"3rem calc(100% - 3rem)"}}>
+              <div
+                className="grid gap-2 items-center"
+                style={{ gridTemplateColumns: "calc(100% - 90px) 90px" }}
+              >
+                <div
+                  className="grid w-full "
+                  style={{ gridTemplateColumns: "3rem calc(100% - 3rem)" }}
+                >
                   <Avatar
                     className="w-12 h-12 rounded-full"
                     src={item.account?.avatar?.images[0]?.urls[0]}
@@ -115,8 +121,7 @@ export default function UnlockedWechat() {
         avatar={currentStreamer.current?.account?.avatar?.images[0]?.urls[0]}
         streamerData={{
           streamer_ext: {
-            wechat_lock_type:
-              currentStreamer.current?.lock_type,
+            wechat_lock_type: currentStreamer.current?.lock_type,
           },
         }}
       />
diff --git a/app/my/wallet/page.js b/app/my/wallet/page.js
index 60190ce..33b26cd 100644
--- a/app/my/wallet/page.js
+++ b/app/my/wallet/page.js
@@ -134,13 +134,6 @@ export default function Wallet() {
               <FontAwesomeIcon icon={faAngleRight} size="xl" />
             </div>
             <div
-              // onClick={() =>
-              //   navigation.navigate("WebWithHeader", {
-              //     title: "收支明细",
-              //     uri: process.env.EXPO_PUBLIC_WEB_URL + "/bill/recharge",
-              //   })
-              // }
-
               onClick={() => {
                 router.push("/bill/recharge");
               }}