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 1/2] =?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");
               }}

From 239ddd82e3057c15304478b744778d7f6696b065 Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Tue, 13 Aug 2024 12:34:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/globals.css                     | 13 +++++++++++--
 app/layout.js                       |  2 +-
 app/my/setting/editPassword/page.js |  8 +++-----
 app/space/page.js                   |  4 ++--
 components/Photos/index.js          | 13 ++++++++++++-
 utils/tools/handleFuns.js           |  4 ++--
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/globals.css b/app/globals.css
index fbe3fb7..102cd03 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -283,9 +283,13 @@ footer{
   width: max-content;
   border-radius: 0.25rem;
 } */
+.mediaDom .adm-image-viewer-slides-inner{
+  padding-top: 68px;
+}
 .mediaDom .adm-image-viewer-slide{
-  /* max-height: 90vh; */
-  max-width: 100vw;
+  max-height: calc(100vh - 100px);
+  width: 100vw;
+
 }
 .photos-body img{
   /* max-height: 90vh; */
@@ -303,8 +307,13 @@ footer{
   border-radius: 0.25rem;
 }
 
+.photos-bodyBox-full{
+  width: 100vw;
+  max-height: calc(100vh);
+}
 .photos-bodyBox{
   width: 100vw;
+  max-height: calc(100vh - 120px);
 }
 
 .adm-checkbox.adm-checkbox-checked .adm-checkbox-icon {
diff --git a/app/layout.js b/app/layout.js
index 907ab8a..e505cc1 100644
--- a/app/layout.js
+++ b/app/layout.js
@@ -84,7 +84,7 @@ export default function RootLayout({ children }) {
         <meta name="apple-mobile-web-app-capable" content="yes" />
         {/* <!-- 用来定义顶部状态栏的形式默认是default为白色 black为黑色 black-translucent为灰色半透明（会占据屏幕的约20px，不同的设备可能会有差异）--> */}
         {/* <!-- 在定义了apple-mobile-web-app-capable的前提下，设置状态栏的属性值apple-mobile-web-app-status-bar-style才有效； --> */}
-        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
         {/* <!-- apple-touch-startup-image用来配置启动动画 --> */}
         {/* <!-- 这里要注意，这里图片的尺寸要和设备的静态图片显示尺寸完全对应，差一个像素都会导致启动动画无法显示 --> */}
         {/* <!-- 下面列举了iPhone的所有尺寸（ps:为了方便大家就全部贴出来了！！） --> */}
diff --git a/app/my/setting/editPassword/page.js b/app/my/setting/editPassword/page.js
index ffa96a6..ae332a7 100644
--- a/app/my/setting/editPassword/page.js
+++ b/app/my/setting/editPassword/page.js
@@ -135,13 +135,11 @@ export default function EditPassword() {
       }
       Toast.show({
         icon: "success",
-        content: "修改成功，请重新登录",
+        content: searchParams.get("is_enabled") == "0"?"密码设置成功":"密码修改成功",
         position: "top",
       });
       if(searchParams.get("is_enabled") == "0"){
         router.push("/")
-      }else{
-        router.push("/login");signOut()
       }
     } catch (error) {
       console.error(error);
@@ -273,9 +271,9 @@ export default function EditPassword() {
       {searchParams.get("is_enabled") == "0" && (
         <div
           onClick={() => router.push(`/`)}
-          className="fixed bottom-6 w-full text-[#FF669E] text-xs text-center"
+          className="mt-4 w-full text-[#FFFFFF80] text-xs text-center"
         >
-          跳过，稍后设置
+          跳过
         </div>
       )}
     </div>
diff --git a/app/space/page.js b/app/space/page.js
index d7c167f..ecbd9f4 100644
--- a/app/space/page.js
+++ b/app/space/page.js
@@ -225,8 +225,8 @@ export default function Space() {
                     </div>
                   ) : (
                     <div
-                      className={`flex flex-col items-center justify-center h-screen`}
-                      // style={{ height: `${scrollHeight}px` }}
+                      className={`flex flex-col items-center justify-center`}
+                      style={{ height: `calc(100vh - 120px)` }}
                     >
                       <Empty type="nospace" />
                       <div className="flex flex-col mt-6">
diff --git a/components/Photos/index.js b/components/Photos/index.js
index cc39ede..85db502 100644
--- a/components/Photos/index.js
+++ b/components/Photos/index.js
@@ -71,6 +71,15 @@ export default function Photos({
       setCurrentPhotos(newPhotos);
     }
   }, [media]);
+  useEffect(()=>{
+    // window.addEventListener('resize', (e)=>{
+    //   // alert(window.innerHeight)
+    //   setMaskHeight(window.innerHeight)
+    // });
+    return ()=>{
+      // window.removeEventListener("resize")
+    }
+  },[])
   const showPhotos = (photos, index) => {
     currentIndex.current = index;
     const interval = setInterval(() => {
@@ -135,6 +144,7 @@ export default function Photos({
       photos[index]?.type == "hid" ? "mediaDom photos-body" : "mediaDom"
     }`;
     // mediaDom.appendChild(btns);
+    document.body.style.overflow = 'hidden';
     ImageViewer.clear();
     ImageViewer.Multi.show({
       images: photos.map((item) => item?.url),
@@ -167,6 +177,7 @@ export default function Photos({
       afterClose: () => {
         mediaDom.remove();
         clearInterval(interval);
+        document.body.style.overflow = 'auto';
       },
       classNames: { body: "photos-bodyBox" },
     });
@@ -289,7 +300,7 @@ export default function Photos({
                 photos.length > 9 &&
                 (!seeAllPhotos ? (
                   <div
-                    className="absolute top-0  h-full flex justify-center items-center bg-[#33333348]"
+                    className="absolute top-0 w-full h-full flex justify-center items-center bg-[#33333348]"
                     onClick={handleSeeAllPhotos}
                   >
                     <span className="text-2xl">+{currentPhotos.length}</span>
diff --git a/utils/tools/handleFuns.js b/utils/tools/handleFuns.js
index 76f3f7b..0e020d1 100644
--- a/utils/tools/handleFuns.js
+++ b/utils/tools/handleFuns.js
@@ -66,7 +66,7 @@ export const handleShowVideo = (video) => {
               <FontAwesomeIcon icon={faClose} size="2xl" />
             </div>
           </div>
-          <div className="my-4 pointer-events-auto">
+          <div className="my-2 pointer-events-auto">
             {/* <video
             width="100%"
             height="100%"
@@ -85,7 +85,7 @@ export const handleShowVideo = (video) => {
               poster={video?.url.src}
               blurDataURL={video?.url.blurDataURL}
               autoPlay={true}
-              style={{ height: "calc(100vh - 250px)" }}
+              style={{ height: "calc(100vh - 180px)" }}
             />
             {/* <Player
             src="https://www.mydomain.com/remote-video.mp4"