diff --git a/src/components/bill/list.tsx b/src/components/bill/list.tsx index 0934c7d..ca6c704 100644 --- a/src/components/bill/list.tsx +++ b/src/components/bill/list.tsx @@ -95,7 +95,7 @@ export const BillList: React.FC = (props) => { { title: t('bill.title_pay_amount'), dataIndex: 'pay_amount', - width: 150, + width: 190, render: (_, record) => { if (record.service_charge && record.service_charge > 0) { @@ -112,13 +112,13 @@ export const BillList: React.FC = (props) => { { title: t('bill.title_actual_payment_amount'), dataIndex: 'actual_payment_amount', - width: 120, + width: 150, render: (_) => (), }, { title: t('bill.title_pay_method'), dataIndex: 'pay_method', - width: 120, + width: 130, render: (_, {payment_method, payment_channel}) => (payment_channel?(
{payment_channel}
diff --git a/src/i18n/translations/en.json b/src/i18n/translations/en.json index 66e4185..3d53ad8 100644 --- a/src/i18n/translations/en.json +++ b/src/i18n/translations/en.json @@ -24,13 +24,13 @@ "download-qr-code": "Download QR Code", "download_receipt": "Download receipt", "pay_status": "Bill Status", - "pay_status_canceled": "Canceled", - "pay_status_paid": "Paid", - "pay_status_pending": "Pending", + "pay_status_canceled": "CANCELLED", + "pay_status_paid": "PAID", + "pay_status_pending": "PENDING", "query_amount_current_page": "The total amount of current page", "query_amount_total": "The total Amount", - "reconciliation_status_pending": "Pending", - "reconciliation_status_submitted": "Checked", + "reconciliation_status_pending": "UNCHECKED", + "reconciliation_status_submitted": "CHECKED", "require_student_number": "Search Student Number", "title_actual_payment_amount": "Actually Paid", "title_amount": "Amount", diff --git a/src/pages/pay/component/start-asia-pay.tsx b/src/pages/pay/component/start-asia-pay.tsx index 522b4a9..44d03bf 100644 --- a/src/pages/pay/component/start-asia-pay.tsx +++ b/src/pages/pay/component/start-asia-pay.tsx @@ -26,8 +26,7 @@ export const StartAsiaPay: React.FC<{ bill: BillModel }> = ({bill}) => { return (
- {/*state.pay?.payment_amount || */} - + diff --git a/vite.config.ts b/vite.config.ts index 64f224f..627f84a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -28,7 +28,7 @@ export default defineConfig(({mode}) => { port:10086, proxy: { '/api': { - target: 'http://43.136.175.109:50000', // + target: 'http://43.136.175.109', // changeOrigin: true, //rewrite: (path) => path.replace(/^\/api/, '') }