From 837b9ed1b94c17cc678544c5e3f61b706caea04f Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Fri, 14 Jun 2024 19:54:08 +0800
Subject: [PATCH] revert ea5f6fd35a463d25e00d3111475e539fa6b9e525
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

revert 只保留支付宝支付
---
 app/[user_id]/_components/WechatBar/index.jsx | 11 +++++++-
 app/pay/page.jsx                              | 25 +++++++++++++++--
 app/vip/page.jsx                              | 27 +++++++++++++++++--
 .../[zid]/[product_id]/[moment_id]/page.jsx   | 27 +++++++++++++++++--
 4 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/app/[user_id]/_components/WechatBar/index.jsx b/app/[user_id]/_components/WechatBar/index.jsx
index 59713a3..3da9a67 100644
--- a/app/[user_id]/_components/WechatBar/index.jsx
+++ b/app/[user_id]/_components/WechatBar/index.jsx
@@ -32,6 +32,7 @@ export default function WechatBar({
       const signature = generateSignature({
         uid: streamerMid,
         pay_type: type,
+        redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "",
         ...base,
       });
       const response = await fetch(
@@ -44,6 +45,8 @@ export default function WechatBar({
           body: JSON.stringify({
             uid: streamerMid,
             pay_type: type,
+            redirect_url:
+              type === "yeepay_wxpay_h5" ? window.location.href : "",
             ...base,
           }),
         }
@@ -63,6 +66,12 @@ export default function WechatBar({
       }
       //如果金币不够情况
       switch (type) {
+        case "yeepay_alipay_h5":
+          router.push(`${temData.data.yeepay_alipay_h5_param_str}`);
+          break;
+        case "yeepay_wxpay_h5":
+          router.push(`${temData.data.yeepay_wxpay_h5_param_str}`);
+          break;
         case "alipay_h5":
           router.push(`${temData.data.alipay_h5_param_str}`);
           break;
@@ -140,7 +149,7 @@ export default function WechatBar({
           <div className="flex flex-row">
             <button
               className="flex flex-row flex-1 mx-2 items-center justify-center bg-[#FF669E] rounded-lg py-2"
-              onClick={() => handlePurchase("alipay_h5")}
+              onClick={() => handlePurchase("yeepay_alipay_h5")}
             >
               <p className="text-white text-base ml-1">立即购买</p>
             </button>
diff --git a/app/pay/page.jsx b/app/pay/page.jsx
index 8835695..8eeeb51 100644
--- a/app/pay/page.jsx
+++ b/app/pay/page.jsx
@@ -98,6 +98,7 @@ export default function Pay() {
       product_id: customCoin.selected ? "h5_custom_coin" : selectedPrice.id,
       custom_coins: customCoin.selected ? customCoin.num : 0,
       pay_type: type,
+      redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "",
       from: "app",
     };
 
@@ -129,6 +130,12 @@ export default function Pay() {
         return;
       }
       switch (type) {
+        case "yeepay_alipay_h5":
+          router.push(`${data.data.yeepay_alipay_h5_param_str}`);
+          break;
+        case "yeepay_wxpay_h5":
+          router.push(`${data.data.yeepay_wxpay_h5_param_str}`);
+          break;
         case "alipay_h5":
           router.push(`${data.data.alipay_h5_param_str}`);
           break;
@@ -273,9 +280,9 @@ export default function Pay() {
           </div>
         )}
         <div className="flex mt-auto mb-12">
-          <div className="w-full px-2">
+          <div className="basis-1/2 px-2">
             <button
-              onClick={() => createOrder("alipay_h5")}
+              onClick={() => createOrder("yeepay_alipay_h5")}
               className="flex flex-row h-12 w-full items-center justify-center bg-primary rounded-full py-2"
             >
               <svg viewBox="0 0 1024 1024" width="18" height="18">
@@ -287,6 +294,20 @@ export default function Pay() {
               <p className="text-white text-base ml-1">支付宝</p>
             </button>
           </div>
+          <div className="basis-1/2 px-2">
+            <button
+              onClick={() => createOrder("yeepay_wxpay_h5")}
+              className="flex flex-row h-12 w-full items-center justify-center bg-primary rounded-full py-2"
+            >
+              <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 ml-1">微信支付</p>
+            </button>
+          </div>
         </div>
       </div>
     </section>
diff --git a/app/vip/page.jsx b/app/vip/page.jsx
index 4680566..02ea944 100644
--- a/app/vip/page.jsx
+++ b/app/vip/page.jsx
@@ -89,6 +89,7 @@ export default function Vip() {
       ...base,
       product_id: "membership",
       pay_type: type,
+      redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "",
       from: "app",
     };
 
@@ -120,6 +121,12 @@ export default function Vip() {
         return;
       }
       switch (type) {
+        case "yeepay_alipay_h5":
+          router.push(`${data.data.yeepay_alipay_h5_param_str}`);
+          break;
+        case "yeepay_wxpay_h5":
+          router.push(`${data.data.yeepay_wxpay_h5_param_str}`);
+          break;
         case "alipay_h5":
           router.push(`${data.data.alipay_h5_param_str}`);
           break;
@@ -246,9 +253,9 @@ 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="basis-1/2 px-2">
                   <div
-                    onClick={() => createOrder("alipay_h5")}
+                    onClick={() => createOrder("yeepay_alipay_h5")}
                     className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full"
                   >
                     <Image src={alipay} width={22} alt="" />
@@ -257,6 +264,22 @@ export default function Vip() {
                     </p>
                   </div>
                 </div>
+                <div className="basis-1/2 px-2">
+                  <div
+                    onClick={() => createOrder("yeepay_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 69f419c..5a9c28a 100644
--- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx
+++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx
@@ -110,6 +110,7 @@ export default function Pay({ params }) {
       moment_id: parseInt(params.moment_id),
       product_id: checked ? "h5_zone_superfanship" : params.product_id,
       pay_type: type,
+      redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "",
       from: "app",
     };
 
@@ -135,6 +136,12 @@ export default function Pay({ params }) {
         return;
       }
       switch (type) {
+        case "yeepay_alipay_h5":
+          router.push(`${data.data.yeepay_alipay_h5_param_str}`);
+          break;
+        case "yeepay_wxpay_h5":
+          router.push(`${data.data.yeepay_wxpay_h5_param_str}`);
+          break;
         case "alipay_h5":
           router.push(`${data.data.alipay_h5_param_str}`);
           break;
@@ -305,9 +312,9 @@ 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="basis-1/2 px-2">
                 <div
-                  onClick={() => createOrder("alipay_h5")}
+                  onClick={() => createOrder("yeepay_alipay_h5")}
                   className="flex flex-row cursor-pointer gap-1.5 h-11 items-center justify-center bg-primary rounded-full"
                 >
                   <Image src={alipay} width={22} alt="" />
@@ -316,6 +323,22 @@ export default function Pay({ params }) {
                   </p>
                 </div>
               </div>
+              <div className="basis-1/2 px-2">
+                <div
+                  onClick={() => createOrder("yeepay_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">
               确认购买即视为同意