憲報第6號副刊公告
{isORGLoggedIn()?<>Care Of: {params.row.careOf}
>:null}
申請編號: {appNo}
憲報日期: {DateUtils.dateStr_Cht(params.row.issueDate)}
diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js
index 48ab879..df5b2a6 100644
--- a/src/pages/Payment/FPS/FPS.js
+++ b/src/pages/Payment/FPS/FPS.js
@@ -11,6 +11,7 @@ import { useNavigate } from "react-router-dom";
import FpsIcon from "assets/images/icons/fps.svg";
import { useLocation } from 'react-router-dom';
import {paymentPath} from "auth/utils";
+import {currencyFormat} from "utils/FormatUtils";
// import {poll} from "utils/Utils";
import Loadable from 'components/Loadable';
@@ -257,9 +258,9 @@ const Index = () => {
- 支付金額
+ 付款總額
- {"$HK " + paymentData.amount}
+ {"HK$ " + currencyFormat(paymentData.amount)}
{browserType==mobileBrowser?
@@ -280,13 +281,13 @@ const Index = () => {
- {paymentId}
+ {"["+paymentId+"]"}
二維碼有效期限3分鐘
請在規定時間內完成付款流程
- {"剩餘時間:"+timeDownCount}
+ {"剩餘時間: "+timeDownCount}
}
diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js
index 8c94675..0ab344d 100644
--- a/src/pages/Payment/MultiPaymentWindow.js
+++ b/src/pages/Payment/MultiPaymentWindow.js
@@ -173,7 +173,7 @@ const MultiPaymentWindow = (props) => {
- 已選擇付款方式:
+ 已選擇付款方法:
@@ -231,12 +231,12 @@ const MultiPaymentWindow = (props) => {
- 交易參考號: {transactionData.transactionid}
+ 交易參考編號: {transactionData.transactionid}
-
+ {/*
支付金額: HK$ {FormatUtils.currencyFormat(props.totalAmount)}
-
+ */}
{!props.onReady ?
:content
@@ -247,12 +247,12 @@ const MultiPaymentWindow = (props) => {
- 付款金額:
+ 付款總額(HK$):
- {"HK$ " + FormatUtils.currencyFormat(props.totalAmount)}
+ {" HK$ " + FormatUtils.currencyFormat(props.totalAmount)}
diff --git a/src/pages/Payment/index.js b/src/pages/Payment/index.js
index 3134492..e0e64b8 100644
--- a/src/pages/Payment/index.js
+++ b/src/pages/Payment/index.js
@@ -433,6 +433,15 @@ const Index = () => {
sx={{ mt: 4 }}
>付款
+
{/*row 2*/}
diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js
index b4fec8a..4fa0e19 100644
--- a/src/pages/Proof/Payment/Pay.js
+++ b/src/pages/Proof/Payment/Pay.js
@@ -134,11 +134,11 @@ const Index = () => {
確認付款
- 總計金額: {FormatUtils.currencyFormat(fee)}
+ 總額(HK$): {FormatUtils.currencyFormat(fee)}
-
+
diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index 2b22348..ffe3012 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -437,7 +437,7 @@ const ApplicationDetailCard = (
- 價錢:
+ 金額(HK$):
@@ -571,11 +571,11 @@ const ApplicationDetailCard = (
確認付款
- 總計金額: {FormatUtils.currencyFormat(fee)}
+ 總額(HK$): {FormatUtils.currencyFormat(fee)}
-
+
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index 7f35bb0..31b29bd 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -211,7 +211,7 @@ export default function SubmittedTab({ rows }) {
totalAmount += datas[i].fee;
}
content.push(
- 總計金額: HK$ {FormatUtils.currencyFormat(totalAmount)}
+ 總額(HK$): {FormatUtils.currencyFormat(totalAmount)}
);
//setAmount(totalAmount);
return content;
@@ -312,7 +312,7 @@ export default function SubmittedTab({ rows }) {
-
+