diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts index c0b52073a..e0524886c 100644 --- a/apps/web-antd/src/adapter/vxe-table.ts +++ b/apps/web-antd/src/adapter/vxe-table.ts @@ -326,8 +326,7 @@ setupVbenVxeTable({ }, }); - // TODO @xingyu:这个要不叫 formatAmount2 这种?虽然不直观,但是容易看出来是金额; - vxeUI.formats.add('formatFraction', { + vxeUI.formats.add('formatAmount2', { tableCellFormatMethod({ cellValue }) { if (cellValue === null || cellValue === undefined) { return '0.00'; diff --git a/apps/web-antd/src/views/mall/product/spu/data.ts b/apps/web-antd/src/views/mall/product/spu/data.ts index bd1050fee..6ceb265ea 100644 --- a/apps/web-antd/src/views/mall/product/spu/data.ts +++ b/apps/web-antd/src/views/mall/product/spu/data.ts @@ -74,7 +74,7 @@ export function useGridColumns( { field: 'price', title: '价格', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { field: 'salesCount', diff --git a/apps/web-antd/src/views/mall/trade/afterSale/data.ts b/apps/web-antd/src/views/mall/trade/afterSale/data.ts index 859ba6d83..fbe685f19 100644 --- a/apps/web-antd/src/views/mall/trade/afterSale/data.ts +++ b/apps/web-antd/src/views/mall/trade/afterSale/data.ts @@ -99,7 +99,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns { { field: 'refundPrice', title: '订单金额', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { field: 'user.nickname', diff --git a/apps/web-antd/src/views/mall/trade/order/data.ts b/apps/web-antd/src/views/mall/trade/order/data.ts index 14b8d25c5..3e0265320 100644 --- a/apps/web-antd/src/views/mall/trade/order/data.ts +++ b/apps/web-antd/src/views/mall/trade/order/data.ts @@ -170,7 +170,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns { { field: 'payPrice', title: '实际支付', - formatter: 'formatFraction', + formatter: 'formatAmount2', minWidth: 180, }, { diff --git a/apps/web-antd/src/views/member/user/components/user-balance-list.vue b/apps/web-antd/src/views/member/user/components/user-balance-list.vue index e560e9032..295e7bfbd 100644 --- a/apps/web-antd/src/views/member/user/components/user-balance-list.vue +++ b/apps/web-antd/src/views/member/user/components/user-balance-list.vue @@ -23,12 +23,12 @@ const [Grid] = useVbenVxeGrid({ { field: 'price', title: '交易金额', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { field: 'balance', title: '钱包余额', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { field: 'createTime', diff --git a/apps/web-antd/src/views/pay/refund/data.ts b/apps/web-antd/src/views/pay/refund/data.ts index 9a02febef..6241cd10a 100644 --- a/apps/web-antd/src/views/pay/refund/data.ts +++ b/apps/web-antd/src/views/pay/refund/data.ts @@ -96,12 +96,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'payPrice', title: '支付金额', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { field: 'refundPrice', title: '退款金额', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { field: 'status', diff --git a/apps/web-antd/src/views/pay/wallet/balance/data.ts b/apps/web-antd/src/views/pay/wallet/balance/data.ts index 7476cdd45..59d064c5e 100644 --- a/apps/web-antd/src/views/pay/wallet/balance/data.ts +++ b/apps/web-antd/src/views/pay/wallet/balance/data.ts @@ -54,22 +54,22 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { title: '余额', field: 'balance', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { title: '累计支出', field: 'totalExpense', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { title: '累计充值', field: 'totalRecharge', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { title: '冻结金额', field: 'freezePrice', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { title: '创建时间', diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts b/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts index 79e6d7c33..d365a6f73 100644 --- a/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts +++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/data.ts @@ -89,12 +89,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'payPrice', title: '支付金额', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { field: 'bonusPrice', title: '赠送金额', - formatter: 'formatFraction', + formatter: 'formatAmount2', }, { field: 'status',