368 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hera Zhao	e8af6e2565	fix: Excel 导出英文名也直接取 DB meta.enName ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-16 11:01:19 +00:00
Hera Zhao	c04bb53ddd	fix: 精油编辑统一保存到 DB + 导出 Excel 增加功效列 ... - 新增 oil_cards 表，持久化知识卡片（功效/用法/方法/注意/emoji） - POST /api/oils 扩展接受 card_* 字段，在同一事务里 upsert oil_cards - GET /api/oil-cards 返回全部卡片 - 前端 getOilCard 优先查 DB，再 fallback 静态表 - saveEditOil 统一走 saveOil，不再分两套保存 - 精油价目 Excel 导出增加「功效」列 - 首次部署自动从静态 OIL_CARDS 播种到 oil_cards 表 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-16 10:56:30 +00:00
fam	8f004a02cd	Merge branch 'main' into feat/search-recipes-by-oil	2026-04-15 21:08:19 +00:00
Hera Zhao	50751ed9be	ci: retrigger after backend crash flake	2026-04-15 21:03:25 +00:00
Hera Zhao	f34dd49dcb	feat: 配方查询支持按精油名搜索 ... 输入精油中文名/英文名会返回含该精油的所有配方。 中文查询 ≥2 字才匹配精油，避免「草」这样的单字噪音。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-15 20:47:59 +00:00
Hera Zhao	ed8d49d9a0	fix: 多项修复 — 滴数框/零售价显示/精油英文名保存/再次审核通知 ... 1. 编辑配方的滴数输入框从 42px 加宽到 58px，确保 50.5 不被 spinner 遮挡 2. 配方卡片在零售价==会员价时也显示零售价（之前因 retail>cost 过滤掉） 3. 精油价目英文名保存后被静态 OIL_CARDS 覆盖，把 getEnglishName 的优先级改 为先用 DB meta.enName，解决温柔呵护/仕女呵护等显示不更新的问题 4. 再次审核 tag 的配方被非管理员修改时，给管理员发通知，内容含前后 diff 5. 对应 vitest + cypress 测试各一组 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-15 10:39:19 +00:00
Hera Zhao	bf29551a31	ci: retrigger after Batch 2 timeout flake	2026-04-15 10:05:21 +00:00
Hera Zhao	a8c9c2252f	fix: hourly-backup 改用 python sqlite3 API 做一致性备份 ... 镜像里没有 sqlite3 CLI，原来的 .backup 命令 15 天前就静默失败了。 daily-minio-backup 用 cp 就够，但 hourly 每小时跑要求更强一致性， 改用 Python 内置 sqlite3 的 .backup() API。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-15 09:56:40 +00:00
Hera Zhao	6baecfc2bf	ci: retrigger after Batch 3 timeout flake	2026-04-15 09:10:44 +00:00
fam	a0de8fa7f3	Merge branch 'main' into feat/kit-export-volume	2026-04-15 08:54:54 +00:00
Hera Zhao	0ce14352f1	feat: 套装方案对比导出时配方名后附容量 ... 形如「某配方（100ml）」。full/simple/横向对比三个 sheet 都带上。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 23:03:05 +00:00
Hera Zhao	2dca4d13b9	fix: 导出 Excel 合并「单价」为一列，值形如 ¥X.XX/ml|g|颗|滴 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 22:37:57 +00:00
Hera Zhao	a28ba1ef57	feat: 精油价目导出改为 Excel（.xlsx） ... - 按钮从「导出PDF」改「导出Excel」，动态 import xlsx - 列：精油/英文名/会员价/零售价/容量/单价/状态 - 文件名：精油价目表YYYY-MM-DD.xlsx - 新增 e2e（按钮可见 + 点击出 toast） Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 22:31:15 +00:00
Hera Zhao	fef28330f0	ci: 将 oil-smart-paste.cy.js 加入 Batch 3 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 20:58:01 +00:00
Hera Zhao	27418695a5	test: 智能识别与英文名搜索的单测 + e2e ... - 将粘贴解析抽到 useOilProductPaste composable - 8 条 vitest 覆盖价格/规格/中英文名/类型判断 - 2 条 cypress 覆盖 UI 填充（产品 100ml、精油 15ml） - 补英文名搜索 e2e；旧 search 用例 placeholder 选择器宽松化 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 20:45:16 +00:00
Hera Zhao	1053cf9140	feat: 价目搜索支持英文名（card.en / meta.enName / 静态表） ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 20:27:56 +00:00
Hera Zhao	1613b54bc6	feat: 精油价目新增「智能识别」，粘贴产品信息自动填充字段 ... 识别优惠顾客价/零售价/规格/中英文名，自动切精油或其他产品 tab。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 20:20:18 +00:00
Hera Zhao	9fc89cdb74	fix: 导出文件名改为「精油配方备份+日期」 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 20:04:05 +00:00
Hera Zhao	cca7dd4471	fix: demo-walkthrough移到Batch2(10个spec)，Batch3减到15个 ... Batch3跑16个spec时内存累积导致最后一个超时。均衡分配。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 19:12:25 +00:00
Hera Zhao	7fbf5586b5	fix: price-display不再打开配方详情(html2canvas CI卡死) ... 改为验证卡片价格格式，配方详情价格已由recipe-detail覆盖。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 18:54:48 +00:00
Hera Zhao	f8d368a03a	ci: retry e2e tests	2026-04-14 18:40:18 +00:00
Hera Zhao	317ea3a2b6	test: 分享文本和消耗分析动态单位测试 ... 新增2个测试: 分享文本各成分用正确单位、消耗分析用量/容量单位 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 18:09:08 +00:00
Hera Zhao	18a74df083	fix: 补全剩余硬编码单位 — 配方分享文本和商业核算消耗分析 ... - RecipeDetailOverlay: 分享文本 ing.drops滴 → unitLabel - Projects: 消耗分析 每滴→单价, drops滴→unitLabel Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 17:47:35 +00:00
Hera Zhao	2330ce1f2c	test: PR34测试 — 产品编辑表单单位切换逻辑 ... 新增8个测试: 单位判断、表单初始化、保存参数、标签适配 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 17:42:01 +00:00
Hera Zhao	c9af05219b	fix: 打开新增/编辑配方时重新加载oils，确保新增产品可搜索 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 17:21:15 +00:00
Hera Zhao	e30891d3d2	feat: 非精油产品编辑页面适配 — 容量输入框+单位下拉(ml/g/颗) ... - 编辑弹窗根据unit类型显示不同UI：精油用标准容量下拉，其他产品用数字+单位选择 - 标签"精油名称"/"产品名称"自动切换 - 保存时传unit参数 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 17:11:50 +00:00
Hera Zhao	9e11270fbf	fix: visual-check去掉cy.screenshot和cy.wait，改为纯功能断言 ... cy.screenshot()在CI headless环境超时。截图是视觉检查本地跑即可。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 16:39:51 +00:00
Hera Zhao	cccf0091ba	fix: 不在打开卡片时自动跑html2canvas，改为保存时按需生成 ... 根本原因: html2canvas在CI headless Electron环境会无限挂起， 导致recipe-detail测试卡死。改为只在用户点"保存图片"时才生成。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 16:10:43 +00:00
Hera Zhao	5ebffb8da4	fix: demo-walkthrough拆成3个小测试，去掉wait和不稳定选择器 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 15:47:58 +00:00
Hera Zhao	3953218e41	fix: CI e2e分3批跑全部32个spec，每批新启Electron释放内存 ... Batch1: API/数据测试(8个) Batch2: UI流程测试(9个) Batch3: 其他测试(15个，含demo-walkthrough) 每批5分钟超时，总共不超过15分钟，避免内存累积导致崩溃。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 15:32:59 +00:00
Hera Zhao	c7d86b909a	fix: CI排除4个内存密集型spec，防止Electron崩溃 ... recipe-detail/manage-recipes/visual-check/demo-walkthrough在CI内存有限 环境下容易卡死。排除后剩28个spec在600秒内可完成。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 15:28:39 +00:00
Hera Zhao	06b29e6446	fix: CI e2e超时加到15分钟，job timeout 20分钟 ... 26/32 spec在600秒内通过，需要更多时间跑完剩余6个。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 14:22:21 +00:00
Hera Zhao	3043d4d6c4	fix: CI e2e超时加到10分钟，job timeout 12分钟 ... 31个spec全部通过但420秒跑不完32个，加到600秒。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 14:07:24 +00:00
Hera Zhao	9ba0f6e9b5	test: PR33测试 — 品牌元素显示逻辑、volumeLabel参数、PDF单价单位 ... 新增4个测试: 品牌数据决定卡片元素、空品牌显示plain、volumeLabel双参数、PDF单价适配 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 13:55:09 +00:00
Hera Zhao	8a49938929	feat: 精油知识卡片加品牌元素 + 导出PDF修复 ... - 知识卡片: QR码(右上角)+品牌名+背景图+Logo - 导出PDF: volumeLabel传name参数修复，单价列适配单位 - 导入api模块修复品牌数据加载 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 13:53:24 +00:00
Hera Zhao	ccf96d54cd	fix: e2e测试原价成本→单买成本 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 13:22:07 +00:00
Hera Zhao	b1df23c04b	test: PR32测试 — 配件价值、折扣率、套装成本低于单买 ... 新增8个测试: - 4个配件价值验证(芳香无配件/家庭475/居家585/全精油795) - 折扣率<1、全精油≈0.69、大套装折扣更好 - 套装成本≤单买成本 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 13:16:48 +00:00
Hera Zhao	91e77cbb42	fix: 全精油套装配件含2个竹木架，375+210×2=795 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 13:10:10 +00:00
Hera Zhao	2f02636920	fix: 竹木架价格200→210，配件总值575→585 ... 居家呵护和全精油套装的旋转竹木精油架实际价格210元。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 13:08:52 +00:00
Hera Zhao	142ad88cff	fix: 居家呵护套装精油数量22→23，修复单元测试 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 12:59:53 +00:00
Hera Zhao	72347493d7	feat: 套装卡片显示折扣率（会员价后再X折） ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 12:55:01 +00:00
Hera Zhao	0e3bbf3ba7	fix: 导出列宽 — 配方名自适应，其他列统一窄宽度，成分列35 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 12:30:06 +00:00
Hera Zhao	b21e798db2	fix: 居家呵护套装补充仕女呵护 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 11:15:11 +00:00
Hera Zhao	d68934a952	fix: 芳香调理套装去掉错误的配件价值(无配件) ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 11:12:58 +00:00
Hera Zhao	9206272a68	fix: 原价成本→单买成本，导出简版加可做次数和单买成本列 ... 页面: 原价成本改为单买成本 导出简版: 配方名+可做次数+套装成本+单买成本+售价+利润率 导出完整版: 增加可做次数列，原价成本→单买成本 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 10:55:59 +00:00
Hera Zhao	f03bf699e5	fix: 配方保存时持久化volume字段，套装对比页复用容量显示逻辑 ... saveRecipe payload 漏传 selectedVolume 导致编辑器选择的容量从未写入数据库； 套装方案对比页改用与 RecipeCard 一致的 volumeLabel 计算逻辑。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 10:42:26 +00:00
Hera Zhao	616e51f36c	test: 套装方案对比功能的单元测试和e2e测试 ... 单元测试(21个): 套装配置验证、油名解析、折扣率计算、配方匹配逻辑 e2e测试(16个): 页面加载、权限控制、套装卡片、配方表格、横向对比、导出按钮 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 00:16:45 +00:00
Hera Zhao	15424a5ad9	fix: 全精油套装 DDR完美修护 改为系统名称 完美修护 ... 全精油折扣率: 套装¥17700 / (油¥24860 + 配件¥575) = 30.4% Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 00:12:00 +00:00
Hera Zhao	385022002b	fix: 套装折扣改为统一折扣率，配件和精油共享同一折扣 ... 折扣率 = 套装价 / (油瓶总价 + 配件零售价) 芳香调理32.4%, 家庭医生32.8%, 居家呵护36.1% Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 00:11:00 +00:00
Hera Zhao	796e3c7a7e	fix: 芳香调理套装价格修正为¥1575 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-14 00:08:31 +00:00