From 719dbaf84038c4ec07f929e47a746ec965e77d11 Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Wed, 27 Nov 2024 17:27:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E6=A5=9A=E6=97=A0=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../selectUserProfileItem/page.js             |  3 -
 app/my/page.js                                | 73 ++++++++++---------
 app/my/setting/aboutUs/page.js                |  3 -
 .../joinEntrance/page.jsx                     |  2 +-
 .../streamerVerification/joinGuild/page.jsx   |  5 +-
 .../joinStreamer/page.jsx                     |  2 +-
 app/profile/[mid]/page.js                     |  3 -
 7 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/app/my/editUserProfile/selectUserProfileItem/page.js b/app/my/editUserProfile/selectUserProfileItem/page.js
index 95d2c5a..52326a8 100644
--- a/app/my/editUserProfile/selectUserProfileItem/page.js
+++ b/app/my/editUserProfile/selectUserProfileItem/page.js
@@ -107,9 +107,6 @@ export default function SelectUserProfileItem() {
               style={{ maxWidth: "12px" }}
               size="xl"
               className=" ml-2"
-              onClick={() => {
-                router.push("my/editUserProfile/editUserName");
-              }}
             />
           </div>
         </div>
diff --git a/app/my/page.js b/app/my/page.js
index 8d1b1d9..7310f85 100644
--- a/app/my/page.js
+++ b/app/my/page.js
@@ -150,6 +150,11 @@ const My = () => {
           iconUrl: "icons/32DP/wechat.png",
           title: "已解锁微信",
         },
+        {
+          url: `my/streamerVerification/joinEntrance`,
+          iconUrl: "icons/32DP/join.png",
+          title: "申请入驻",
+        },
         {
           url: `/messageDetail`,
           iconUrl: "icons/32DP/contact.png",
@@ -161,38 +166,38 @@ const My = () => {
           title: "添加到主屏幕",
         },
       ];
-      if (
-        (account.data.account.role != 3 && !isInJoinProgress) ||
-        statuses.data.details_status === 2
-      ) {
-        currentOld = [
-          {
-            url: `my/wallet`,
-            iconUrl: "icons/32DP/wallet.png",
-            title: "我的钱包",
-          },
-          {
-            url: `my/unlockedWechat`,
-            iconUrl: "icons/32DP/wechat.png",
-            title: "已解锁微信",
-          },
-          {
-            url: `my/streamerVerification/joinEntrance`,
-            iconUrl: "icons/32DP/join.png",
-            title: "申请入驻",
-          },
-          {
-            url: `/messageDetail`,
-            iconUrl: "icons/32DP/contact.png",
-            title: "联系客服",
-          },
-          {
-            url: `/my/addToHome`,
-            iconUrl: "icons/32DP/toScreen.png",
-            title: "添加到主屏幕",
-          },
-        ];
-      }
+      // if (
+      //   (account.data.account.role != 3 && !isInJoinProgress) ||
+      //   statuses.data.details_status === 2
+      // ) {
+      //   currentOld = [
+      //     {
+      //       url: `my/wallet`,
+      //       iconUrl: "icons/32DP/wallet.png",
+      //       title: "我的钱包",
+      //     },
+      //     {
+      //       url: `my/unlockedWechat`,
+      //       iconUrl: "icons/32DP/wechat.png",
+      //       title: "已解锁微信",
+      //     },
+      //     {
+      //       url: `my/streamerVerification/joinEntrance`,
+      //       iconUrl: "icons/32DP/join.png",
+      //       title: "申请入驻",
+      //     },
+      //     {
+      //       url: `/messageDetail`,
+      //       iconUrl: "icons/32DP/contact.png",
+      //       title: "联系客服",
+      //     },
+      //     {
+      //       url: `/my/addToHome`,
+      //       iconUrl: "icons/32DP/toScreen.png",
+      //       title: "添加到主屏幕",
+      //     },
+      //   ];
+      // }
       return currentOld;
     });
     setUserInfo({ ...data.data, ...account.data.account, ...streamer.data });
@@ -347,10 +352,6 @@ const My = () => {
             style={{ maxWidth: "12px" }}
             size="xl"
             className="h-6 mr-2"
-            onClick={() => {
-              // searchParams.append();
-              // router.back();
-            }}
           />
         </div>
       ) : (
diff --git a/app/my/setting/aboutUs/page.js b/app/my/setting/aboutUs/page.js
index 516747d..b425522 100644
--- a/app/my/setting/aboutUs/page.js
+++ b/app/my/setting/aboutUs/page.js
@@ -82,9 +82,6 @@ export default function AboutUs() {
                 style={{ maxWidth: "12px" }}
                 size="sm"
                 className="h-4 text-gray-300"
-                onClick={() => {
-                  router.back();
-                }}
               />
             </li>
           </ul>
diff --git a/app/my/streamerVerification/joinEntrance/page.jsx b/app/my/streamerVerification/joinEntrance/page.jsx
index e0f2c2e..489e121 100644
--- a/app/my/streamerVerification/joinEntrance/page.jsx
+++ b/app/my/streamerVerification/joinEntrance/page.jsx
@@ -58,7 +58,7 @@ export default function JoinEntrance() {
       </div>
       {/* 内容 */}
       <div className="h-screen relative">
-        <div className="absolute inset-x-0 bottom-24 top-24 px-12 flex flex-col items-center justify-center gap-12">
+        <div className="absolute inset-x-0 bottom-24 top-24 flex flex-col items-center justify-center gap-12">
           <Button
             size="middle"
             shape="rounded"
diff --git a/app/my/streamerVerification/joinGuild/page.jsx b/app/my/streamerVerification/joinGuild/page.jsx
index d399120..d94d6b2 100644
--- a/app/my/streamerVerification/joinGuild/page.jsx
+++ b/app/my/streamerVerification/joinGuild/page.jsx
@@ -101,7 +101,7 @@ export default function JoinGuild() {
         <p></p>
       </div>
       {/* 内容 */}
-      <div className="pt-16 p-4">
+      <div className="pt-16 p-4 mt-2">
         <div className="flex justify-between items-center">
           <p className="text-sm">
             <span>审核资料（仅用于审核，不对外展示）</span>
@@ -132,9 +132,6 @@ export default function JoinGuild() {
               <span>联络人</span>
               <span className="text-[#f00]">*</span>
             </p>
-            <p className="text-[#ffffffae] text-xs">
-              （若有多个，按粉丝从多到少排序）
-            </p>
           </div>
           <div className="mt-2 px-4 py-3 h-12 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center">
             <OwnInput
diff --git a/app/my/streamerVerification/joinStreamer/page.jsx b/app/my/streamerVerification/joinStreamer/page.jsx
index fbb0f25..bb4edc9 100644
--- a/app/my/streamerVerification/joinStreamer/page.jsx
+++ b/app/my/streamerVerification/joinStreamer/page.jsx
@@ -110,7 +110,7 @@ export default function JoinStreamer() {
         </p>
       </div>
       {/* 内容 */}
-      <div className="pt-16 p-4">
+      <div className="pt-16 p-4 mt-2">
         <div className="flex justify-between items-center">
           <p className="text-sm">
             <span>审核资料（仅用于审核，不对外展示）</span>
diff --git a/app/profile/[mid]/page.js b/app/profile/[mid]/page.js
index 1994224..d589345 100644
--- a/app/profile/[mid]/page.js
+++ b/app/profile/[mid]/page.js
@@ -422,9 +422,6 @@ export default function PersonSpace() {
                         size="xl"
                         style={{ maxWidth: "12px" }}
                         className="h-4"
-                        onClick={() => {
-                          router.back();
-                        }}
                       />
                     </div>
                   </div>