feat: 商业核算+个人库存+认证优化 #23

Merged

hera merged 14 commits from feat/inventory-commercial into main 2026-04-11 10:47:08 +00:00

Conversation 16 Commits 14 Files Changed 8 +602 -213

hera commented 2026-04-10 22:35:33 +00:00

Owner

Copy Link

商业核算页面重做、个人库存配方匹配修复、套装按钮、认证流程优化

商业核算页面重做、个人库存配方匹配修复、套装按钮、认证流程优化

hera commented 2026-04-10 22:35:53 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-10 22:47:34 +00:00

feat: 商业核算+个人库存+认证优化 ... 3dd75f34c0

商业核算:
- 加标语和示意项目（芳香调理），所有人可体验
- 管理员开放（不需认证）
- 新增项目需认证，未认证提示

个人库存:
- 搜索直接添加（回车或点击）
- 4个套装快捷按钮（家庭医生/居家呵护3988/芳香调理/全精油）
- 精油库默认折叠
- 配方匹配排除椰子油，降低门槛（至少1种匹配）

商业认证:
- 简化为商户名+证明图片
- 通过后内容仍显示（和二维码页面一致）
- 审核中内容不可修改

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

hera commented 2026-04-10 22:48:08 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-10 23:06:44 +00:00

feat: 消耗分析+认证修复+套装更新+认证简化 ... c4005f229e

商业核算:
- 芳香调理技术作为体验项目，使用真实配方数据
- 新增消耗分析：每种精油可做次数、哪个最先消耗完、最多可做几次

个人库存:
- 芳香调理套装改为正确精油列表

商业认证:
- 简化为商户名+证明图片
- 通过后内容保持显示
- 用户管理页面根据用户实际认证状态显示（修复拒绝后又通过仍显示已拒绝）

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

hera commented 2026-04-10 23:07:18 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 09:32:54 +00:00

fix: 商业核算体验项目优化 ... d041c8ed6f

- 使用数据库中的真实芳香调理技术项目作为体验
- 去掉重复的项目，demo从项目列表隔离
- 非管理员：精油部分灰色只读，价格计算可修改，本地保存不影响其他人
- 管理员：可修改精油名称、滴数、添加精油（同步到数据库）
- 消耗分析：每种精油可做次数、最先消耗完提示

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

hera commented 2026-04-11 09:33:29 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 09:48:49 +00:00

UI: 去掉定价框+工具栏醒目+冻结 ... b7315219c7

- 去掉重复的定价框（用下面的售价）
- 工具栏绿色背景+底边框，视觉独立
- 下拉时工具栏sticky冻结在顶部

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

hera commented 2026-04-11 09:49:23 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 09:56:19 +00:00

UI: 预览环境显示构建时间 + 售价默认299 ... d3e3b89701

- 预览栏显示部署时间（如 04/11 10:05）
- 售价默认299
- vite构建时注入__BUILD_TIME__

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

hera commented 2026-04-11 09:56:46 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:00:04 +00:00

UI: 消耗分析移到配方总成本下面 ... 51e70e5bca

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

hera commented 2026-04-11 10:00:36 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:10:25 +00:00

UI: 商业核算排版优化 ... cfe93125ac

- 消耗分析：同时用完不显示"最先消耗完"，去掉"最多"
- 项目卡片：鼠标悬停显示删除按钮
- 表头：精油/用量/每滴/小计，避免手机换行
- 删除按钮缩小
- 价格计算：标签和值间距缩短
- 构建时间改为英国时区

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

hera commented 2026-04-11 10:11:08 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:16:59 +00:00

UI: 价格+利润左右并排，总成本对齐表格列 ... a5178f83f9

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

hera commented 2026-04-11 10:17:30 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:21:20 +00:00

UI: 价格框靠右缩小，利润卡片有边框，示例隐藏导入 ... c12590039b

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

hera commented 2026-04-11 10:21:52 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:24:23 +00:00

UI: 价格值对齐输入框+点击清零 ... c728bb7259

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

hera commented 2026-04-11 10:24:54 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:27:38 +00:00

UI: 手机端表格紧凑，用量框窄，删除键更小 ... 798147627f

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

hera commented 2026-04-11 10:28:08 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:31:01 +00:00

UI: 批量总收入移到批量总利润上面 ... 4f3f39967c

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

hera commented 2026-04-11 10:31:35 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:34:43 +00:00

fix: 新项目售价299和批量1持久化到后端 ... c58b925ab4

- 后端存储selling_price/packaging_cost/labor_cost/other_cost/quantity到pricing字段(JSON)
- 加载时解析并返回给前端
- 新建时也保存这些字段

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

hera commented 2026-04-11 10:35:10 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera added 1 commit 2026-04-11 10:44:56 +00:00

test: PR#23新增单元测试（13个） ... 83078f8f8b

- 套装定义：家庭医生10种、居家呵护21种、芳香调理8种
- 配方匹配：排除椰子油、至少1种匹配、全匹配
- 消耗分析：计算次数、最先消耗完、全部相同
- 项目定价：JSON序列化和反序列化

全部通过: 204 unit + 36 e2e

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

hera commented 2026-04-11 10:45:29 +00:00

Author

Owner

Copy Link

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

DB is a copy of production.

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

hera merged commit 83078f8f8b into main 2026-04-11 10:47:08 +00:00

hera commented 2026-04-11 10:47:23 +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#23