14 Commits

Author SHA1 Message Date
jacy fa69ced448 Merge pull request 'Dev v3.5.6' (#39) from dev into main
CI / verify (push) Waiting to run
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/39
2026-08-23 16:43:51 +08:00
jacy 18c5abea79 Merge pull request 'v3.5.5版本合并' (#37) from dev into main
CI / verify (push) Waiting to run
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/37
2026-08-23 12:30:04 +08:00
jacy 5d4ed566de merge(dev): HQ product list as SPU with expandable SKUs
CI / verify (push) Has been cancelled
2026-08-21 23:52:41 +08:00
jacy 5fdddae41c merge(dev): v3.5.4 规格主图与门店使用规则
CI / verify (push) Has been cancelled
2026-08-21 17:37:20 +08:00
jacy 22c0b03a47 Merge pull request 'Dev' (#35) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/35
2026-08-21 16:24:07 +08:00
jacy f2d03e2595 Merge pull request 'v3.5.4' (#33) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/33
2026-08-21 15:50:30 +08:00
jacy 0c28c204b2 Merge pull request 'Dev' (#31) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/31
2026-08-20 20:23:20 +08:00
jacy e7f49a9639 Merge pull request 'v3.5.3版本更新1' (#28) from dev_jacy into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/28
2026-08-20 18:55:18 +08:00
jacy f941dcf072 Merge pull request 'Dev' (#27) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/27
2026-08-20 15:06:24 +08:00
jacy 3382d36a6c Merge pull request 'Dev jacy 大屏优化' (#24) from dev_jacy into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/24
2026-08-20 13:43:06 +08:00
jacy 9b8e3f1347 Merge pull request 'v3.5.2 大屏调整' (#23) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/23
2026-08-20 12:01:21 +08:00
jacy 1440a59fc8 Merge pull request 'Dev' (#21) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/21
2026-08-20 00:54:54 +08:00
jacy 11659484c6 Merge pull request 'v3.5.1 版本更新' (#19) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/19
2026-08-19 16:01:31 +08:00
jacy 0fb7ab7abb Merge pull request 'v3.4.18' (#17) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/17
2026-08-17 23:45:19 +08:00
6 changed files with 6 additions and 62 deletions
+1 -1
View File
@@ -463,7 +463,7 @@ export default function HomePage() {
<div className="shop-home-stat">
<p className="shop-home-stat-label"></p>
<p className="shop-home-stat-label"></p>
<p className="shop-home-stat-value">
+3 -1
View File
@@ -196,7 +196,9 @@ export default function RecordsPage() {
</div>
<p className="shop-record-time">
:{' '}
{new Date(String(r.createdAt)).toLocaleString('zh-CN', { hour12: false })}
{new Date(String(r.createdAt))
.toLocaleString('zh-CN', { hour12: false })
.slice(0, 16)}
</p>
<p className="shop-record-channel">
<span
-1
View File
@@ -26,7 +26,6 @@
| 3.5.4 | 08-21 | 商品 SPU+SKU 规格;DK 码/独立 69 码/规格主图;下单兼容回落;发票品类;权益文案与门店详情/收银台 UI;客户端版本号 | [`v3.5.4`](./杜康好客-v3.5.4-开发文档.md) |
| 3.5.5 | 08-23 | HQ 订单监控导出 Excel/PDF + 列表页布局优化 | [`v3.5.5`](./杜康好客-v3.5.5-开发文档.md) |
| 3.5.6 | 08-23 | HQ 任务导出;核销/财务银行信息;工单图片入任务;运营去调试;门店审核全屏 | [`v3.5.6`](./杜康好客-v3.5.6-开发文档.md) |
| 3.5.7 | 08-23 | 门店端核销记录时间显示秒;首页「今日核销金额」文案 | [`v3.5.7`](./杜康好客-v3.5.7-开发文档.md) |
---
-2
View File
@@ -61,11 +61,9 @@
| 3.5.4 | [`商品规格 SPU+SKU + 发票/文案 UI`](./杜康好客-v3.5.4-开发文档.md) | ✅ 生产(weapp 版本号需单独上传) |
| 3.5.5 | [`HQ 订单导出 + 订单监控页优化`](./杜康好客-v3.5.5-开发文档.md) | 🔶 开发完成,待发版 |
| 3.5.6 | [`HQ 任务导出/财务银行信息/工单图片/运营去调试/审核全屏`](./杜康好客-v3.5.6-开发文档.md) | ✅ 已交付 |
| 3.5.7 | [`门店核销记录时间秒 + 今日核销金额文案`](./杜康好客-v3.5.7-开发文档.md) | 🔶 开发完成 |
| 日期 | 说明 |
|------|------|
| 2026-08-23 | v3.5.7:门店核销记录时间显示秒;首页「今日到账金额」→「今日核销金额」 |
| 2026-08-23 | v3.5.6:开发计划任务导出;核销/财务银行信息与打款凭证;工单图片入任务;运营去调试;门店审核全屏 |
| 2026-08-23 | HQ 订单监控:筛选/勾选导出 Excel(xlsx)与 PDF`POST /admin/orders/export` |
| 2026-08-21 | v3.5.4 发生产:规格表/回填 SKU/DK 码/主图列/发票品类;H5+API 200 |
-50
View File
@@ -1,50 +0,0 @@
# 杜康好客 · v3.5.7 开发文档
> **2026-08-23** · h5-shop
> **主题**:门店端核销页两处 UI 修复(记录时间显示秒、首页统计文案)
---
## 1. 版本目标
1. **核销记录** 列表「核销时间」显示到秒(不再截断到分钟)。
2. **门店首页** 统计卡片「今日到账金额」改为「今日核销金额」,与 `todayAmount`(当日券面核销额合计)语义一致。
**不做**:后端 API / 结算逻辑;提现页时间格式;小程序版本号;`pages/shop/` 原型。
---
## 2. 功能清单
| 工单 | 项 | 说明 |
|------|----|------|
| DPT-20260821-935 | 核销记录时间 | `RecordsPage.tsx` 去掉 `.slice(0, 16)`,保留 `toLocaleString('zh-CN', { hour12: false })` |
| DPT-20260821-796 | 首页统计文案 | `HomePage.tsx` 标签「今日到账金额」→「今日核销金额」 |
---
## 3. 关键路径
| 域 | 路径 |
|----|------|
| 核销记录 | `apps/h5-shop/src/pages/RecordsPage.tsx` |
| 门店首页 | `apps/h5-shop/src/pages/HomePage.tsx` |
---
## 4. 发版步骤
| 步骤 | 动作 |
|------|------|
| 1 | `pnpm build`h5-shop |
| 2 | 发 `h5-shop` 静态资源 |
无 Prisma 迁移、无 API 变更。
---
## 5. 验收清单
- [ ] 门店首页统计区显示「今日核销金额」,金额仍为当日券面合计
- [ ] 核销记录页每条「核销时间」含秒(如 `2026/8/23 18:48:30`
- [ ] 打款时间、金额列、筛选与 Tab 行为无回归
@@ -48,14 +48,9 @@ function formatBenefitBrief(order: {
return '';
}
/** 导出给运营看的时间:按上海时区,避免 toISOString() 落成 UTC(少 8 小时) */
function formatShanghaiDateTime(value: Date): string {
return value.toLocaleString('sv-SE', { timeZone: 'Asia/Shanghai' });
}
export function formatExportDateTime(value?: Date | null): string {
if (!value) return '';
return formatShanghaiDateTime(value);
return value.toISOString().slice(0, 19).replace('T', ' ');
}
export function mapOrderToExportRow(order: {
@@ -211,6 +206,6 @@ export async function buildOrdersPdf(rows: OrderExportRow[]): Promise<Buffer> {
}
export function buildExportFilename(format: 'xlsx' | 'pdf', count: number): string {
const stamp = formatShanghaiDateTime(new Date()).slice(0, 10);
const stamp = new Date().toISOString().slice(0, 10);
return `订单导出_${stamp}_${count}条.${format}`;
}