From 7b5330e778b867d709161804be13df19964b805e Mon Sep 17 00:00:00 2001 From: zhaoxing <2558691827@qq.com> Date: Mon, 16 Nov 2026 15:26:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(consignment):=20=E5=94=AE=E4=BB=B7=E4=B8=8E?= =?UTF-8?q?=E5=B7=AE=E4=BB=B7=E5=88=86=E4=B8=A4=E8=A1=8C=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=B7=AE=E4=BB=B7=E8=A2=AB=E6=8A=98?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/ConsignmentPriceWithDiff.tsx | 22 ++++++++++++++----- ...consignment-price-with-diff-layout.test.ts | 16 ++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 apps/frontend/tests/consignment-price-with-diff-layout.test.ts diff --git a/apps/frontend/src/components/admin/ConsignmentPriceWithDiff.tsx b/apps/frontend/src/components/admin/ConsignmentPriceWithDiff.tsx index 5cbe784f..74ae161c 100644 --- a/apps/frontend/src/components/admin/ConsignmentPriceWithDiff.tsx +++ b/apps/frontend/src/components/admin/ConsignmentPriceWithDiff.tsx @@ -3,10 +3,12 @@ import { Typography } from 'antd' import { formatFenMoney, resolvePaymentPriceDiff } from '@/utils/consignment-payment-price-diff' /** - * 寄售售价 + 差价:`¥110.00(+¥20.00)`。 + * 寄售售价 + 差价:售价一行,差价另起一行。 * * 差价 = 工单用户付款金额 - 售价;正数绿、负数红、0 黄。 - * 拼单(多份售价)或用户付款未知时不显示括号。 + * 表格列宽由 PercentTable 归一化成百分比,单行放不下时浏览器会把「(+¥」拆开, + * 因此这里显式分成两行,并禁止差价折行。 + * 拼单(多份售价)或用户付款未知时不显示差价。 */ export default function ConsignmentPriceWithDiff({ userPaymentFen, @@ -19,9 +21,19 @@ export default function ConsignmentPriceWithDiff({ }) { const diff = resolvePaymentPriceDiff(userPaymentFen, salePriceFen, { sharingEnabled }) return ( - - {formatFenMoney(salePriceFen)} - {diff ? ({diff.text}) : null} + + {formatFenMoney(salePriceFen)} + {diff ? ( + {diff.text} + ) : null} ) } diff --git a/apps/frontend/tests/consignment-price-with-diff-layout.test.ts b/apps/frontend/tests/consignment-price-with-diff-layout.test.ts new file mode 100644 index 00000000..bc265414 --- /dev/null +++ b/apps/frontend/tests/consignment-price-with-diff-layout.test.ts @@ -0,0 +1,16 @@ +import assert from 'node:assert/strict' +import { readFile } from 'node:fs/promises' +import test from 'node:test' + +test('售价与差价分两行展示,差价完整不折行', async () => { + const source = await readFile( + new URL('../src/components/admin/ConsignmentPriceWithDiff.tsx', import.meta.url), + 'utf8', + ) + + // PercentTable 会把列宽归一化成百分比,单行放不下时会把「(+¥」拆开,必须显式分行。 + assert.ok(source.includes("flexDirection: 'column'"), '售价与差价必须垂直排列') + assert.ok(source.includes("whiteSpace: 'nowrap'"), '售价与差价都必须禁止折行') + assert.ok(source.includes('fontSize: 12'), '差价字号应小于售价') + assert.ok(!source.includes('({diff.text})'), '差价不再使用全角括号包裹') +})