From 52ef5f73d75d227fa2519ef807fca0838788dd5e Mon Sep 17 00:00:00 2001 From: al Date: Tue, 23 Jul 2024 18:06:31 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0base=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bill/[type]/page.jsx | 21 +++++++++++++-- app/pay/page.jsx | 27 ++++++++++++++----- app/vip/page.jsx | 26 +++++++++++++----- .../[zid]/[product_id]/[moment_id]/page.jsx | 26 +++++++++++++----- 4 files changed, 79 insertions(+), 21 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index 465fb06..133330c 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -1,14 +1,32 @@ "use client"; -import React, { useState, useEffect } from "react"; +import React, { useState, useEffect, useMemo } from "react"; import { Toast } from "antd-mobile"; import { generateSignature } from "@/utils/crypto"; import webviewBaseRequest from "@/utils/webviewBaseRequest"; +import { useSearchParams } from "next/navigation"; import Link from "next/link"; export default function BillDetail({ params }) { const [data, setData] = useState([]); const [isFetching, setIsFetching] = useState(true); + const searchParams = useSearchParams(); + const base = useMemo(()=>{ + let searchParamsObj=null; b + if(searchParams.get("b_mid")){ + searchParamsObj={}; + searchParamsObj.b_mid=searchParams.get("b_mid"); + searchParamsObj.b_did=searchParams.get("b_did"); + searchParamsObj.b_ver=searchParams.get("b_ver"); + searchParamsObj.b_dt=searchParams.get("b_dt"); + searchParamsObj.b_model=searchParams.get("b_model"); + searchParamsObj.b_nt=searchParams.get("b_nt"); + searchParamsObj.b_token=searchParams.get("b_token"); + searchParamsObj.b_ch=searchParams.get("b_ch"); + searchParamsObj.b_ts=searchParams.get("b_ts"); + } + return searchParamsObj || webviewBaseRequest(); + },[searchParams]); useEffect(() => { const getData = async () => { let type; @@ -29,7 +47,6 @@ export default function BillDetail({ params }) { break; } try { - const base = webviewBaseRequest(); const signature = generateSignature({ type: type, offset: 0, diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 06936f0..57a2c3e 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -1,7 +1,7 @@ "use client"; -import React, { useState, useEffect } from "react"; -import { useRouter } from "next/navigation"; +import React, { useState, useEffect,useMemo } from "react"; +import { useRouter, useSearchParams } from "next/navigation"; import { Toast } from "antd-mobile"; import { generateSignature } from "@/utils/crypto"; import webviewBaseRequest from "@/utils/webviewBaseRequest"; @@ -9,9 +9,8 @@ import Link from "next/link"; export default function Pay() { const router = useRouter(); - + const searchParams = useSearchParams(); const alipayBlock = () => { - const base = webviewBaseRequest(); if (base?.b_mid === 161) { createOrder("alipay_h5"); return; @@ -45,9 +44,25 @@ export default function Pay() { //获取当前充值档位 const [isFetching, setIsFetching] = useState(true); + const base = useMemo(()=>{ + let searchParamsObj=null; b + if(searchParams.get("b_mid")){ + searchParamsObj={}; + searchParamsObj.b_mid=searchParams.get("b_mid"); + searchParamsObj.b_did=searchParams.get("b_did"); + searchParamsObj.b_ver=searchParams.get("b_ver"); + searchParamsObj.b_dt=searchParams.get("b_dt"); + searchParamsObj.b_model=searchParams.get("b_model"); + searchParamsObj.b_nt=searchParams.get("b_nt"); + searchParamsObj.b_token=searchParams.get("b_token"); + searchParamsObj.b_ch=searchParams.get("b_ch"); + searchParamsObj.b_ts=searchParams.get("b_ts"); + } + return searchParamsObj || webviewBaseRequest(); + },[searchParams]); useEffect(() => { const getData = async () => { - const base = webviewBaseRequest(); + const body = { ...base }; const signature = generateSignature(body); try { @@ -93,7 +108,7 @@ export default function Pay() { return; } - const base = webviewBaseRequest(); + const body = { ...base, product_id: customCoin.selected ? "h5_custom_coin" : selectedPrice.id, diff --git a/app/vip/page.jsx b/app/vip/page.jsx index abf12a0..8a1917e 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -1,17 +1,15 @@ "use client"; -import React, { useState, useEffect } from "react"; +import React, { useState, useEffect, useMemo } from "react"; import { generateSignature } from "@/utils/crypto"; import webviewBaseRequest from "@/utils/webviewBaseRequest"; import Link from "next/link"; import { Toast } from "antd-mobile"; -import { useRouter } from "next/navigation"; - +import { useRouter, useSearchParams } from "next/navigation"; export default function Vip() { const router = useRouter(); - + const searchParams = useSearchParams(); const alipayBlock = () => { - const base = webviewBaseRequest(); if (base?.b_mid === 161) { createOrder("alipay_h5"); return; @@ -25,9 +23,24 @@ export default function Vip() { const [isVip, setIsVip] = useState(false); const [name, setName] = useState(""); const [isFetching, setIsFetching] = useState(true); + const base = useMemo(()=>{ + let searchParamsObj=null; b + if(searchParams.get("b_mid")){ + searchParamsObj={}; + searchParamsObj.b_mid=searchParams.get("b_mid"); + searchParamsObj.b_did=searchParams.get("b_did"); + searchParamsObj.b_ver=searchParams.get("b_ver"); + searchParamsObj.b_dt=searchParams.get("b_dt"); + searchParamsObj.b_model=searchParams.get("b_model"); + searchParamsObj.b_nt=searchParams.get("b_nt"); + searchParamsObj.b_token=searchParams.get("b_token"); + searchParamsObj.b_ch=searchParams.get("b_ch"); + searchParamsObj.b_ts=searchParams.get("b_ts"); + } + return searchParamsObj || webviewBaseRequest(); + },[searchParams]); const getUserData = async () => { try { - const base = webviewBaseRequest(); const signature = generateSignature({ ...base, mid: base.b_mid, @@ -73,7 +86,6 @@ export default function Vip() { //创建充值订单 const [isLoading, setIsLoading] = useState(false); const createOrder = async (type = "alipay_h5") => { - const base = webviewBaseRequest(); const body = { ...base, product_id: "membership", 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..3cd514d 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -1,26 +1,40 @@ "use client"; -import React, { useState, useEffect } from "react"; +import React, { useState, useEffect, useMemo } from "react"; import Divider from "@/components/Divider"; import Link from "next/link"; import { Toast, Switch } from "antd-mobile"; import { generateSignature } from "@/utils/crypto"; import webviewBaseRequest from "@/utils/webviewBaseRequest"; -import { useRouter } from "next/navigation"; +import { useRouter,useSearchParams } from "next/navigation"; export default function Pay({ params }) { const router = useRouter(); - + const searchParams = useSearchParams(); //当前选购的商品数据 const [data, setData] = useState({}); //超粉商品数据 const [superfanshipData, setSuperfanshipData] = useState(); const [isFetching, setIsFetching] = useState(true); - + const base = useMemo(()=>{ + let searchParamsObj=null; b + if(searchParams.get("b_mid")){ + searchParamsObj={}; + searchParamsObj.b_mid=searchParams.get("b_mid"); + searchParamsObj.b_did=searchParams.get("b_did"); + searchParamsObj.b_ver=searchParams.get("b_ver"); + searchParamsObj.b_dt=searchParams.get("b_dt"); + searchParamsObj.b_model=searchParams.get("b_model"); + searchParamsObj.b_nt=searchParams.get("b_nt"); + searchParamsObj.b_token=searchParams.get("b_token"); + searchParamsObj.b_ch=searchParams.get("b_ch"); + searchParamsObj.b_ts=searchParams.get("b_ts"); + } + return searchParamsObj || webviewBaseRequest(); + },[searchParams]); //获取当前选购的商品数据 const getData = async () => { - try { - const base = webviewBaseRequest(); + try { const body = { zid: parseInt(params.zid), moment_id: parseInt(params.moment_id), From c0c9520fee81c9a0176c39b1e6157d89d37d1582 Mon Sep 17 00:00:00 2001 From: al Date: Tue, 23 Jul 2024 19:19:53 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bill/[type]/page.jsx | 2 +- app/pay/page.jsx | 2 +- app/vip/page.jsx | 2 +- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index 133330c..6c9187f 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -12,7 +12,7 @@ export default function BillDetail({ params }) { const [isFetching, setIsFetching] = useState(true); const searchParams = useSearchParams(); const base = useMemo(()=>{ - let searchParamsObj=null; b + let searchParamsObj=null; if(searchParams.get("b_mid")){ searchParamsObj={}; searchParamsObj.b_mid=searchParams.get("b_mid"); diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 57a2c3e..16f145b 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -45,7 +45,7 @@ export default function Pay() { //获取当前充值档位 const [isFetching, setIsFetching] = useState(true); const base = useMemo(()=>{ - let searchParamsObj=null; b + let searchParamsObj=null; if(searchParams.get("b_mid")){ searchParamsObj={}; searchParamsObj.b_mid=searchParams.get("b_mid"); diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 8a1917e..3c8b03e 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -24,7 +24,7 @@ export default function Vip() { const [name, setName] = useState(""); const [isFetching, setIsFetching] = useState(true); const base = useMemo(()=>{ - let searchParamsObj=null; b + let searchParamsObj=null; if(searchParams.get("b_mid")){ searchParamsObj={}; searchParamsObj.b_mid=searchParams.get("b_mid"); 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 3cd514d..e808a78 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -17,7 +17,7 @@ export default function Pay({ params }) { const [superfanshipData, setSuperfanshipData] = useState(); const [isFetching, setIsFetching] = useState(true); const base = useMemo(()=>{ - let searchParamsObj=null; b + let searchParamsObj=null; if(searchParams.get("b_mid")){ searchParamsObj={}; searchParamsObj.b_mid=searchParams.get("b_mid"); From ae2d164b849a4be5a4c37716a5556d4fd1c2322b Mon Sep 17 00:00:00 2001 From: al Date: Tue, 23 Jul 2024 19:49:35 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0webviewBase=E7=9B=91?= =?UTF-8?q?=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bill/[type]/page.jsx | 5 +++-- app/pay/page.jsx | 5 +++-- app/vip/page.jsx | 5 +++-- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index 6c9187f..eada3da 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -11,6 +11,7 @@ export default function BillDetail({ params }) { const [data, setData] = useState([]); const [isFetching, setIsFetching] = useState(true); const searchParams = useSearchParams(); + const webviewBase = webviewBaseRequest() const base = useMemo(()=>{ let searchParamsObj=null; if(searchParams.get("b_mid")){ @@ -25,8 +26,8 @@ export default function BillDetail({ params }) { searchParamsObj.b_ch=searchParams.get("b_ch"); searchParamsObj.b_ts=searchParams.get("b_ts"); } - return searchParamsObj || webviewBaseRequest(); - },[searchParams]); + return searchParamsObj || webviewBase; + },[searchParams,webviewBase]); useEffect(() => { const getData = async () => { let type; diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 16f145b..8cd7ed8 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -44,6 +44,7 @@ export default function Pay() { //获取当前充值档位 const [isFetching, setIsFetching] = useState(true); + const webviewBase = webviewBaseRequest() const base = useMemo(()=>{ let searchParamsObj=null; if(searchParams.get("b_mid")){ @@ -58,8 +59,8 @@ export default function Pay() { searchParamsObj.b_ch=searchParams.get("b_ch"); searchParamsObj.b_ts=searchParams.get("b_ts"); } - return searchParamsObj || webviewBaseRequest(); - },[searchParams]); + return searchParamsObj || webviewBase; + },[searchParams,webviewBase]); useEffect(() => { const getData = async () => { diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 3c8b03e..5ca9348 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -23,6 +23,7 @@ export default function Vip() { const [isVip, setIsVip] = useState(false); const [name, setName] = useState(""); const [isFetching, setIsFetching] = useState(true); + const webviewBase = webviewBaseRequest() const base = useMemo(()=>{ let searchParamsObj=null; if(searchParams.get("b_mid")){ @@ -37,8 +38,8 @@ export default function Vip() { searchParamsObj.b_ch=searchParams.get("b_ch"); searchParamsObj.b_ts=searchParams.get("b_ts"); } - return searchParamsObj || webviewBaseRequest(); - },[searchParams]); + return searchParamsObj || webviewBase; + },[searchParams,webviewBase]); const getUserData = async () => { try { const signature = generateSignature({ 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 e808a78..e5d1ae5 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -16,6 +16,7 @@ export default function Pay({ params }) { //超粉商品数据 const [superfanshipData, setSuperfanshipData] = useState(); const [isFetching, setIsFetching] = useState(true); + const webviewBase = webviewBaseRequest() const base = useMemo(()=>{ let searchParamsObj=null; if(searchParams.get("b_mid")){ @@ -30,8 +31,8 @@ export default function Pay({ params }) { searchParamsObj.b_ch=searchParams.get("b_ch"); searchParamsObj.b_ts=searchParams.get("b_ts"); } - return searchParamsObj || webviewBaseRequest(); - },[searchParams]); + return searchParamsObj || webviewBase; + },[searchParams,webviewBase]); //获取当前选购的商品数据 const getData = async () => { try { From a090c7063fa6947c776c27f52115ff0897cfc53a Mon Sep 17 00:00:00 2001 From: al Date: Tue, 23 Jul 2024 20:08:51 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bill/[type]/page.jsx | 12 ++++++++---- app/pay/page.jsx | 11 ++++++----- app/vip/page.jsx | 18 +++++++++++------- .../[zid]/[product_id]/[moment_id]/page.jsx | 14 ++++++++------ 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index eada3da..ddc8e14 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -11,8 +11,7 @@ export default function BillDetail({ params }) { const [data, setData] = useState([]); const [isFetching, setIsFetching] = useState(true); const searchParams = useSearchParams(); - const webviewBase = webviewBaseRequest() - const base = useMemo(()=>{ + const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; if(searchParams.get("b_mid")){ searchParamsObj={}; @@ -27,7 +26,7 @@ export default function BillDetail({ params }) { searchParamsObj.b_ts=searchParams.get("b_ts"); } return searchParamsObj || webviewBase; - },[searchParams,webviewBase]); + },[searchParams]); useEffect(() => { const getData = async () => { let type; @@ -48,6 +47,8 @@ export default function BillDetail({ params }) { break; } try { + const webviewBase = webviewBaseRequest(); + const base = getBase(webviewBase); const signature = generateSignature({ type: type, offset: 0, @@ -115,7 +116,10 @@ export default function BillDetail({ params }) { return (
{params.type == "income" && ( - +

查看近一周收益情况

)} diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 8cd7ed8..fe34319 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -44,8 +44,7 @@ export default function Pay() { //获取当前充值档位 const [isFetching, setIsFetching] = useState(true); - const webviewBase = webviewBaseRequest() - const base = useMemo(()=>{ + const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; if(searchParams.get("b_mid")){ searchParamsObj={}; @@ -60,10 +59,11 @@ export default function Pay() { searchParamsObj.b_ts=searchParams.get("b_ts"); } return searchParamsObj || webviewBase; - },[searchParams,webviewBase]); + },[searchParams]); useEffect(() => { const getData = async () => { - + const webviewBase = webviewBaseRequest(); + const base = getBase(webviewBase); const body = { ...base }; const signature = generateSignature(body); try { @@ -108,7 +108,8 @@ export default function Pay() { }); return; } - + const webviewBase = webviewBaseRequest(); + const base = getBase(webviewBase); const body = { ...base, diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 5ca9348..7064dad 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -1,6 +1,6 @@ "use client"; -import React, { useState, useEffect, useMemo } from "react"; +import React, { useState, useEffect, useMemo, useCallback } from "react"; import { generateSignature } from "@/utils/crypto"; import webviewBaseRequest from "@/utils/webviewBaseRequest"; import Link from "next/link"; @@ -23,8 +23,8 @@ export default function Vip() { const [isVip, setIsVip] = useState(false); const [name, setName] = useState(""); const [isFetching, setIsFetching] = useState(true); - const webviewBase = webviewBaseRequest() - const base = useMemo(()=>{ + + const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; if(searchParams.get("b_mid")){ searchParamsObj={}; @@ -39,8 +39,10 @@ export default function Vip() { searchParamsObj.b_ts=searchParams.get("b_ts"); } return searchParamsObj || webviewBase; - },[searchParams,webviewBase]); + },[searchParams]); const getUserData = async () => { + const webviewBase = webviewBaseRequest(); + let base = getBase(webviewBase) try { const signature = generateSignature({ ...base, @@ -78,15 +80,17 @@ export default function Vip() { setTimeout(() => { getUserData(); }, 500); - const intervalId = setInterval(() => { - getUserData(); - }, 2000); + // const intervalId = setInterval(() => { + // getUserData(); + // }, 2000); return () => clearInterval(intervalId); }, []); //创建充值订单 const [isLoading, setIsLoading] = useState(false); const createOrder = async (type = "alipay_h5") => { + const webviewBase = webviewBaseRequest(); + let base = getBase(webviewBase) const body = { ...base, product_id: "membership", 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 e5d1ae5..15ea73f 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -6,7 +6,7 @@ import Link from "next/link"; import { Toast, Switch } from "antd-mobile"; import { generateSignature } from "@/utils/crypto"; import webviewBaseRequest from "@/utils/webviewBaseRequest"; -import { useRouter,useSearchParams } from "next/navigation"; +import { useRouter, useSearchParams } from "next/navigation"; export default function Pay({ params }) { const router = useRouter(); @@ -16,8 +16,7 @@ export default function Pay({ params }) { //超粉商品数据 const [superfanshipData, setSuperfanshipData] = useState(); const [isFetching, setIsFetching] = useState(true); - const webviewBase = webviewBaseRequest() - const base = useMemo(()=>{ + const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; if(searchParams.get("b_mid")){ searchParamsObj={}; @@ -32,10 +31,12 @@ export default function Pay({ params }) { searchParamsObj.b_ts=searchParams.get("b_ts"); } return searchParamsObj || webviewBase; - },[searchParams,webviewBase]); + },[searchParams]); //获取当前选购的商品数据 const getData = async () => { - try { + try { + const webviewBase = webviewBaseRequest(); + const base = getBase(webviewBase); const body = { zid: parseInt(params.zid), moment_id: parseInt(params.moment_id), @@ -70,7 +71,8 @@ export default function Pay({ params }) { //获取超粉商品数据 const getSuperfanshipData = async () => { try { - const base = webviewBaseRequest(); + const webviewBase = webviewBaseRequest(); + const base = getBase(webviewBase); const body = { zid: parseInt(params.zid), product_id: "h5_zone_superfanship", From e95fbf9c167fa30d2209bdd27ae1c74537353509 Mon Sep 17 00:00:00 2001 From: al Date: Tue, 23 Jul 2024 20:11:25 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=BC=95=E7=94=A8useCallback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bill/[type]/page.jsx | 2 +- app/pay/page.jsx | 2 +- app/vip/page.jsx | 2 +- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index ddc8e14..dd4d7b2 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -1,6 +1,6 @@ "use client"; -import React, { useState, useEffect, useMemo } from "react"; +import React, { useState, useEffect, useCallback } from "react"; import { Toast } from "antd-mobile"; import { generateSignature } from "@/utils/crypto"; import webviewBaseRequest from "@/utils/webviewBaseRequest"; diff --git a/app/pay/page.jsx b/app/pay/page.jsx index fe34319..6af429b 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -1,6 +1,6 @@ "use client"; -import React, { useState, useEffect,useMemo } from "react"; +import React, { useState, useEffect,useCallback } from "react"; import { useRouter, useSearchParams } from "next/navigation"; import { Toast } from "antd-mobile"; import { generateSignature } from "@/utils/crypto"; diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 7064dad..9886e31 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -1,6 +1,6 @@ "use client"; -import React, { useState, useEffect, useMemo, useCallback } from "react"; +import React, { useState, useEffect, useCallback } from "react"; import { generateSignature } from "@/utils/crypto"; import webviewBaseRequest from "@/utils/webviewBaseRequest"; import Link from "next/link"; 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 15ea73f..416f83e 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -1,6 +1,6 @@ "use client"; -import React, { useState, useEffect, useMemo } from "react"; +import React, { useState, useEffect, useCallback } from "react"; import Divider from "@/components/Divider"; import Link from "next/link"; import { Toast, Switch } from "antd-mobile"; From 56d50eb095a423fc2a39daf35155304ad46b3588 Mon Sep 17 00:00:00 2001 From: al Date: Wed, 24 Jul 2024 13:23:44 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=BF=9B=E8=A1=8CdecodeURIComponent?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bill/[type]/page.jsx | 22 ++++++++++--------- app/pay/page.jsx | 22 ++++++++++--------- app/vip/page.jsx | 22 ++++++++++--------- .../[zid]/[product_id]/[moment_id]/page.jsx | 22 ++++++++++--------- 4 files changed, 48 insertions(+), 40 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index dd4d7b2..ec1ad34 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -13,17 +13,19 @@ export default function BillDetail({ params }) { const searchParams = useSearchParams(); const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; - if(searchParams.get("b_mid")){ + let currentBaseCode = searchParams.get("base") + if(currentBase){ + let currentBase = decodeURIComponent(currentBaseCode); searchParamsObj={}; - searchParamsObj.b_mid=searchParams.get("b_mid"); - searchParamsObj.b_did=searchParams.get("b_did"); - searchParamsObj.b_ver=searchParams.get("b_ver"); - searchParamsObj.b_dt=searchParams.get("b_dt"); - searchParamsObj.b_model=searchParams.get("b_model"); - searchParamsObj.b_nt=searchParams.get("b_nt"); - searchParamsObj.b_token=searchParams.get("b_token"); - searchParamsObj.b_ch=searchParams.get("b_ch"); - searchParamsObj.b_ts=searchParams.get("b_ts"); + searchParamsObj.b_mid=currentBase.get("b_mid"); + searchParamsObj.b_did=currentBase.get("b_did"); + searchParamsObj.b_ver=currentBase.get("b_ver"); + searchParamsObj.b_dt=currentBase.get("b_dt"); + searchParamsObj.b_model=currentBase.get("b_model"); + searchParamsObj.b_nt=currentBase.get("b_nt"); + searchParamsObj.b_token=currentBase.get("b_token"); + searchParamsObj.b_ch=currentBase.get("b_ch"); + searchParamsObj.b_ts=currentBase.get("b_ts"); } return searchParamsObj || webviewBase; },[searchParams]); diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 6af429b..2d74ebb 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -46,17 +46,19 @@ export default function Pay() { const [isFetching, setIsFetching] = useState(true); const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; - if(searchParams.get("b_mid")){ + let currentBaseCode = searchParams.get("base") + if(currentBase){ + let currentBase = decodeURIComponent(currentBaseCode); searchParamsObj={}; - searchParamsObj.b_mid=searchParams.get("b_mid"); - searchParamsObj.b_did=searchParams.get("b_did"); - searchParamsObj.b_ver=searchParams.get("b_ver"); - searchParamsObj.b_dt=searchParams.get("b_dt"); - searchParamsObj.b_model=searchParams.get("b_model"); - searchParamsObj.b_nt=searchParams.get("b_nt"); - searchParamsObj.b_token=searchParams.get("b_token"); - searchParamsObj.b_ch=searchParams.get("b_ch"); - searchParamsObj.b_ts=searchParams.get("b_ts"); + searchParamsObj.b_mid=currentBase.get("b_mid"); + searchParamsObj.b_did=currentBase.get("b_did"); + searchParamsObj.b_ver=currentBase.get("b_ver"); + searchParamsObj.b_dt=currentBase.get("b_dt"); + searchParamsObj.b_model=currentBase.get("b_model"); + searchParamsObj.b_nt=currentBase.get("b_nt"); + searchParamsObj.b_token=currentBase.get("b_token"); + searchParamsObj.b_ch=currentBase.get("b_ch"); + searchParamsObj.b_ts=currentBase.get("b_ts"); } return searchParamsObj || webviewBase; },[searchParams]); diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 9886e31..f520551 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -26,17 +26,19 @@ export default function Vip() { const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; - if(searchParams.get("b_mid")){ + let currentBaseCode = searchParams.get("base") + if(currentBase){ + let currentBase = decodeURIComponent(currentBaseCode); searchParamsObj={}; - searchParamsObj.b_mid=searchParams.get("b_mid"); - searchParamsObj.b_did=searchParams.get("b_did"); - searchParamsObj.b_ver=searchParams.get("b_ver"); - searchParamsObj.b_dt=searchParams.get("b_dt"); - searchParamsObj.b_model=searchParams.get("b_model"); - searchParamsObj.b_nt=searchParams.get("b_nt"); - searchParamsObj.b_token=searchParams.get("b_token"); - searchParamsObj.b_ch=searchParams.get("b_ch"); - searchParamsObj.b_ts=searchParams.get("b_ts"); + searchParamsObj.b_mid=currentBase.get("b_mid"); + searchParamsObj.b_did=currentBase.get("b_did"); + searchParamsObj.b_ver=currentBase.get("b_ver"); + searchParamsObj.b_dt=currentBase.get("b_dt"); + searchParamsObj.b_model=currentBase.get("b_model"); + searchParamsObj.b_nt=currentBase.get("b_nt"); + searchParamsObj.b_token=currentBase.get("b_token"); + searchParamsObj.b_ch=currentBase.get("b_ch"); + searchParamsObj.b_ts=currentBase.get("b_ts"); } return searchParamsObj || webviewBase; },[searchParams]); 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 416f83e..95f3442 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -18,17 +18,19 @@ export default function Pay({ params }) { const [isFetching, setIsFetching] = useState(true); const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; - if(searchParams.get("b_mid")){ + let currentBaseCode = searchParams.get("base") + if(currentBase){ + let currentBase = decodeURIComponent(currentBaseCode); searchParamsObj={}; - searchParamsObj.b_mid=searchParams.get("b_mid"); - searchParamsObj.b_did=searchParams.get("b_did"); - searchParamsObj.b_ver=searchParams.get("b_ver"); - searchParamsObj.b_dt=searchParams.get("b_dt"); - searchParamsObj.b_model=searchParams.get("b_model"); - searchParamsObj.b_nt=searchParams.get("b_nt"); - searchParamsObj.b_token=searchParams.get("b_token"); - searchParamsObj.b_ch=searchParams.get("b_ch"); - searchParamsObj.b_ts=searchParams.get("b_ts"); + searchParamsObj.b_mid=currentBase.get("b_mid"); + searchParamsObj.b_did=currentBase.get("b_did"); + searchParamsObj.b_ver=currentBase.get("b_ver"); + searchParamsObj.b_dt=currentBase.get("b_dt"); + searchParamsObj.b_model=currentBase.get("b_model"); + searchParamsObj.b_nt=currentBase.get("b_nt"); + searchParamsObj.b_token=currentBase.get("b_token"); + searchParamsObj.b_ch=currentBase.get("b_ch"); + searchParamsObj.b_ts=currentBase.get("b_ts"); } return searchParamsObj || webviewBase; },[searchParams]); From 8a0d02179a7a813763d433f02588aba9955b6f2a Mon Sep 17 00:00:00 2001 From: al Date: Wed, 24 Jul 2024 13:32:23 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bill/[type]/page.jsx | 11 +---------- app/pay/page.jsx | 11 +---------- app/vip/page.jsx | 11 +---------- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 11 +---------- 4 files changed, 4 insertions(+), 40 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index ec1ad34..cb685b1 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -16,16 +16,7 @@ export default function BillDetail({ params }) { let currentBaseCode = searchParams.get("base") if(currentBase){ let currentBase = decodeURIComponent(currentBaseCode); - searchParamsObj={}; - searchParamsObj.b_mid=currentBase.get("b_mid"); - searchParamsObj.b_did=currentBase.get("b_did"); - searchParamsObj.b_ver=currentBase.get("b_ver"); - searchParamsObj.b_dt=currentBase.get("b_dt"); - searchParamsObj.b_model=currentBase.get("b_model"); - searchParamsObj.b_nt=currentBase.get("b_nt"); - searchParamsObj.b_token=currentBase.get("b_token"); - searchParamsObj.b_ch=currentBase.get("b_ch"); - searchParamsObj.b_ts=currentBase.get("b_ts"); + searchParamsObj={...currentBase}; } return searchParamsObj || webviewBase; },[searchParams]); diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 2d74ebb..343ad6f 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -49,16 +49,7 @@ export default function Pay() { let currentBaseCode = searchParams.get("base") if(currentBase){ let currentBase = decodeURIComponent(currentBaseCode); - searchParamsObj={}; - searchParamsObj.b_mid=currentBase.get("b_mid"); - searchParamsObj.b_did=currentBase.get("b_did"); - searchParamsObj.b_ver=currentBase.get("b_ver"); - searchParamsObj.b_dt=currentBase.get("b_dt"); - searchParamsObj.b_model=currentBase.get("b_model"); - searchParamsObj.b_nt=currentBase.get("b_nt"); - searchParamsObj.b_token=currentBase.get("b_token"); - searchParamsObj.b_ch=currentBase.get("b_ch"); - searchParamsObj.b_ts=currentBase.get("b_ts"); + searchParamsObj={...currentBase}; } return searchParamsObj || webviewBase; },[searchParams]); diff --git a/app/vip/page.jsx b/app/vip/page.jsx index f520551..1343ea6 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -29,16 +29,7 @@ export default function Vip() { let currentBaseCode = searchParams.get("base") if(currentBase){ let currentBase = decodeURIComponent(currentBaseCode); - searchParamsObj={}; - searchParamsObj.b_mid=currentBase.get("b_mid"); - searchParamsObj.b_did=currentBase.get("b_did"); - searchParamsObj.b_ver=currentBase.get("b_ver"); - searchParamsObj.b_dt=currentBase.get("b_dt"); - searchParamsObj.b_model=currentBase.get("b_model"); - searchParamsObj.b_nt=currentBase.get("b_nt"); - searchParamsObj.b_token=currentBase.get("b_token"); - searchParamsObj.b_ch=currentBase.get("b_ch"); - searchParamsObj.b_ts=currentBase.get("b_ts"); + searchParamsObj={...currentBase}; } return searchParamsObj || webviewBase; },[searchParams]); 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 95f3442..f993794 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -21,16 +21,7 @@ export default function Pay({ params }) { let currentBaseCode = searchParams.get("base") if(currentBase){ let currentBase = decodeURIComponent(currentBaseCode); - searchParamsObj={}; - searchParamsObj.b_mid=currentBase.get("b_mid"); - searchParamsObj.b_did=currentBase.get("b_did"); - searchParamsObj.b_ver=currentBase.get("b_ver"); - searchParamsObj.b_dt=currentBase.get("b_dt"); - searchParamsObj.b_model=currentBase.get("b_model"); - searchParamsObj.b_nt=currentBase.get("b_nt"); - searchParamsObj.b_token=currentBase.get("b_token"); - searchParamsObj.b_ch=currentBase.get("b_ch"); - searchParamsObj.b_ts=currentBase.get("b_ts"); + searchParamsObj={...currentBase}; } return searchParamsObj || webviewBase; },[searchParams]); From 16e5a3cc02bec2d626e7acbbea0febc92fbd12a8 Mon Sep 17 00:00:00 2001 From: al Date: Wed, 24 Jul 2024 13:45:07 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9currentBaseCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/bill/[type]/page.jsx | 2 +- app/pay/page.jsx | 2 +- app/vip/page.jsx | 2 +- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index cb685b1..2d88c33 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -14,7 +14,7 @@ export default function BillDetail({ params }) { const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; let currentBaseCode = searchParams.get("base") - if(currentBase){ + if(currentBaseCode){ let currentBase = decodeURIComponent(currentBaseCode); searchParamsObj={...currentBase}; } diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 343ad6f..3101249 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -47,7 +47,7 @@ export default function Pay() { const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; let currentBaseCode = searchParams.get("base") - if(currentBase){ + if(currentBaseCode){ let currentBase = decodeURIComponent(currentBaseCode); searchParamsObj={...currentBase}; } diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 1343ea6..4da7c99 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -27,7 +27,7 @@ export default function Vip() { const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; let currentBaseCode = searchParams.get("base") - if(currentBase){ + if(currentBaseCode){ let currentBase = decodeURIComponent(currentBaseCode); searchParamsObj={...currentBase}; } 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 f993794..d91cb4f 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -19,7 +19,7 @@ export default function Pay({ params }) { const getBase = useCallback((webviewBase)=>{ let searchParamsObj=null; let currentBaseCode = searchParams.get("base") - if(currentBase){ + if(currentBaseCode){ let currentBase = decodeURIComponent(currentBaseCode); searchParamsObj={...currentBase}; } From 4416addc3154d32005db1105133821e7c553e8ba Mon Sep 17 00:00:00 2001 From: al Date: Wed, 24 Jul 2024 13:57:22 +0800 Subject: [PATCH 09/11] JSON.parse(currentBaseCode) --- app/bill/[type]/page.jsx | 2 +- app/pay/page.jsx | 2 +- app/vip/page.jsx | 2 +- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/bill/[type]/page.jsx b/app/bill/[type]/page.jsx index 2d88c33..eb89278 100644 --- a/app/bill/[type]/page.jsx +++ b/app/bill/[type]/page.jsx @@ -15,7 +15,7 @@ export default function BillDetail({ params }) { let searchParamsObj=null; let currentBaseCode = searchParams.get("base") if(currentBaseCode){ - let currentBase = decodeURIComponent(currentBaseCode); + let currentBase = JSON.parse(currentBaseCode); searchParamsObj={...currentBase}; } return searchParamsObj || webviewBase; diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 3101249..8fe2f16 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -48,7 +48,7 @@ export default function Pay() { let searchParamsObj=null; let currentBaseCode = searchParams.get("base") if(currentBaseCode){ - let currentBase = decodeURIComponent(currentBaseCode); + let currentBase = JSON.parse(currentBaseCode); searchParamsObj={...currentBase}; } return searchParamsObj || webviewBase; diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 4da7c99..80be7e8 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -28,7 +28,7 @@ export default function Vip() { let searchParamsObj=null; let currentBaseCode = searchParams.get("base") if(currentBaseCode){ - let currentBase = decodeURIComponent(currentBaseCode); + let currentBase = JSON.parse(currentBaseCode); searchParamsObj={...currentBase}; } return searchParamsObj || webviewBase; 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 d91cb4f..f58cb30 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -20,7 +20,7 @@ export default function Pay({ params }) { let searchParamsObj=null; let currentBaseCode = searchParams.get("base") if(currentBaseCode){ - let currentBase = decodeURIComponent(currentBaseCode); + let currentBase = JSON.parse(currentBaseCode); searchParamsObj={...currentBase}; } return searchParamsObj || webviewBase; From de8888895fe6a6f2bfc8744e3e3955136307aff3 Mon Sep 17 00:00:00 2001 From: al Date: Wed, 24 Jul 2024 14:25:56 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0from=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/pay/page.jsx | 2 +- app/vip/page.jsx | 2 +- app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pay/page.jsx b/app/pay/page.jsx index 8fe2f16..170fd8c 100644 --- a/app/pay/page.jsx +++ b/app/pay/page.jsx @@ -110,7 +110,7 @@ export default function Pay() { custom_coins: customCoin.selected ? customCoin.num : 0, pay_type: type, redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "", - from: "app", + from: searchParams.get("base")?"web":"app", }; //如果是微信jsapi支付直接跳转到中间页 diff --git a/app/vip/page.jsx b/app/vip/page.jsx index 80be7e8..0232f2a 100644 --- a/app/vip/page.jsx +++ b/app/vip/page.jsx @@ -89,7 +89,7 @@ export default function Vip() { product_id: "membership", pay_type: type, redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "", - from: "app", + from: searchParams.get("base")?"web":"app", }; //如果是微信jsapi支付直接跳转到中间页 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 f58cb30..cbc3d48 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -119,7 +119,7 @@ export default function Pay({ params }) { product_id: checked ? "h5_zone_superfanship" : params.product_id, pay_type: type, redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "", - from: "app", + from: searchParams.get("base")?"web":"app", }; setIsLoading(true); From ee2b68facc6210d32a476be41cece19264cab754 Mon Sep 17 00:00:00 2001 From: al Date: Wed, 24 Jul 2024 17:11:25 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9zonePay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + .../[zid]/[product_id]/[moment_id]/page.jsx | 41 +++++++++++-------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 8f322f0..eaaee16 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ yarn-error.log* # typescript *.tsbuildinfo next-env.d.ts + +package-lock.json \ No newline at end of file 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 cbc3d48..d5e0776 100644 --- a/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx +++ b/app/zone/pay/[zid]/[product_id]/[moment_id]/page.jsx @@ -16,15 +16,19 @@ export default function Pay({ params }) { //超粉商品数据 const [superfanshipData, setSuperfanshipData] = useState(); const [isFetching, setIsFetching] = useState(true); - const getBase = useCallback((webviewBase)=>{ - let searchParamsObj=null; - let currentBaseCode = searchParams.get("base") - if(currentBaseCode){ - let currentBase = JSON.parse(currentBaseCode); - searchParamsObj={...currentBase}; - } - return searchParamsObj || webviewBase; - },[searchParams]); + const getBase = useCallback( + (webviewBase) => { + let searchParamsObj = null; + let currentBaseCode = searchParams.get("base"); + // console.log("currentBaseCode", currentBaseCode); + if (currentBaseCode) { + let currentBase = JSON.parse(currentBaseCode); + searchParamsObj = { ...currentBase }; + } + return searchParamsObj || webviewBase; + }, + [searchParams] + ); //获取当前选购的商品数据 const getData = async () => { try { @@ -36,6 +40,7 @@ export default function Pay({ params }) { product_id: params.product_id, ...base, }; + // console.log("body1", body); const signature = generateSignature(body); const response = await fetch( `/api/zone/get_cashier?signature=${signature}`, @@ -71,6 +76,7 @@ export default function Pay({ params }) { product_id: "h5_zone_superfanship", ...base, }; + // console.log("body2", body); const signature = generateSignature(body); const response = await fetch( `/api/zone/get_cashier?signature=${signature}`, @@ -96,11 +102,11 @@ export default function Pay({ params }) { getData(); getSuperfanshipData(); }, 500); - const intervalId = setInterval(() => { - getData(); - getSuperfanshipData(); - }, 2000); - return () => clearInterval(intervalId); + // const intervalId = setInterval(() => { + // getData(); + // getSuperfanshipData(); + // }, 2000); + // return () => clearInterval(intervalId); }, []); //是否勾选购买超粉switch组件 @@ -111,7 +117,8 @@ export default function Pay({ params }) { //创建订单 const [isLoading, setIsLoading] = useState(false); const createOrder = async (type = "alipay_h5") => { - const base = webviewBaseRequest(); + const webviewBase = webviewBaseRequest(); + const base = getBase(webviewBase); const body = { ...base, zid: parseInt(params.zid), @@ -119,9 +126,9 @@ export default function Pay({ params }) { product_id: checked ? "h5_zone_superfanship" : params.product_id, pay_type: type, redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "", - from: searchParams.get("base")?"web":"app", + from: searchParams.get("base") ? "web" : "app", }; - + // console.log("body", body); setIsLoading(true); const signature = generateSignature(body);