Browse Source

fix bug

master
Anna Ho 1 year ago
parent
commit
6996a4c58a
2 changed files with 4 additions and 13 deletions
  1. +2
    -8
      src/pages/Payment/Card/index.js
  2. +2
    -5
      src/pages/Payment/PaymentSuccess.js

+ 2
- 8
src/pages/Payment/Card/index.js View File

@@ -40,7 +40,6 @@ const Index = () => {


const [paymentData, setPaymentData] = React.useState({}); const [paymentData, setPaymentData] = React.useState({});
const [onReady, setOnReady] = React.useState(false); const [onReady, setOnReady] = React.useState(false);
const [redirecturl, setRedirectUrl] = React.useState("");
// const [paymentstatuscode, setPaymentstatuscode] = React.useState(""); // const [paymentstatuscode, setPaymentstatuscode] = React.useState("");
// const [fpsqrcodeurl, setFpsqrcodeurl] = React.useState(""); // const [fpsqrcodeurl, setFpsqrcodeurl] = React.useState("");
// const pasgPath = 'https://fps.payapps.hkicl.com.hk'; //PRD // const pasgPath = 'https://fps.payapps.hkicl.com.hk'; //PRD
@@ -59,15 +58,11 @@ const Index = () => {


React.useEffect(() => { React.useEffect(() => {
if (Object.keys(paymentData).length > 0){ if (Object.keys(paymentData).length > 0){
setOnReady(true);
loadForm(); loadForm();
} }
}, [paymentData]); }, [paymentData]);


React.useEffect(() => {
setOnReady(true);
}, [redirecturl]);


const loadForm = () => { const loadForm = () => {
const timeoutdatetime = "2023-10-26T09:04:30Z[UTC]" const timeoutdatetime = "2023-10-26T09:04:30Z[UTC]"
const convertedDateString = timeoutdatetime.replace("[UTC]", ""); const convertedDateString = timeoutdatetime.replace("[UTC]", "");
@@ -104,8 +99,7 @@ const Index = () => {
"redirecturl": "<redirecturl>" "redirecturl": "<redirecturl>"
} }
*/ */
setRedirectUrl(responseData.redirecturl);
window.open(redirecturl);
window.open(responseData.redirecturl);
} }
}); });
} }


+ 2
- 5
src/pages/Payment/PaymentSuccess.js View File

@@ -65,7 +65,7 @@ const Index = () => {
<Grid item xs={12} width="100%"> <Grid item xs={12} width="100%">
<div style={BackgroundHead} width="100%"> <div style={BackgroundHead} width="100%">
<Stack direction="row" height='70px'> <Stack direction="row" height='70px'>
<Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}>公共啟事: 付款</Typography>
<Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}>公共啟事:完成付款</Typography>
</Stack> </Stack>
</div> </div>
</Grid> </Grid>
@@ -73,10 +73,7 @@ const Index = () => {
<Grid item xs={12} md={12} > <Grid item xs={12} md={12} >
<Grid container justifyContent="flex-start" alignItems="center" > <Grid container justifyContent="flex-start" alignItems="center" >
<center> <center>
<Grid item xs={12} md={8} >
<Typography variant="h2" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
公共啟事:完成付款
</Typography>
<Grid item xs={12} md={12} >


<Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}> <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
付款成功 付款成功


Loading…
Cancel
Save