xiaoquan/rent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 Settlement 类型字段名称不匹配
Deploy / deploy (push) Failing after 1m40s
Details

Browse Source 
- orderAmount → totalAmount
- settlementAmount → actualAmount
- settledAt → paidAt

与 @rent/shared-types 中的类型定义保持一致
This commit is contained in:
xiaoquan
2026-06-10 19:53:51 +08:00
parent 85547d7043
commit d3b7db90e7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/merchant-admin/src/pages/finance/Settlements.tsx
+4 -4
View File
@@ -213,21 +213,21 @@ const Settlements: React.FC = () => {
{detailModal.data.periodStart} ~ {detailModal.data.periodEnd} {detailModal.data.periodStart} ~ {detailModal.data.periodEnd}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="订单数量">{detailModal.data.orderCount} 笔</Descriptions.Item> <Descriptions.Item label="订单数量">{detailModal.data.orderCount} 笔</Descriptions.Item>
<Descriptions.Item label="订单总额">{formatMoney(detailModal.data.orderAmount)}</Descriptions.Item> <Descriptions.Item label="订单总额">{formatMoney(detailModal.data.totalAmount)}</Descriptions.Item>
<Descriptions.Item label="平台服务费"> <Descriptions.Item label="平台服务费">
<span style={{ color: '#ff4d4f' }}>{formatMoney(detailModal.data.serviceFee)}</span> <span style={{ color: '#ff4d4f' }}>{formatMoney(detailModal.data.serviceFee)}</span>
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="结算金额"> <Descriptions.Item label="结算金额">
<span style={{ fontWeight: 'bold', color: '#52c41a' }}> <span style={{ fontWeight: 'bold', color: '#52c41a' }}>
{formatMoney(detailModal.data.settlementAmount)} {formatMoney(detailModal.data.actualAmount)}
</span> </span>
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="状态"> <Descriptions.Item label="状态">
<SettlementStatusTag status={detailModal.data.status} /> <SettlementStatusTag status={detailModal.data.status} />
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="创建时间">{formatDateTime(detailModal.data.createdAt)}</Descriptions.Item> <Descriptions.Item label="创建时间">{formatDateTime(detailModal.data.createdAt)}</Descriptions.Item>
{detailModal.data.settledAt && ( {detailModal.data.paidAt && (
<Descriptions.Item label="结算时间">{formatDateTime(detailModal.data.settledAt)}</Descriptions.Item> <Descriptions.Item label="结算时间">{formatDateTime(detailModal.data.paidAt)}</Descriptions.Item>
)} )}
</Descriptions> </Descriptions>
)} )}