From cd1fa6e5edadc74f4cc73f0a8893d42b23b9b876 Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Tue, 20 Aug 2024 16:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=92=8C=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=EF=BC=88=E5=8F=AA=E5=9C=A8app?=
 =?UTF-8?q?=E5=86=85=E7=94=9F=E6=95=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/vip/page.jsx                              | 56 +++++++++++++++----
 .../[zid]/[product_id]/[moment_id]/page.jsx   | 48 +++++++++++++++-
 2 files changed, 91 insertions(+), 13 deletions(-)

diff --git a/app/vip/page.jsx b/app/vip/page.jsx
index 1a4cc67..c499f9f 100644
--- a/app/vip/page.jsx
+++ b/app/vip/page.jsx
@@ -9,26 +9,24 @@ import { useRouter, useSearchParams } from "next/navigation";
 export default function Vip() {
   const router = useRouter();
   const searchParams = useSearchParams();
-  const alipayBlock = () => {
-    if (base?.b_mid === 161) {
-      createOrder("alipay_h5");
-      return;
-    }
-    Toast.show({
-      content: "支付渠道维护升级中，请24小时后再试",
-    });
-  };
+
+  //是否显示被隐藏的支付方式
+  const [isPaymentHided, setIsPaymentHided] = useState(true);
 
   //检查用户是否是vip
   const [isVip, setIsVip] = useState(false);
   const [name, setName] = useState("");
   const [isFetching, setIsFetching] = useState(true);
 
+  //判断当前环境是否在app内
+  const [isInApp, setIsInApp] = useState(true);
+
   const getBase = useCallback(
     (webviewBase) => {
       let searchParamsObj = null;
       let currentBaseCode = searchParams.get("base");
       if (currentBaseCode) {
+        setIsInApp(false);
         let currentBase = JSON.parse(currentBaseCode);
         searchParamsObj = { ...currentBase };
       }
@@ -139,7 +137,7 @@ export default function Vip() {
           break;
         case "wxpay_h5":
           router.push(
-            `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent(
+            `https://app.tiefen.fun/wxpay_h5/${encodeURIComponent(
               data.data.wxpay_h5_param_str
             )}`
           );
@@ -304,7 +302,7 @@ export default function Vip() {
             <div className="h-12 bg-gradient-to-t from-[#07050AE5] to-[#07050A00]"></div>
             <div className="flex flex-col pt-3 pb-11 px-4 bg-[#07050AE5]">
               <div className="flex flex-row justify-between">
-                <div className="w-full px-2">
+                <div className={`${isInApp ? "basis-1/2" : "w-full"} px-2`}>
                   <div
                     onClick={() => createOrder("alipay_h5")}
                     className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full"
@@ -322,6 +320,42 @@ export default function Vip() {
                     </p>
                   </div>
                 </div>
+                {isInApp &&
+                  (isPaymentHided ? (
+                    <div className="basis-1/2 px-2">
+                      <div
+                        onClick={() => setIsPaymentHided(false)}
+                        className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-[#2E2E2E] rounded-full"
+                      >
+                        <svg viewBox="0 0 1024 1024" width="18" height="18">
+                          <path
+                            d="M512 65.311495c-246.699682 0-446.688505 199.989847-446.688505 446.688505s199.989847 446.688505 446.688505 446.688505S958.688505 758.699682 958.688505 512 758.698658 65.311495 512 65.311495zM309.953308 567.255465c-30.517037 0-55.255465-24.738427-55.255465-55.255465s24.738427-55.255465 55.255465-55.255465 55.255465 24.738427 55.255465 55.255465S340.470345 567.255465 309.953308 567.255465zM512 567.255465c-30.517037 0-55.255465-24.738427-55.255465-55.255465s24.738427-55.255465 55.255465-55.255465c30.517037 0 55.255465 24.738427 55.255465 55.255465S542.517037 567.255465 512 567.255465zM714.046692 567.255465c-30.517037 0-55.255465-24.738427-55.255465-55.255465s24.738427-55.255465 55.255465-55.255465 55.255465 24.738427 55.255465 55.255465S744.56373 567.255465 714.046692 567.255465z"
+                            fill="#FFFFFF"
+                          ></path>
+                        </svg>
+                        <p className="text-white text-base font-medium whitespace-nowrap">
+                          其他支付
+                        </p>
+                      </div>
+                    </div>
+                  ) : (
+                    <div className="basis-1/2 px-2">
+                      <div
+                        onClick={() => createOrder("wxpay_h5")}
+                        className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full"
+                      >
+                        <svg viewBox="0 0 1228 1024" width="18" height="18">
+                          <path
+                            d="M530.8928 703.1296a41.472 41.472 0 0 1-35.7376-19.8144l-2.7136-5.5808L278.272 394.752a18.7392 18.7392 0 0 1-2.048-8.1408 19.968 19.968 0 0 1 20.48-19.3536c4.608 0 8.8576 1.4336 12.288 3.84l234.3936 139.9296a64.4096 64.4096 0 0 0 54.528 5.9392L1116.2624 204.8C1004.9536 80.896 821.76 0 614.4 0 275.0464 0 0 216.576 0 483.6352c0 145.7152 82.7392 276.8896 212.2752 365.5168a38.1952 38.1952 0 0 1 17.2032 31.488 44.4928 44.4928 0 0 1-2.1504 12.3904l-27.6992 97.4848c-1.3312 4.608-3.328 9.3696-3.328 14.1312 0 10.752 9.216 19.3536 20.48 19.3536 4.4032 0 8.0384-1.536 11.776-3.584l134.5536-73.3184c10.1376-5.5296 20.7872-8.96 32.6144-8.96 6.2976 0 12.288 0.9216 18.0736 2.5088 62.72 17.0496 130.4576 26.5728 200.5504 26.5728C953.7024 967.168 1228.8 750.592 1228.8 483.6352c0-80.9472-25.4464-157.1328-70.0416-224.1024l-604.9792 436.992-4.4544 2.4064a42.1376 42.1376 0 0 1-18.432 4.1984z"
+                            fill="#FFFFFF"
+                          ></path>
+                        </svg>
+                        <p className="text-white text-base font-medium whitespace-nowrap">
+                          微信支付
+                        </p>
+                      </div>
+                    </div>
+                  ))}
               </div>
               <p className="text-secondary text-xs font-medium mt-4 text-center mb-1">
                 确认购买即视为同意
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 a9bb355..1a2ac31 100644
--- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx
+++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx
@@ -16,11 +16,19 @@ export default function Pay({ params }) {
   //超粉商品数据
   const [superfanshipData, setSuperfanshipData] = useState();
   const [isFetching, setIsFetching] = useState(true);
+
+  //是否显示被隐藏的支付方式
+  const [isPaymentHided, setIsPaymentHided] = useState(true);
+
+  //判断当前环境是否在app内
+  const [isInApp, setIsInApp] = useState(true);
+
   const getBase = useCallback(
     (webviewBase) => {
       let searchParamsObj = null;
       let currentBaseCode = searchParams.get("base");
       if (currentBaseCode) {
+        setIsInApp(false);
         let currentBase = JSON.parse(currentBaseCode);
         searchParamsObj = { ...currentBase };
       }
@@ -158,7 +166,7 @@ export default function Pay({ params }) {
           break;
         case "wxpay_h5":
           router.push(
-            `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent(
+            `https://app.tiefen.fun/wxpay_h5/${encodeURIComponent(
               data.data.wxpay_h5_param_str
             )}`
           );
@@ -327,7 +335,7 @@ export default function Pay({ params }) {
           <div className="h-12 bg-gradient-to-t from-[#07050AE5] to-[#07050A00]"></div>
           <div className="flex flex-col pt-3 pb-11 px-4 bg-[#07050AE5]">
             <div className="flex flex-row justify-between">
-              <div className="w-full px-2">
+              <div className={`${isInApp ? "basis-1/2" : "w-full"} px-2`}>
                 <div
                   onClick={() => createOrder("alipay_h5")}
                   className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full"
@@ -345,6 +353,42 @@ export default function Pay({ params }) {
                   </p>
                 </div>
               </div>
+              {isInApp &&
+                (isPaymentHided ? (
+                  <div className="basis-1/2 px-2">
+                    <div
+                      onClick={() => setIsPaymentHided(false)}
+                      className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-[#2E2E2E] rounded-full"
+                    >
+                      <svg viewBox="0 0 1024 1024" width="18" height="18">
+                        <path
+                          d="M512 65.311495c-246.699682 0-446.688505 199.989847-446.688505 446.688505s199.989847 446.688505 446.688505 446.688505S958.688505 758.699682 958.688505 512 758.698658 65.311495 512 65.311495zM309.953308 567.255465c-30.517037 0-55.255465-24.738427-55.255465-55.255465s24.738427-55.255465 55.255465-55.255465 55.255465 24.738427 55.255465 55.255465S340.470345 567.255465 309.953308 567.255465zM512 567.255465c-30.517037 0-55.255465-24.738427-55.255465-55.255465s24.738427-55.255465 55.255465-55.255465c30.517037 0 55.255465 24.738427 55.255465 55.255465S542.517037 567.255465 512 567.255465zM714.046692 567.255465c-30.517037 0-55.255465-24.738427-55.255465-55.255465s24.738427-55.255465 55.255465-55.255465 55.255465 24.738427 55.255465 55.255465S744.56373 567.255465 714.046692 567.255465z"
+                          fill="#FFFFFF"
+                        ></path>
+                      </svg>
+                      <p className="text-white text-base font-medium whitespace-nowrap">
+                        其他支付
+                      </p>
+                    </div>
+                  </div>
+                ) : (
+                  <div className="basis-1/2 px-2">
+                    <div
+                      onClick={() => createOrder("wxpay_h5")}
+                      className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full"
+                    >
+                      <svg viewBox="0 0 1228 1024" width="18" height="18">
+                        <path
+                          d="M530.8928 703.1296a41.472 41.472 0 0 1-35.7376-19.8144l-2.7136-5.5808L278.272 394.752a18.7392 18.7392 0 0 1-2.048-8.1408 19.968 19.968 0 0 1 20.48-19.3536c4.608 0 8.8576 1.4336 12.288 3.84l234.3936 139.9296a64.4096 64.4096 0 0 0 54.528 5.9392L1116.2624 204.8C1004.9536 80.896 821.76 0 614.4 0 275.0464 0 0 216.576 0 483.6352c0 145.7152 82.7392 276.8896 212.2752 365.5168a38.1952 38.1952 0 0 1 17.2032 31.488 44.4928 44.4928 0 0 1-2.1504 12.3904l-27.6992 97.4848c-1.3312 4.608-3.328 9.3696-3.328 14.1312 0 10.752 9.216 19.3536 20.48 19.3536 4.4032 0 8.0384-1.536 11.776-3.584l134.5536-73.3184c10.1376-5.5296 20.7872-8.96 32.6144-8.96 6.2976 0 12.288 0.9216 18.0736 2.5088 62.72 17.0496 130.4576 26.5728 200.5504 26.5728C953.7024 967.168 1228.8 750.592 1228.8 483.6352c0-80.9472-25.4464-157.1328-70.0416-224.1024l-604.9792 436.992-4.4544 2.4064a42.1376 42.1376 0 0 1-18.432 4.1984z"
+                          fill="#FFFFFF"
+                        ></path>
+                      </svg>
+                      <p className="text-white text-base font-medium whitespace-nowrap">
+                        微信支付
+                      </p>
+                    </div>
+                  </div>
+                ))}
             </div>
             <p className="text-secondary text-xs font-medium mt-4 text-center mb-1">
               确认购买即视为同意