feat: 非精油产品显示份、新增护肤品价目 #30

Merged

hera merged 28 commits from fix/next-batch-4 into main 2026-04-13 19:26:58 +00:00

Conversation 28 Commits 28 Files Changed 13 +410 -94

hera commented 2026-04-13 14:25:51 +00:00

Owner

Copy Link

Summary

• drop_count=1 的产品显示"份"而非"滴"（中文份/英文portion）
• 配方卡片、个人配方、库存、去重提示均生效

🤖 Generated with Claude Code

## Summary - drop_count=1 的产品显示"份"而非"滴"（中文份/英文portion） - 配方卡片、个人配方、库存、去重提示均生效 🤖 Generated with [Claude Code](https://claude.com/claude-code)

hera added 1 commit 2026-04-13 14:25:52 +00:00

feat: 非精油产品(drop_count=1)显示"份"而非"滴" ... 67d268bc92

oils store新增 unitLabel/unitLabelPlural，根据 dropCount 判断：
- 精油(dropCount>1): 滴/drop
- 护肤品等(dropCount=1): 份/portion
影响: 配方卡片、个人配方、库存匹配、去重提示

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 14:27:06 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 14:42:45 +00:00

feat: 含护肤品的配方卡片显示容量（从备注提取ml/克，否则显示"调配"） ... fba66b42c2

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 14:43:16 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 14:48:12 +00:00

feat: 护肤品用ml单位，精油用滴，通过unit字段区分 ... a3bf13c58d

- 后端: oils表新增unit列(drop/ml)，API返回unit字段
- 前端: 根据unit='ml'显示ml单位，精油显示滴/drop
- 护肤品drop_count改为实际ml容量，成本按用量比例计算
  如玫瑰护手霜100ml ¥135，配方用30ml → 成本¥40.5

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 14:48:40 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 14:57:23 +00:00

feat: ml产品全局适配 — 编辑器/价目/详情统一显示ml单位 ... 9f072e48f8

- 编辑器: 表头改为"成分/用量/单价"，每行显示对应单位(滴/ml)
- 精油价目: ml产品显示"总容量Xml"和"每ml价格"，精油保持"每滴"
- 知识卡片/配方详情: 单位跟随产品类型
- 精油的"每ml价格"行对ml产品隐藏（已是ml单位）

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 14:57:54 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 15:07:43 +00:00

fix: 导出isMlUnit函数，修复精油价目页点击报错 ... b28b1c7f62

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 15:08:15 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 15:10:40 +00:00

fix: 精油详情去掉每ml价格行，只保留每滴价格 ... 9beddc387a

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 15:11:11 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 15:13:39 +00:00

fix: 精油价目恢复原始显示(每滴/每ml/每颗)，ml产品用新显示 ... 7abc219659

精油: 总滴数 + 每滴价格 + 每ml价格（和之前一样）
植物空胶囊: /颗（和之前一样）
ml产品: 总容量Xml + 每ml价格（新）

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 15:14:07 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 15:19:34 +00:00

fix: 精油详情面板重排 — 总容量(5ml/93滴)+会员每滴+零售每滴 ... 395e837de8

精油: 总容量(Xml/X滴) → 会员价 → 每滴价格 → 零售价 → 零售每滴价格
ml产品: 总容量(Xml) → 会员价 → 每ml价格
配方列表单位跟随产品类型

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 15:20:03 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 15:29:44 +00:00

fix: 植物空胶囊详情显示每颗价格 ... 371aa74c31

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 15:30:12 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 15:31:01 +00:00

fix: 植物空胶囊全局显示"颗"(capsule)，配方卡片/编辑器/价目统一 ... 7bcb1d1a5b

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 15:31:29 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 16:10:37 +00:00

feat: 通用单位系统 — drop/ml/g/capsule，去掉硬编码 ... eeb9b0aa88

unit字段支持4种值，所有显示自动适配：
- drop: 精油(滴/drop)
- ml: 液体产品(ml)
- g: 膏霜产品(g)
- capsule: 胶囊(颗/capsule)
新增产品选单位即可，无需改代码。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 16:11:08 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 16:25:15 +00:00

fix: 配方成分显示和导出使用动态单位，重复提示改为"修改用量" ... 42993d47ee

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 16:25:45 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 16:30:48 +00:00

feat: 新增产品表单(ml/g/颗)+配方卡片显示产品容量 ... 30bb69f52c

- 精油价目新增分两个tab：新增精油(标准容量) / 新增其他产品(ml/g/颗)
- saveOil支持unit参数
- 配方卡片：含产品的配方直接显示产品用量+单位(如30g)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 16:31:18 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 16:32:59 +00:00

fix: 新增tab文案精简为"精油"和"其他" ... 7af83b96ca

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 16:33:28 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 16:35:21 +00:00

fix: 新增tab样式对齐，改为inline-flex紧凑布局 ... 0451633bf5

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 16:35:52 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 17:10:37 +00:00

fix: tab和表单改为上下布局，解决对齐问题 ... 4df02edc53

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 17:11:13 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 17:12:50 +00:00

fix: clean up tab style e28f5f9c0f

hera commented 2026-04-13 17:13:20 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 17:14:45 +00:00

fix: add-oil-form强制flex column确保tab和表单分两行 ... c19f6e8276

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 17:15:15 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 17:19:36 +00:00

fix: 配方卡片容量按单位分组求和，支持混合单位(30g+100ml) ... 5f1ead03ab

- 有椰子油: 单次 / Xml（不变）
- 无椰子油有产品: 同单位求和，不同单位用+连接
- 示例: 一个配方含30g面霜+100ml护手霜 → 显示"30g+100ml"

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 17:20:08 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 17:23:33 +00:00

fix: 管理配方容量显示支持产品，混合g/ml统一显示ml ... 13b675e63d

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 17:24:05 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 17:31:07 +00:00

feat: 配方volume字段存储编辑器选择的容量 ... 74a8d9aeb6

- 后端: recipes表新增volume列，API返回/保存volume
- 前端: 保存时发送formVolume，编辑时优先用stored volume
- 容量显示优先级: stored volume > 椰子油计算 > 产品ml求和
- 修复编辑器容量选择保存后不生效的bug

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 17:31:37 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 18:17:46 +00:00

fix: eoDrops变量提到volume分支外，修复编辑配方报错 ... 24e8aea39c

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 18:18:16 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 18:19:37 +00:00

fix: OilReference最后2处@click.self改为@mousedown.self，拖选不误关 ... ad65d7a8a9

全局已无@click.self弹窗关闭，统一使用@mousedown.self。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 18:20:08 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 18:21:02 +00:00

fix: 切换到单次模式时自动重置椰子油滴数（>30滴→10滴） ... d54f807e60

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera added 1 commit 2026-04-13 18:21:24 +00:00

revert: 不自动重置椰子油滴数，以用户输入为准 ... e300a151cc

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 18:21:34 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera commented 2026-04-13 18:21:49 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 18:23:43 +00:00

fix: loadRecipes映射volume字段，卡片才能读到stored volume ... 2e8a8815a8

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 18:24:15 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-13 18:30:28 +00:00

feat: 拼音子序列匹配+产品名拼音补全+滴数框缩窄 ... 0924ea9940

- 拼音匹配支持子序列(js匹配紧致霜)，排序: 前缀>子串>子序列
- 补全产品名拼音(身紧致霜膏膜等)
- 滴数输入框从65/70px缩至50px

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera added 1 commit 2026-04-13 18:34:19 +00:00

test: PR30测试 — 子序列匹配、单位系统、volume优先级 + 拼音补字 ... ad9cc57d00

新增12个测试: pinyinMatchScore、产品名拼音、单位映射、volume优先级
更新2个旧测试适配substring/subsequence匹配
补全拼音: 面、湿

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 18:34:53 +00:00

Author

Owner

Copy Link

🚀 Preview: https://pr-30.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-30.oil.oci.euphon.net DB is a copy of production.

hera merged commit ad9cc57d00 into main 2026-04-13 19:26:58 +00:00

hera commented 2026-04-13 19:27:15 +00:00

Author

Owner

Copy Link

🗑️ Preview torn down.

🗑️ Preview torn down.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

yoyo hera

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: hera/oil-formula-calculator#30