From e80f3ca6c96658d95a9517be78766672ed2b7d75 Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Thu, 22 Aug 2024 17:43:29 +0800
Subject: [PATCH] revert 1c5d3f0d3e7bcb7d6009ce33e2557428a59d8094
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

revert 在app内显示微信支付
---
 app/pay/page.jsx | 57 ++++++++++--------------------------------------
 1 file changed, 11 insertions(+), 46 deletions(-)

diff --git a/app/pay/page.jsx b/app/pay/page.jsx
index c155542..56da298 100644
--- a/app/pay/page.jsx
+++ b/app/pay/page.jsx
@@ -9,11 +9,16 @@ import Link from "next/link";
 
 export default function Pay() {
   const router = useRouter();
-
-  //是否显示被隐藏的支付方式
-  const [isPaymentHided, setIsPaymentHided] = useState(true);
-
   const searchParams = useSearchParams();
+  const alipayBlock = () => {
+    if (base?.b_mid === 161) {
+      createOrder("alipay_h5");
+      return;
+    }
+    Toast.show({
+      content: "支付渠道维护升级中，请24小时后再试",
+    });
+  };
 
   //商品列表
   const [productList, setProductList] = useState([]);
@@ -24,9 +29,6 @@ export default function Pay() {
   //选择任意金额充值
   const [customCoin, setCustomCoin] = useState({ selected: false, num: 1000 });
 
-  //判断当前环境是否在app内
-  const [isInApp, setIsInApp] = useState(true);
-
   //任意金额充值的金币数量
   const handleChangeCustomCoin = (e) => {
     let newValue = parseInt(e.target.value, 10);
@@ -47,7 +49,6 @@ export default function Pay() {
       let searchParamsObj = null;
       let currentBaseCode = searchParams.get("base");
       if (currentBaseCode) {
-        setIsInApp(false);
         let currentBase = JSON.parse(currentBaseCode);
         searchParamsObj = { ...currentBase };
       }
@@ -154,7 +155,7 @@ export default function Pay() {
           break;
         case "wxpay_h5":
           router.push(
-            `https://app.tiefen.fun/wxpay_h5/${encodeURIComponent(
+            `https://shop.tiefen.fun/pay/wxpay_h5/${encodeURIComponent(
               data.data.wxpay_h5_param_str
             )}`
           );
@@ -295,7 +296,7 @@ export default function Pay() {
         <div className="flex flex-col w-full mt-auto z-20">
           <div className="flex flex-col pt-3 pb-11 px-4 bg-[#07050AE5]">
             <div className="flex flex-row justify-between">
-              <div className={`${isInApp ? "basis-1/2" : "w-full"} px-2`}>
+              <div className="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"
@@ -313,42 +314,6 @@ export default function Pay() {
                   </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">
               确认购买即视为同意