hera/oil-formula-calculator
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: hera:841550dcb90069faa073ae29eac34525837c2e76
Branches Tags
hera:main hera:feat/oil-plan-membership hera:feat/english-search hera:feat/ci-fixes hera:feat/inventory-commercial hera:feat/polish hera:feat/more-improvements hera:feat/next-improvements hera:feat/permissions-ui-improvements hera:fix/search-swipe-notify hera:fix/logout-redirect-protected-pages hera:fix/ui-polish-round2 hera:feature/qr-upload-hint hera:fix/save-oil-translations hera:fix/save-to-diary-custom-dialog hera:dev hera:fix/volume-rounding
..
compare: hera:ad95ba7d1f1945c711921ec52d803514702792e3
Branches Tags
hera:feat/oil-plan-membership hera:feat/english-search hera:main hera:feat/ci-fixes hera:feat/inventory-commercial hera:feat/polish hera:feat/more-improvements hera:feat/next-improvements hera:feat/permissions-ui-improvements hera:fix/search-swipe-notify hera:fix/logout-redirect-protected-pages hera:fix/ui-polish-round2 hera:feature/qr-upload-hint hera:fix/save-oil-translations hera:fix/save-to-diary-custom-dialog hera:dev hera:fix/volume-rounding

18 Commits
841550dcb9 ... ad95ba7d1f

Author SHA1 Message Date
Hera Zhao
ad95ba7d1f UI: 添加精油直接加空行，去掉确认取消按钮
All checks were successful
Deploy Production / test (push) Successful in 5s
Details
Deploy Production / deploy (push) Successful in 6s
Details
Test / unit-test (push) Successful in 4s
Details
PR Preview / teardown-preview (pull_request) Has been skipped
Details
Test / build-check (push) Successful in 4s
Details
Test / e2e-test (push) Successful in 55s
Details
PR Preview / test (pull_request) Successful in 4s
Details
PR Preview / deploy-preview (pull_request) Successful in 9s
Details 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:27 +00:00
Hera Zhao
c63091b504 UI: 全选按钮左置+颜色区分、placeholder浅色、应用到配方 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:27 +00:00
Hera Zhao
6931df4afd feat: 编辑器对齐+审核记录+UI调整 
- 新增/编辑配方编辑器与配方卡片编辑界面完全一致（含容量与稀释）
- 自定义滴数/稀释比例框缩小，应用按钮放在稀释比例同一行
- 管理员可查看所有审核记录（采纳/拒绝历史）
- 标签筛选和全选按钮对所有用户可见
- 我的配方/公共配方库均可折叠
- viewer 看配方卡片无编辑按钮
- diary 配方卡片无编辑按钮
- 退出登录跳转首页并刷新
- 新增 /api/recipe-reviews 端点

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:27 +00:00
Hera Zhao
6f9c5732eb feat: 管理配方加共享按钮+状态+贡献统计 
- 我的配方每行加📤共享按钮
- 显示共享状态：已共享(绿)/等待审核(橙)
- 已共享的隐藏共享按钮
- 非管理员显示"已贡献 X 条"统计
- 配方查询页去掉共享按钮（移到管理配方）

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:13 +00:00
Hera Zhao
cf07f6b60d fix: 我的配方加共享按钮 + 管理员显示版本号 
- 我的配方卡片右上角加📤共享按钮，已共享/审核中显示状态标签
- 管理员账号标题下显示版本号和日期

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:13 +00:00
Hera Zhao
e26cd700b9 fix: 智能识别配方名称 + 新增默认保存到个人配方 
- 修复空格/无分隔符时配方名称无法识别的问题
- 支持"长高芳香调理8永久花10"连写格式自动分离名称
- 所有用户新增配方默认保存到个人配方（diary），不进公共库

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:13 +00:00
Hera Zhao
56bc6f2bbb feat: 重写新增配方+共享审核完整流程 
新增配方:
- 修复保存失败（oil→oil_name字段转换）
- 智能识别支持多条配方同时解析
- 识别结果逐条预览，可修改/放弃/保存单条/全部保存
- 编辑器加成分表格（单价/滴、小计、总成本）
- 保存到个人配方（diary）

共享审核:
- 新增 /api/recipes/{id}/reject 端点（带原因通知提交者）
- 采纳配方时通知提交者"配方已采纳"
- 拒绝时管理员输入原因
- 贡献统计含被采纳的配方数

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:13 +00:00
Hera Zhao
3c3ce30b48 feat: 共享配方审核完整流程 
- 新增 /api/recipes/{id}/reject 端点：拒绝配方并通知提交者（含原因）
- 采纳配方时通知提交者"配方已采纳"
- 管理员拒绝配方时输入原因
- 贡献统计改为统计被采纳的配方数（含 audit_log 记录）
- 完整流程测试：共享→通知→拒绝(带原因)→通知→重新共享→采纳→通知

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:13 +00:00
Hera Zhao
50cf9d3e9b feat: 商业认证完整流程 + 通知时间过滤 
商业认证:
- 申请页重写：商户名+说明字段，显示审核中/被拒/已通过状态
- 被拒绝显示原因，可重新申请
- 管理员拒绝时输入原因
- 商业核算页未认证用户点详情弹认证提示，跳转认证页面
- 删除项目仅管理员可见

通知:
- 只显示用户注册后的通知，避免角色变更后看到旧通知
- 搜索未收录通知只发管理员和高级编辑者

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:13 +00:00
Hera Zhao
1d424984e0 feat: 权限细化、商业认证跳转、UI改进 
权限:
- viewer 管理配方页只显示我的配方，隐藏公共配方库和工具栏
- 高级编辑者可看到精油价目信息不全的红色提示
- 商业核算删除按钮仅管理员可见
- 搜索未收录通知只发管理员和高级编辑者

Tab 可见性:
- 所有用户可见：配方查询、管理配方、个人库存、精油价目、商业核算
- 需登录的 tab 点击弹登录框，登录后跳转
- 操作日志/Bug/用户管理仅管理员可见

商业核算:
- 未认证用户可看项目列表，点详情提示去认证
- 跳转到我的账户页商业认证区域并自动滚动

其他:
- 我的配方和收藏配方默认折叠

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-10 09:32:13 +00:00
Hera Zhao
a8e91dc384 feat: 权限修复、搜索改进、滑动切换、通知badge
All checks were successful
Deploy Production / test (push) Successful in 4s
Details
Test / unit-test (push) Successful in 4s
Details
Test / build-check (push) Successful in 4s
Details
PR Preview / deploy-preview (pull_request) Has been skipped
Details
PR Preview / test (pull_request) Has been skipped
Details
PR Preview / teardown-preview (pull_request) Successful in 13s
Details
Deploy Production / deploy (push) Successful in 7s
Details
Test / e2e-test (push) Successful in 52s
Details 
权限:
- viewer 不能编辑公共配方（前端+后端双重限制）
- viewer 管理配方页只显示"我的配方"
- 取消 token 链接登录，改为自注册+管理员分配角色
- 用户管理页去掉创建用户和复制链接，禁止设管理员
- 修复改权限 API 路径错误

搜索:
- 模糊匹配+同义词扩展（37组），精确/相似分层
- 精确匹配不搜精油成分（避免"西班牙牛至"污染）
- 所有搜索结果底部加"通知编辑添加"按钮

UI:
- 顶部 tab 栏按用户角色显示，切换时居中滚动
- 左右滑动按 visibleTabs 顺序切换 tab
- 用户名旁红色通知数 badge

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 21:31:17 +00:00
Hera Zhao
27c46cb803 feat: 大量管理配方和搜索改进 
- 存为我的：修复调用错误API，改用 diaryStore.createDiary
- 存为我的：同名检测（我的配方 + 公共配方库）
- 我的配方：使用 RecipeCard 统一卡片格式
- 管理配方：按钮缩小、编辑时隐藏智能粘贴、精油搜索框支持拼音跳转
- 管理配方：批量操作改为按钮组（打标签/删除/导出卡片/分享到公共库）
- 管理配方：我的配方加勾选框、全选按钮、编辑功能
- 搜索：模糊匹配 + 同义词扩展（37组），精确/相似分层显示
- 搜索：无匹配时通知编辑添加，搜索时隐藏无匹配的收藏/我的配方区
- 搜索：配方按首字母排序
- 共享审核：通知高级编辑+管理员，我的配方显示共享状态
- 通知：搜索未收录→已添加按钮，审核类→去审核按钮跳转
- 贡献统计：非管理员显示已贡献公共配方数
- 登录弹窗：加反馈问题按钮（无需登录）
- 精油编辑：右上角加保存按钮，支持回车保存
- 后端：新增 /api/me/contribution 接口

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 21:31:17 +00:00
Hera Zhao
80397ec7ca fix: 关闭按钮用 force click 绕过遮挡 + 放宽每滴价格上限到 300 
- close button 用 .detail-close-btn + force:true 避免被 login modal 遮挡
- 部分高端精油每滴价格超 100，上限调至 300

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 21:31:17 +00:00
Hera Zhao
19eeb7ba9a fix: 测试加 dismissModals 关闭登录弹窗 + 改用 should('exist') 
CI 中 login-body 覆盖 detail-overlay 导致 visible 检查失败。
改为 exist 断言 + 自动关闭 login/dialog 弹窗。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 21:31:17 +00:00
Hera Zhao
cf5b974ae1 fix: 修复 rebase 后重复 clearBrandImage 声明 + 测试加 dismissDialog 
- 删除 MyDiary.vue 重复的 clearBrandImage 函数（rebase 遗留）
- 测试加 dismissDialog() 关闭 CI 中 API 错误弹出的 dialog

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 21:31:17 +00:00
Hera Zhao
b0d82d4ff7 fix: 修复 recipe-detail 测试选择器和按钮文本 
- [class*="detail"] → .detail-overlay 避免匹配多余元素
- 导出图片 → 保存图片（匹配当前 UI）
- admin 编辑测试加入按钮存在性检查，token 失效时不崩溃

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 21:31:17 +00:00
Hera Zhao
54003bc466 fix: 搜索过滤收藏、拼音首字母匹配、清除图片、滑动切换、通知已读 
1. 搜索时收藏配方也按关键词过滤，不匹配的隐藏
2. 编辑配方添加精油时支持拼音首字母匹配（如xyc→薰衣草）
3. 品牌设置页清除图片立即保存到后端，不需点保存按钮
4. 左右滑动切换tab，轮播区域内滑动切换图片不触发tab切换
5. 通知列表每条未读通知加"已读"按钮，调用POST /api/notifications/{id}/read

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-04-09 21:31:17 +00:00
YoYo
b764ff7ea3 fix: 退出登录后在受保护页面跳转到配方查询页面
Some checks failed
PR Preview / test (pull_request) Has been skipped
Details
Deploy Production / test (push) Successful in 5s
Details
Test / unit-test (push) Successful in 5s
Details
PR Preview / teardown-preview (pull_request) Successful in 14s
Details
PR Preview / deploy-preview (pull_request) Has been skipped
Details
Test / build-check (push) Successful in 4s
Details
Deploy Production / deploy (push) Successful in 5s
Details
Test / e2e-test (push) Failing after 1m14s
Details 
在 router/index.js 中为需要登录才能访问的路由（manage、inventory、
projects、mydiary、audit、bugs、users）添加 meta.requiresAuth 标记。

在 UserMenu.vue 的 handleLogout() 中检查当前路由是否需要登录，
如果是则 router.push('/') 跳回配方查询页，否则原地 reload。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-09 18:48:51 +00:00
1 changed files with 7 additions and 0 deletions
Expand all files Collapse all files

7
frontend/src/router/index.js
View File

@@ -10,11 +10,13 @@ const routes = [
path: '/manage', path: '/manage',
name: 'RecipeManager', name: 'RecipeManager',
component: () => import('../views/RecipeManager.vue'), component: () => import('../views/RecipeManager.vue'),
meta: { requiresAuth: true },
}, },
{ {
path: '/inventory', path: '/inventory',
name: 'Inventory', name: 'Inventory',
component: () => import('../views/Inventory.vue'), component: () => import('../views/Inventory.vue'),
meta: { requiresAuth: true },
}, },
{ {
path: '/oils', path: '/oils',
@@ -25,26 +27,31 @@ const routes = [
path: '/projects', path: '/projects',
name: 'Projects', name: 'Projects',
component: () => import('../views/Projects.vue'), component: () => import('../views/Projects.vue'),
meta: { requiresAuth: true },
}, },
{ {
path: '/mydiary', path: '/mydiary',
name: 'MyDiary', name: 'MyDiary',
component: () => import('../views/MyDiary.vue'), component: () => import('../views/MyDiary.vue'),
meta: { requiresAuth: true },
}, },
{ {
path: '/audit', path: '/audit',
name: 'AuditLog', name: 'AuditLog',
component: () => import('../views/AuditLog.vue'), component: () => import('../views/AuditLog.vue'),
meta: { requiresAuth: true },
}, },
{ {
path: '/bugs', path: '/bugs',
name: 'BugTracker', name: 'BugTracker',
component: () => import('../views/BugTracker.vue'), component: () => import('../views/BugTracker.vue'),
meta: { requiresAuth: true },
}, },
{ {
path: '/users', path: '/users',
name: 'UserManagement', name: 'UserManagement',
component: () => import('../views/UserManagement.vue'), component: () => import('../views/UserManagement.vue'),
meta: { requiresAuth: true },
}, },
] ]