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]);