修改zonePay

This commit is contained in:
al 2024-07-24 17:11:25 +08:00
parent de8888895f
commit ee2b68facc
2 changed files with 26 additions and 17 deletions

2
.gitignore vendored
View File

@ -33,3 +33,5 @@ yarn-error.log*
# typescript # typescript
*.tsbuildinfo *.tsbuildinfo
next-env.d.ts next-env.d.ts
package-lock.json

View File

@ -16,15 +16,19 @@ export default function Pay({ params }) {
// //
const [superfanshipData, setSuperfanshipData] = useState(); const [superfanshipData, setSuperfanshipData] = useState();
const [isFetching, setIsFetching] = useState(true); const [isFetching, setIsFetching] = useState(true);
const getBase = useCallback((webviewBase)=>{ const getBase = useCallback(
let searchParamsObj=null; (webviewBase) => {
let currentBaseCode = searchParams.get("base") let searchParamsObj = null;
if(currentBaseCode){ let currentBaseCode = searchParams.get("base");
let currentBase = JSON.parse(currentBaseCode); // console.log("currentBaseCode", currentBaseCode);
searchParamsObj={...currentBase}; if (currentBaseCode) {
} let currentBase = JSON.parse(currentBaseCode);
return searchParamsObj || webviewBase; searchParamsObj = { ...currentBase };
},[searchParams]); }
return searchParamsObj || webviewBase;
},
[searchParams]
);
// //
const getData = async () => { const getData = async () => {
try { try {
@ -36,6 +40,7 @@ export default function Pay({ params }) {
product_id: params.product_id, product_id: params.product_id,
...base, ...base,
}; };
// console.log("body1", body);
const signature = generateSignature(body); const signature = generateSignature(body);
const response = await fetch( const response = await fetch(
`/api/zone/get_cashier?signature=${signature}`, `/api/zone/get_cashier?signature=${signature}`,
@ -71,6 +76,7 @@ export default function Pay({ params }) {
product_id: "h5_zone_superfanship", product_id: "h5_zone_superfanship",
...base, ...base,
}; };
// console.log("body2", body);
const signature = generateSignature(body); const signature = generateSignature(body);
const response = await fetch( const response = await fetch(
`/api/zone/get_cashier?signature=${signature}`, `/api/zone/get_cashier?signature=${signature}`,
@ -96,11 +102,11 @@ export default function Pay({ params }) {
getData(); getData();
getSuperfanshipData(); getSuperfanshipData();
}, 500); }, 500);
const intervalId = setInterval(() => { // const intervalId = setInterval(() => {
getData(); // getData();
getSuperfanshipData(); // getSuperfanshipData();
}, 2000); // }, 2000);
return () => clearInterval(intervalId); // return () => clearInterval(intervalId);
}, []); }, []);
//switch //switch
@ -111,7 +117,8 @@ export default function Pay({ params }) {
// //
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const createOrder = async (type = "alipay_h5") => { const createOrder = async (type = "alipay_h5") => {
const base = webviewBaseRequest(); const webviewBase = webviewBaseRequest();
const base = getBase(webviewBase);
const body = { const body = {
...base, ...base,
zid: parseInt(params.zid), zid: parseInt(params.zid),
@ -119,9 +126,9 @@ export default function Pay({ params }) {
product_id: checked ? "h5_zone_superfanship" : params.product_id, product_id: checked ? "h5_zone_superfanship" : params.product_id,
pay_type: type, pay_type: type,
redirect_url: type === "yeepay_wxpay_h5" ? window.location.href : "", 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); setIsLoading(true);
const signature = generateSignature(body); const signature = generateSignature(body);