From 7b1916b6206afc307deb95e05eb6fcc01e7f2b2f Mon Sep 17 00:00:00 2001 From: yezian Date: Tue, 25 Jun 2024 20:39:04 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=9B=B4=E6=8D=A2dialog=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=B8=BAModal=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/[user_id]/_components/WechatBar/index.jsx | 52 ++++++++--------- app/layout.jsx | 5 +- app/purchased/page.jsx | 53 +++++++----------- app/zone/[user_id]/page.jsx | 56 +++++++------------ 4 files changed, 67 insertions(+), 99 deletions(-) diff --git a/app/[user_id]/_components/WechatBar/index.jsx b/app/[user_id]/_components/WechatBar/index.jsx index 64d4791..cda8682 100644 --- a/app/[user_id]/_components/WechatBar/index.jsx +++ b/app/[user_id]/_components/WechatBar/index.jsx @@ -5,7 +5,7 @@ import React, { useState } from "react"; import { useRouter } from "next/navigation"; import baseRequest from "@/utils/baseRequest"; import { generateSignature } from "@/utils/crypto"; -import { Toast } from "antd-mobile"; +import { Toast, Modal } from "antd-mobile"; import { checkAuth } from "@/utils/auth"; export default function WechatBar({ @@ -111,7 +111,29 @@ export default function WechatBar({ >
document.getElementById("comfirm_modal").showModal()} + onClick={() => + Modal.alert({ + showCloseButton: true, + confirmText: "立即购买", + onConfirm: () => handlePurchase("alipay_h5"), + content: ( +
+

+ 购买成功后请到"账号"-"已购"添加Ta的微信，若超72小时未添加成功请联系客服 +

+

+ 确认购买即视为同意 + + 《用户充值协议》 + +

+
+ ), + }) + } >
- -
-

- 购买成功后请到"账号"-"已购"添加Ta的微信，若超72小时未添加成功请联系客服 -

-

- 确认购买即视为同意 - - 《用户充值协议》 - -

-
- -
- -
-
-
- ); } diff --git a/app/layout.jsx b/app/layout.jsx index 62b5bb7..98f1b4c 100644 --- a/app/layout.jsx +++ b/app/layout.jsx @@ -31,7 +31,10 @@ export default function RootLayout({ children }) { className="bg-[#07050A]" data-prefers-color-scheme="dark" > - +
{children}
diff --git a/app/purchased/page.jsx b/app/purchased/page.jsx index a7c76b7..4782427 100644 --- a/app/purchased/page.jsx +++ b/app/purchased/page.jsx @@ -1,7 +1,7 @@ "use client"; import React, { useState, useEffect } from "react"; import AuthBar from "@/components/AuthBar"; -import { Toast } from "antd-mobile"; +import { Toast, Modal } from "antd-mobile"; import { checkAuth } from "@/utils/auth"; import { useRouter } from "next/navigation"; import baseRequest from "@/utils/baseRequest"; @@ -105,7 +105,24 @@ export default function Purchased() { const handleClick = async () => { await getWechat(item?.account.mid); setTimeout( - () => document.getElementById("get_wechat_modal").showModal(), + () => + Modal.alert({ + showCloseButton: true, + confirmText: "复制", + onConfirm: () => { + copy(currentWechat); + Toast.show({ + content: "复制成功", + }); + }, + content: ( +
+

+ Ta的微信号：{currentWechat} +

+
+ ), + }), 100 ); }; @@ -162,37 +179,6 @@ export default function Purchased() { ); }; - const GetWechatModal = () => { - const handleCopy = () => { - copy(currentWechat); - Toast.show({ - content: "复制成功", - }); - }; - return ( - -
-

- Ta的微信号：{currentWechat} -

-
-
- - -
-
-
- - ); - }; - const SubmitUserWechatItem = ({ item }) => { const [wechat, setWechat] = useState(""); const [remarks, setRemarks] = useState(""); @@ -341,7 +327,6 @@ export default function Purchased() { return ; } })} - ); } diff --git a/app/zone/[user_id]/page.jsx b/app/zone/[user_id]/page.jsx index 9288dc6..acbde76 100644 --- a/app/zone/[user_id]/page.jsx +++ b/app/zone/[user_id]/page.jsx @@ -1,15 +1,16 @@ "use client"; import React, { useState, useEffect } from "react"; -import { Toast } from "antd-mobile"; +import { Toast, Modal } from "antd-mobile"; import baseRequest from "@/utils/baseRequest"; import { generateSignature } from "@/utils/crypto"; import copy from "@/utils/copy"; import { setCookie } from "cookies-next"; -import Link from "next/link"; import InOtherApp from "@/components/InOtherApp"; +import { useRouter } from "next/navigation"; export default function Zone({ params }) { + const router = useRouter(); //页面数据 const [data, setData] = useState({}); useEffect(() => { @@ -46,12 +47,24 @@ export default function Zone({ params }) { getData(); }, []); - //将主播链接复制到剪贴板，并存cookie - const copyAndSetCookieInviter = () => { + //将主播链接复制到剪贴板，并存cookie，并打开modal + const showModal = () => { setCookie("inviter", data?.streamer_ext?.user_id); copy( `【${data?.streamer_ext?.name}】『ID：${data?.streamer_ext?.user_id}』，复制此条消息，打开铁粉空间APP，查看详情https://tiefen.fun/zone/${data?.streamer_ext?.user_id}` ); + Modal.alert({ + showCloseButton: true, + confirmText: "前往下载", + onConfirm: () => router.push("/"), + content: ( +
+

+ {`请打开或下载【铁粉空间】APP，根据APP内弹窗指引加入空间。如未弹出，请在APP搜索ID：${data?.streamer_ext?.user_id}，加入空间。`} +

+
+ ), + }); }; return ( @@ -143,10 +156,7 @@ export default function Zone({ params }) {
{ - copyAndSetCookieInviter(); - document.getElementById("comfirm_modal").showModal(); - }} + onClick={showModal} >
{ - copyAndSetCookieInviter(); - document.getElementById("comfirm_modal").showModal(); - }} + onClick={showModal} >
{ - copyAndSetCookieInviter(); - document.getElementById("comfirm_modal").showModal(); - }} + onClick={showModal} > 立即加入
@@ -206,26 +210,6 @@ export default function Zone({ params }) { 3、本平台不提供违法及色情内容，如您发现空间内存在以上内容，请联系人工客服举报处理。

- -
-

- {`请打开或下载【铁粉空间】APP，根据APP内弹窗指引加入空间。如未弹出，请在APP搜索ID：${data?.streamer_ext?.user_id}，加入空间。`} -

-
- -

确认

- -
- -
-
-
- ); } From a2e25cd973a2b98e888ffee167a3fd1eeb50ee8d Mon Sep 17 00:00:00 2001 From: yezian Date: Tue, 25 Jun 2024 20:53:34 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9modal=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/[user_id]/_components/WechatBar/index.jsx | 2 +- app/purchased/page.jsx | 2 +- app/zone/[user_id]/page.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/[user_id]/_components/WechatBar/index.jsx b/app/[user_id]/_components/WechatBar/index.jsx index cda8682..fd04b80 100644 --- a/app/[user_id]/_components/WechatBar/index.jsx +++ b/app/[user_id]/_components/WechatBar/index.jsx @@ -117,7 +117,7 @@ export default function WechatBar({ confirmText: "立即购买", onConfirm: () => handlePurchase("alipay_h5"), content: ( -
+

购买成功后请到"账号"-"已购"添加Ta的微信，若超72小时未添加成功请联系客服

diff --git a/app/purchased/page.jsx b/app/purchased/page.jsx index 4782427..0cf7e31 100644 --- a/app/purchased/page.jsx +++ b/app/purchased/page.jsx @@ -116,7 +116,7 @@ export default function Purchased() { }); }, content: ( -
+

Ta的微信号：{currentWechat}

diff --git a/app/zone/[user_id]/page.jsx b/app/zone/[user_id]/page.jsx index acbde76..f42e82f 100644 --- a/app/zone/[user_id]/page.jsx +++ b/app/zone/[user_id]/page.jsx @@ -58,7 +58,7 @@ export default function Zone({ params }) { confirmText: "前往下载", onConfirm: () => router.push("/"), content: ( -
+

{`请打开或下载【铁粉空间】APP，根据APP内弹窗指引加入空间。如未弹出，请在APP搜索ID：${data?.streamer_ext?.user_id}，加入空间。`}

From 6a2a635584d203d1130dfe34cfa7c942e5fcc802 Mon Sep 17 00:00:00 2001 From: jueweijue Date: Wed, 26 Jun 2024 08:58:15 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=9C=A8=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=8E=B7=E5=8F=96=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/purchased/page.jsx | 43 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/app/purchased/page.jsx b/app/purchased/page.jsx index 0cf7e31..5f5ee39 100644 --- a/app/purchased/page.jsx +++ b/app/purchased/page.jsx @@ -65,7 +65,6 @@ export default function Purchased() { getData(); }, []); - const [currentWechat, setCurrentWechat] = useState(""); const getWechat = async (streamerMid) => { // 获取微信 try { @@ -94,7 +93,7 @@ export default function Purchased() { }); return; } - setCurrentWechat(detailData.data.wechat_contact); + return detailData.data.wechat_contact; } catch (error) { console.error(error); } @@ -103,28 +102,24 @@ export default function Purchased() { const DirectGetWechatItem = ({ item }) => { //点击查看微信 const handleClick = async () => { - await getWechat(item?.account.mid); - setTimeout( - () => - Modal.alert({ - showCloseButton: true, - confirmText: "复制", - onConfirm: () => { - copy(currentWechat); - Toast.show({ - content: "复制成功", - }); - }, - content: ( -
-

- Ta的微信号：{currentWechat} -

-
- ), - }), - 100 - ); + const wechat = await getWechat(item?.account.mid); + Modal.alert({ + showCloseButton: true, + confirmText: "复制", + onConfirm: () => { + copy(wechat); + Toast.show({ + content: "复制成功", + }); + }, + content: ( +
+

+ Ta的微信号：{wechat} +

+
+ ), + }); }; //点击主播 From 6a507b39eecdffca97c3a4ee34bf34056b81dad1 Mon Sep 17 00:00:00 2001 From: jueweijue Date: Thu, 27 Jun 2024 03:16:33 +0800 Subject: [PATCH 04/17] =?UTF-8?q?ios=E6=9A=82=E6=97=B6=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/page.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/page.jsx b/app/page.jsx index 0599ba0..62953cc 100644 --- a/app/page.jsx +++ b/app/page.jsx @@ -4,6 +4,7 @@ import React, { useState, useEffect } from "react"; import InOtherApp from "@/components/InOtherApp"; import Footer from "@/components/Footer"; import Link from "next/link"; +import { Toast } from "antd-mobile"; export default function Home() { const [deviceType, setDeviceType] = useState(""); @@ -157,7 +158,13 @@ export default function Home() { deviceType === "ios" ? "itms-services://?action=download-manifest&url=https://filecdn01.tiefen.fun/appdownload/ironfans.plist" : "https://filecdn01.tiefen.fun/appdownload/ironfans1.4.6.apk"; - window.location.href = url; + if (deviceType !== "ios") { + window.location.href = url; + return; + } + Toast.show({ + content: "IOS用户暂时无法安装，请24小时后再试", + }); }} > 安装 From 3fd959ecff417b4c719426d191c7984156c142c3 Mon Sep 17 00:00:00 2001 From: yezian Date: Thu, 27 Jun 2024 08:34:58 +0800 Subject: [PATCH 05/17] revert 6a507b39eecdffca97c3a4ee34bf34056b81dad1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert ios暂时禁止下载 --- app/page.jsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/page.jsx b/app/page.jsx index 62953cc..0599ba0 100644 --- a/app/page.jsx +++ b/app/page.jsx @@ -4,7 +4,6 @@ import React, { useState, useEffect } from "react"; import InOtherApp from "@/components/InOtherApp"; import Footer from "@/components/Footer"; import Link from "next/link"; -import { Toast } from "antd-mobile"; export default function Home() { const [deviceType, setDeviceType] = useState(""); @@ -158,13 +157,7 @@ export default function Home() { deviceType === "ios" ? "itms-services://?action=download-manifest&url=https://filecdn01.tiefen.fun/appdownload/ironfans.plist" : "https://filecdn01.tiefen.fun/appdownload/ironfans1.4.6.apk"; - if (deviceType !== "ios") { - window.location.href = url; - return; - } - Toast.show({ - content: "IOS用户暂时无法安装，请24小时后再试", - }); + window.location.href = url; }} > 安装 From 48629108e0549573b3c4a16d66ea9b885738ed62 Mon Sep 17 00:00:00 2001 From: yezian Date: Fri, 28 Jun 2024 01:06:40 +0800 Subject: [PATCH 06/17] revert 3fd959ecff417b4c719426d191c7984156c142c3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert revert 6a507b39eecdffca97c3a4ee34bf34056b81dad1 revert ios暂时禁止下载 --- app/page.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/page.jsx b/app/page.jsx index 0599ba0..62953cc 100644 --- a/app/page.jsx +++ b/app/page.jsx @@ -4,6 +4,7 @@ import React, { useState, useEffect } from "react"; import InOtherApp from "@/components/InOtherApp"; import Footer from "@/components/Footer"; import Link from "next/link"; +import { Toast } from "antd-mobile"; export default function Home() { const [deviceType, setDeviceType] = useState(""); @@ -157,7 +158,13 @@ export default function Home() { deviceType === "ios" ? "itms-services://?action=download-manifest&url=https://filecdn01.tiefen.fun/appdownload/ironfans.plist" : "https://filecdn01.tiefen.fun/appdownload/ironfans1.4.6.apk"; - window.location.href = url; + if (deviceType !== "ios") { + window.location.href = url; + return; + } + Toast.show({ + content: "IOS用户暂时无法安装，请24小时后再试", + }); }} > 安装 From 00dd2c68e9f9c5d2b31b84cf226995c944c3b190 Mon Sep 17 00:00:00 2001 From: yezian Date: Fri, 28 Jun 2024 11:37:27 +0800 Subject: [PATCH 07/17] revert 48629108e0549573b3c4a16d66ea9b885738ed62 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert revert 3fd959ecff417b4c719426d191c7984156c142c3 revert revert 6a507b39eecdffca97c3a4ee34bf34056b81dad1 revert ios暂时禁止下载 --- app/page.jsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/page.jsx b/app/page.jsx index 62953cc..0599ba0 100644 --- a/app/page.jsx +++ b/app/page.jsx @@ -4,7 +4,6 @@ import React, { useState, useEffect } from "react"; import InOtherApp from "@/components/InOtherApp"; import Footer from "@/components/Footer"; import Link from "next/link"; -import { Toast } from "antd-mobile"; export default function Home() { const [deviceType, setDeviceType] = useState(""); @@ -158,13 +157,7 @@ export default function Home() { deviceType === "ios" ? "itms-services://?action=download-manifest&url=https://filecdn01.tiefen.fun/appdownload/ironfans.plist" : "https://filecdn01.tiefen.fun/appdownload/ironfans1.4.6.apk"; - if (deviceType !== "ios") { - window.location.href = url; - return; - } - Toast.show({ - content: "IOS用户暂时无法安装，请24小时后再试", - }); + window.location.href = url; }} > 安装 From 1b174a0ee09892ad543a56b2ac4bbffe14bdebfd Mon Sep 17 00:00:00 2001 From: jueweijue Date: Fri, 28 Jun 2024 12:27:16 +0800 Subject: [PATCH 08/17] =?UTF-8?q?ios=E7=A6=81=E6=AD=A2=E5=85=85=E5=80=BC?= =?UTF-8?q?=E4=BC=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/vip/page.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/vip/page.jsx b/app/vip/page.jsx index abf12a0..59b1416 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -74,6 +74,12 @@ export default function Vip() { const [isLoading, setIsLoading] = useState(false); const createOrder = async (type = "alipay_h5") => { const base = webviewBaseRequest(); + if (base?.b_dt === 1) { + Toast.show({ + content: "ios暂时无法开通会员，请等待版本更新", + }); + return; + } const body = { ...base, product_id: "membership", From e94691514c3f523264e7eb674328f7a8c2324982 Mon Sep 17 00:00:00 2001 From: yezian Date: Wed, 17 Jul 2024 18:41:31 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/pay/page.jsx | 18 +++++++++++++++++- app/vip/page.jsx | 18 +++++++++++++++++- .../[zid]/[product_id]/[moment_id]/page.jsx | 18 +++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 06936f0..b0bed35 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -283,7 +283,7 @@ export default function Pay() {
-
+
createOrder("alipay_h5")} className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" @@ -301,6 +301,22 @@ export default function Pay() {

+
+
createOrder("wxpay_h5")} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" + > + + + +

+ 微信支付 +

+
+

确认购买即视为同意 diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 59b1416..314dbda 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -292,7 +292,7 @@ export default function Vip() {

-
+
createOrder("alipay_h5")} className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" @@ -309,6 +309,22 @@ export default function Vip() { 支付宝支付

+
+
createOrder("wxpay_h5")} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" + > + + + +

+ 微信支付 +

+
+

diff --git a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx index 1517882..d10e06d 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -310,7 +310,7 @@ export default function Pay({ params }) {

-
+
createOrder("alipay_h5")} className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" @@ -328,6 +328,22 @@ export default function Pay({ params }) {

+
+
createOrder("wxpay_h5")} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" + > + + + +

+ 微信支付 +

+
+

确认购买即视为同意 From 8d0527ed8daa9a73bef5960c12553fcc5d474328 Mon Sep 17 00:00:00 2001 From: yezian Date: Thu, 18 Jul 2024 16:33:34 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dvip=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=AF=E4=BB=98=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/vip/page.jsx | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 314dbda..a59d269 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -309,21 +309,21 @@ export default function Vip() { 支付宝支付

-
-
createOrder("wxpay_h5")} - className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" - > - - - -

- 微信支付 -

-
+
+
+
createOrder("wxpay_h5")} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" + > + + + +

+ 微信支付 +

From 5de2a0d848d5d7dab6dced017512e5fee66b2a5a Mon Sep 17 00:00:00 2001 From: yezian Date: Thu, 18 Jul 2024 16:51:15 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=8A=98=E5=8F=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/pay/page.jsx | 61 +++++++++++-------- app/vip/page.jsx | 61 +++++++++++-------- .../[zid]/[product_id]/[moment_id]/page.jsx | 52 +++++++++++----- 3 files changed, 109 insertions(+), 65 deletions(-) diff --git a/app/pay/page.jsx b/app/pay/page.jsx index b0bed35..83722c3 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -10,16 +10,8 @@ import Link from "next/link"; export default function Pay() { const router = useRouter(); - const alipayBlock = () => { - const base = webviewBaseRequest(); - if (base?.b_mid === 161) { - createOrder("alipay_h5"); - return; - } - Toast.show({ - content: "支付渠道维护升级中，请24小时后再试", - }); - }; + //是否显示被隐藏的支付方式 + const [isPaymentHided, setIsPaymentHided] = useState(true); //商品列表 const [productList, setProductList] = useState([]); @@ -301,22 +293,41 @@ export default function Pay() {

-
-
createOrder("wxpay_h5")} - className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" - > - - - -

- 微信支付 -

+ {isPaymentHided ? ( +
+
setIsPaymentHided(false)} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-[#2E2E2E] rounded-full" + > + + + +

+ 其他支付 +

+
-
+ ) : ( +
+
createOrder("wxpay_h5")} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" + > + + + +

+ 微信支付 +

+
+
+ )}

确认购买即视为同意 diff --git a/app/vip/page.jsx b/app/vip/page.jsx index a59d269..133647a 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -10,16 +10,8 @@ import { useRouter } from "next/navigation"; export default function Vip() { const router = useRouter(); - const alipayBlock = () => { - const base = webviewBaseRequest(); - if (base?.b_mid === 161) { - createOrder("alipay_h5"); - return; - } - Toast.show({ - content: "支付渠道维护升级中，请24小时后再试", - }); - }; + //是否显示被隐藏的支付方式 + const [isPaymentHided, setIsPaymentHided] = useState(true); //检查用户是否是vip const [isVip, setIsVip] = useState(false); @@ -310,22 +302,41 @@ export default function Vip() {

-
-
createOrder("wxpay_h5")} - className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" - > - - - -

- 微信支付 -

+ {isPaymentHided ? ( +
+
setIsPaymentHided(false)} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-[#2E2E2E] rounded-full" + > + + + +

+ 其他支付 +

+
-
+ ) : ( +
+
createOrder("wxpay_h5")} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" + > + + + +

+ 微信支付 +

+
+
+ )}

确认购买即视为同意 diff --git a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx index d10e06d..a17ad72 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -11,6 +11,9 @@ import { useRouter } from "next/navigation"; export default function Pay({ params }) { const router = useRouter(); + //是否显示被隐藏的支付方式 + const [isPaymentHided, setIsPaymentHided] = useState(true); + //当前选购的商品数据 const [data, setData] = useState({}); //超粉商品数据 @@ -328,22 +331,41 @@ export default function Pay({ params }) {

-
-
createOrder("wxpay_h5")} - className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" - > - - - -

- 微信支付 -

+ {isPaymentHided ? ( +
+
setIsPaymentHided(false)} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-[#2E2E2E] rounded-full" + > + + + +

+ 其他支付 +

+
-
+ ) : ( +
+
createOrder("wxpay_h5")} + className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full" + > + + + +

+ 微信支付 +

+
+
+ )}

确认购买即视为同意 From c12c77e23551ca02faf8ae2ac5dca7ed6e97eb9c Mon Sep 17 00:00:00 2001 From: yezian Date: Thu, 18 Jul 2024 17:12:13 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=91=E4=B8=80=E5=91=A8=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E6=83=85=E5=86=B5=E5=85=A5=E5=8F=A3=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8E=9F=E6=9D=A57=E6=97=A5=E5=89=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/withdrawal/page.jsx | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/app/withdrawal/page.jsx b/app/withdrawal/page.jsx index 96fe5e0..2eb7695 100644 --- a/app/withdrawal/page.jsx +++ b/app/withdrawal/page.jsx @@ -85,9 +85,6 @@ export default function WithDrawal() { verificationStatus: verificationData.data?.realname_authentication_api_vo?.status, withdrawal_diamond: withdrawalData.data.withdraw_diamonds, - day7_total_diamonds: withdrawalData.data.day7_total_diamonds, - day7_total_withdraw_diamonds: - withdrawalData.data.day7_total_withdraw_diamonds, }); } catch (error) { console.error(error); @@ -268,17 +265,12 @@ export default function WithDrawal() { 兑换比例：10钻石=1RMB

-
-

7日前(0~24点)数据

-
-

- 当日钻石收益：{data?.day7_total_diamonds} -

-

- 今日此时已结算：{data?.day7_total_withdraw_diamonds} -

-
-
+ +

查看近一周收益情况

+

*提现数量

From 3f22fb15308099916bbb02988e7c0cccb8bd8860 Mon Sep 17 00:00:00 2001 From: yezian Date: Thu, 18 Jul 2024 19:20:16 +0800 Subject: [PATCH 13/17] =?UTF-8?q?ios=E5=AE=89=E8=A3=85=E6=97=B6=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=BC=B9=E7=AA=97=E6=95=99=E5=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/download/[user_id]/page.jsx | 33 ++++--- app/page.jsx | 14 +++ components/IosInstallStepModal/page.jsx | 111 ++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 10 deletions(-) create mode 100644 components/IosInstallStepModal/page.jsx diff --git a/app/download/[user_id]/page.jsx b/app/download/[user_id]/page.jsx index ff69da6..25c50ab 100644 --- a/app/download/[user_id]/page.jsx +++ b/app/download/[user_id]/page.jsx @@ -6,6 +6,7 @@ import baseRequest from "@/utils/baseRequest"; import { generateSignature } from "@/utils/crypto"; import { Toast } from "antd-mobile"; import copy from "@/utils/copy"; +import IosInstallStepModal from "@/components/IosInstallStepModal/page"; export default function Download({ params }) { const [deviceType, setDeviceType] = useState(""); @@ -66,6 +67,10 @@ export default function Download({ params }) { getData(); }, []); + //ios安装教程Modal是否展示 + const [isIosInstallStepModalVisible, setIsIosInstallStepModalVisible] = + useState(false); + return (
@@ -168,21 +173,29 @@ export default function Download({ params }) {
)}
+
@@ -153,11 +159,15 @@ export default function Home() {
{ + if (deviceType === "ios") setIsIosInstallStepModalVisible(true); const url = deviceType === "ios" ? "itms-services://?action=download-manifest&url=https://filecdn01.tiefen.fun/appdownload/ironfans.plist" : "https://filecdn01.tiefen.fun/appdownload/ironfans1.4.6.apk"; window.location.href = url; + if (deviceType === "ios") { + setIsIosInstallStepModalVisible(true); + } }} > 安装 @@ -176,6 +186,10 @@ export default function Home() { )}
+