project/chuhai-payment-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
LittleBoy 2024-06-22 21:38:58 +08:00
parent 9095b4d9b1
commit e3c9e81fa8
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/bill/list.tsx
View File

@ -95,7 +95,7 @@ export const BillList: React.FC<BillListProps> = (props) => {
{ {
title: t('bill.title_pay_amount'), title: t('bill.title_pay_amount'),
dataIndex: 'pay_amount', dataIndex: 'pay_amount',
width: 150, width: 190,
render: (_, record) => { render: (_, record) => {
if (record.service_charge && record.service_charge > 0) { if (record.service_charge && record.service_charge > 0) {
@ -112,13 +112,13 @@ export const BillList: React.FC<BillListProps> = (props) => {
{ {
title: t('bill.title_actual_payment_amount'), title: t('bill.title_actual_payment_amount'),
dataIndex: 'actual_payment_amount', dataIndex: 'actual_payment_amount',
width: 120, width: 150,
render: (_) => (<MoneyFormat money={_}/>), render: (_) => (<MoneyFormat money={_}/>),
}, },
{ {
title: t('bill.title_pay_method'), title: t('bill.title_pay_method'),
dataIndex: 'pay_method', dataIndex: 'pay_method',
width: 120, width: 130,
render: (_, {payment_method, payment_channel}) => (payment_channel?( render: (_, {payment_method, payment_channel}) => (payment_channel?(
<div> <div>
{payment_channel}<br/> {payment_channel}<br/>

10
src/i18n/translations/en.json
View File

@ -24,13 +24,13 @@
"download-qr-code": "Download QR Code", "download-qr-code": "Download QR Code",
"download_receipt": "Download receipt", "download_receipt": "Download receipt",
"pay_status": "Bill Status", "pay_status": "Bill Status",
"pay_status_canceled": "Canceled", "pay_status_canceled": "CANCELLED",
"pay_status_paid": "Paid", "pay_status_paid": "PAID",
"pay_status_pending": "Pending", "pay_status_pending": "PENDING",
"query_amount_current_page": "The total amount of current page", "query_amount_current_page": "The total amount of current page",
"query_amount_total": "The total Amount", "query_amount_total": "The total Amount",
"reconciliation_status_pending": "Pending", "reconciliation_status_pending": "UNCHECKED",
"reconciliation_status_submitted": "Checked", "reconciliation_status_submitted": "CHECKED",
"require_student_number": "Search Student Number", "require_student_number": "Search Student Number",
"title_actual_payment_amount": "Actually Paid", "title_actual_payment_amount": "Actually Paid",
"title_amount": "Amount", "title_amount": "Amount",

3
src/pages/pay/component/start-asia-pay.tsx
View File

@ -26,8 +26,7 @@ export const StartAsiaPay: React.FC<{ bill: BillModel }> = ({bill}) => {
return (<form name="payFormCard" method="post" action={state.pay?.pay_url || ''}> return (<form name="payFormCard" method="post" action={state.pay?.pay_url || ''}>
<input type="hidden" name="merchantId" value={state.pay?.merchantId || ''}/> <input type="hidden" name="merchantId" value={state.pay?.merchantId || ''}/>
{/*state.pay?.payment_amount || */} <input type="hidden" name="amount" value={state.pay?.payment_amount}/>
<input type="hidden" name="amount" value={'0.01'}/>
<input type="hidden" name="orderRef" value={state.pay?.merchant_ref}/> <input type="hidden" name="orderRef" value={state.pay?.merchant_ref}/>
<input type="hidden" name="currCode" value={state.pay?.currCode || ''}/> <input type="hidden" name="currCode" value={state.pay?.currCode || ''}/>
<input type="hidden" name="mpsMode" value={state.pay?.mpsMode || ''}/> <input type="hidden" name="mpsMode" value={state.pay?.mpsMode || ''}/>

2
vite.config.ts
View File

@ -28,7 +28,7 @@ export default defineConfig(({mode}) => {
port:10086, port:10086,
proxy: { proxy: {
'/api': { '/api': {
target: 'http://43.136.175.109:50000', // target: 'http://43.136.175.109', //
changeOrigin: true, changeOrigin: true,
//rewrite: (path) => path.replace(/^\/api/, '') //rewrite: (path) => path.replace(/^\/api/, '')
} }