From 0a36188b35f8036be4616a8374785c3da59f7ecd Mon Sep 17 00:00:00 2001 From: jacy <18049821889@163.com> Date: Thu, 20 Aug 2026 12:55:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin-web/src/admin.css | 23 +++++++++------------- apps/admin-web/src/pages/BigScreenPage.tsx | 14 +++++-------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/apps/admin-web/src/admin.css b/apps/admin-web/src/admin.css index 3ed57c4..c1faec6 100644 --- a/apps/admin-web/src/admin.css +++ b/apps/admin-web/src/admin.css @@ -308,14 +308,6 @@ body:has(.big-screen-page), box-sizing: border-box; } -.big-screen-list-head { - flex: 0 0 auto; - padding: 0 28px 10px 40px; - font-size: 15px; - color: rgba(170, 200, 230, 0.55); - letter-spacing: 2px; -} - .big-screen-list-body { flex: 1 1 0%; min-height: 0; @@ -460,16 +452,20 @@ body:has(.big-screen-page), } .big-screen-empty { - display: flex; - align-items: center; - justify-content: center; - height: 100%; + position: absolute; + left: 0; + right: 0; + /* 全屏高度黄金分割点(≈0.382),略偏上 */ + top: 38.2%; + transform: translateY(-50%); + z-index: 2; text-align: center; color: rgba(145, 190, 230, 0.42); - padding: 48px 40px; + padding: 0 40px; font-size: 60px; letter-spacing: 6px; font-weight: 400; + pointer-events: none; } .big-screen-fx { @@ -722,7 +718,6 @@ body:has(.big-screen-page), .big-screen-clock { font-size: 56px; } - .big-screen-list-head, .big-screen-row { grid-template-columns: minmax(140px, 20%) minmax(0, 1fr) minmax(110px, 16%) minmax(130px, 18%); font-size: 16px; diff --git a/apps/admin-web/src/pages/BigScreenPage.tsx b/apps/admin-web/src/pages/BigScreenPage.tsx index 2eb70ec..3494fe2 100644 --- a/apps/admin-web/src/pages/BigScreenPage.tsx +++ b/apps/admin-web/src/pages/BigScreenPage.tsx @@ -412,16 +412,8 @@ export default function BigScreenPage() {
-
- 订单金额 - 订单商品 - 下单时间 - 下单账号 -
- {items.length === 0 ? ( -
{loadError || '当日暂无订单'}
- ) : ( + {items.length === 0 ? null : (
+ {items.length === 0 ? ( +
{loadError || '当日暂无订单'}
+ ) : null} + {celebrate ? ( Date: Thu, 20 Aug 2026 13:41:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin-web/src/pages/BigScreenPage.tsx | 17 +++++++++++++---- .../src/modules/ops/admin-orders.service.ts | 1 - 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/apps/admin-web/src/pages/BigScreenPage.tsx b/apps/admin-web/src/pages/BigScreenPage.tsx index 3494fe2..d85e78f 100644 --- a/apps/admin-web/src/pages/BigScreenPage.tsx +++ b/apps/admin-web/src/pages/BigScreenPage.tsx @@ -41,11 +41,20 @@ function formatOrderTime(iso: string): string { } } +// function formatAmount(n: number): string { +// return Number(n || 0).toLocaleString('zh-CN', { +// minimumFractionDigits: 0, +// maximumFractionDigits: 0, +// }); +// } + function formatAmount(n: number): string { - return Number(n || 0).toLocaleString('zh-CN', { - minimumFractionDigits: 0, - maximumFractionDigits: 0, - }); + const num = Number(n || 0); + // 先保留两位小数,再分割处理 + const fixed = num.toFixed(2); + const [intStr, decStr] = fixed.split('.'); + const intFormatted = Number(intStr).toLocaleString('zh-CN'); + return decStr === '00' ? intFormatted : `${intFormatted}.${decStr}`; } function amountCssClass(payAmount: number, base: string): string { diff --git a/server/dukang-api/src/modules/ops/admin-orders.service.ts b/server/dukang-api/src/modules/ops/admin-orders.service.ts index 188b242..d440b94 100644 --- a/server/dukang-api/src/modules/ops/admin-orders.service.ts +++ b/server/dukang-api/src/modules/ops/admin-orders.service.ts @@ -32,7 +32,6 @@ export class AdminOrdersService { startOfToday.setHours(0, 0, 0, 0); const orders = await this.prisma.order.findMany({ where: { - payAmount: { gte: 100 }, payStatus: 'PAID', paidAt: { gte: startOfToday }, }, -- 2.53.0