diff --git a/src/pages/Payment/Details_Public/index.js b/src/pages/Payment/Details_Public/index.js index 2a13ffb..9d1dd65 100644 --- a/src/pages/Payment/Details_Public/index.js +++ b/src/pages/Payment/Details_Public/index.js @@ -37,7 +37,7 @@ const Index = () => { const navigate = useNavigate() const intl = useIntl(); - const [record, setRecord] = React.useState(); + const [record, setRecord] = React.useState({}); const [itemList, setItemList] = React.useState([]); const [onReady, setOnReady] = React.useState(false); const [onDownload, setOnDownload] = React.useState(false); @@ -51,7 +51,9 @@ const Index = () => { }, []); React.useEffect(() => { - setOnReady(true); + if (Object.keys(record).length > 0) { + setOnReady(true); + } }, [record]); // const handleResize = () => { @@ -94,6 +96,7 @@ const Index = () => { responseData2.paymentItemList.data["transTimeStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "HH:mm:ss"); setItemList(responseData2.paymentItemList) setRecord(responseData2.data); + location.reload() }, onError: function(){ responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY"); diff --git a/src/utils/statusUtils/PaymentStatus.js b/src/utils/statusUtils/PaymentStatus.js index 2bf1223..08eae20 100644 --- a/src/utils/statusUtils/PaymentStatus.js +++ b/src/utils/statusUtils/PaymentStatus.js @@ -21,6 +21,6 @@ function getStatus(params) { if(status == "REJT") return REJT; if(status == "CANC") return CANC; if(status == "INPR") return INPR; - return CANC; + return INPR; }