test: 新增PR#22相关单元测试

新增12个测试:
- 标签排序和EDITOR_ONLY_TAGS过滤
- Recipe数据格式（oil_name覆盖oil的bug验证）
- loadRecipes映射验证
- 容量检测（single/5/10/15/20/30/custom）
- 稀释比例计算和snap到最近选项

全部通过: 191 unit + 36 e2e

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

backend/database.py

@@ -163,6 +163,8 @@ def init_db():
         c.execute("ALTER TABLE users ADD COLUMN brand_bg TEXT")
     if "brand_align" not in user_cols:
         c.execute("ALTER TABLE users ADD COLUMN brand_align TEXT DEFAULT 'center'")
+    if "role_changed_at" not in user_cols:
+        c.execute("ALTER TABLE users ADD COLUMN role_changed_at TEXT")
 
     # Migration: add tags to user_diary
     diary_cols = [row[1] for row in c.execute("PRAGMA table_info(user_diary)").fetchall()]

backend/main.py

@@ -477,6 +477,8 @@ def business_apply(body: dict, user=Depends(get_current_user)):
         "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
         ("admin", "🏢 商业认证申请", f"{who} 申请商业用户认证，商户名：{business_name}")
     )
+    log_audit(conn, user["id"], "business_apply", "user", user["id"], who,
+              json.dumps({"business_name": business_name}))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -501,7 +503,7 @@ def get_my_business_application(user=Depends(get_current_user)):
 def list_business_applications(user=Depends(require_role("admin"))):
     conn = get_db()
     rows = conn.execute(
-        "SELECT a.id, a.user_id, a.business_name, a.document, a.status, a.created_at, "
+        "SELECT a.id, a.user_id, a.business_name, a.document, a.status, a.reject_reason, a.created_at, "
         "u.display_name, u.username FROM business_applications a "
         "LEFT JOIN users u ON a.user_id = u.id ORDER BY a.id DESC"
     ).fetchall()
@@ -518,13 +520,15 @@ def approve_business(app_id: int, user=Depends(require_role("admin"))):
         raise HTTPException(404, "申请不存在")
     conn.execute("UPDATE business_applications SET status = 'approved', reviewed_at = datetime('now') WHERE id = ?", (app_id,))
     conn.execute("UPDATE users SET business_verified = 1 WHERE id = ?", (app["user_id"],))
-    # Notify user
-    target = conn.execute("SELECT role FROM users WHERE id = ?", (app["user_id"],)).fetchone()
+    target = conn.execute("SELECT role, display_name, username FROM users WHERE id = ?", (app["user_id"],)).fetchone()
+    target_name = (target["display_name"] or target["username"]) if target else "unknown"
     if target:
         conn.execute(
             "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
             (target["role"], "🎉 商业认证通过", "恭喜！你的商业用户认证已通过，现在可以使用项目核算等商业功能。", app["user_id"])
         )
+    log_audit(conn, user["id"], "approve_business", "user", app["user_id"], target_name,
+              json.dumps({"business_name": app["business_name"]}))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -539,7 +543,8 @@ def reject_business(app_id: int, body: dict = None, user=Depends(require_role("a
         raise HTTPException(404, "申请不存在")
     reason = (body or {}).get("reason", "").strip()
     conn.execute("UPDATE business_applications SET status = 'rejected', reviewed_at = datetime('now'), reject_reason = ? WHERE id = ?", (reason, app_id))
-    target = conn.execute("SELECT role FROM users WHERE id = ?", (app["user_id"],)).fetchone()
+    target = conn.execute("SELECT role, display_name, username FROM users WHERE id = ?", (app["user_id"],)).fetchone()
+    target_name = (target["display_name"] or target["username"]) if target else "unknown"
     if target:
         msg = "你的商业用户认证申请未通过。"
         if reason:
@@ -549,6 +554,8 @@ def reject_business(app_id: int, body: dict = None, user=Depends(require_role("a
             "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
             (target["role"], "商业认证未通过", msg, app["user_id"])
         )
+    log_audit(conn, user["id"], "reject_business", "user", app["user_id"], target_name,
+              json.dumps({"reason": reason}))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -614,6 +621,23 @@ def reject_translation(sid: int, user=Depends(require_role("admin"))):
     return {"ok": True}
 
 
+@app.post("/api/business-grant/{user_id}")
+def grant_business(user_id: int, user=Depends(require_role("admin"))):
+    conn = get_db()
+    conn.execute("UPDATE users SET business_verified = 1 WHERE id = ?", (user_id,))
+    target = conn.execute("SELECT role, display_name, username FROM users WHERE id = ?", (user_id,)).fetchone()
+    target_name = (target["display_name"] or target["username"]) if target else "unknown"
+    if target:
+        conn.execute(
+            "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
+            (target["role"], "🎉 商业认证已开通", "管理员已为你开通商业用户认证，现在可以使用商业核算等功能。", user_id)
+        )
+    log_audit(conn, user["id"], "grant_business", "user", user_id, target_name, None)
+    conn.commit()
+    conn.close()
+    return {"ok": True}
+
+
 @app.post("/api/business-revoke/{user_id}")
 def revoke_business(user_id: int, body: dict = None, user=Depends(require_role("admin"))):
     conn = get_db()
@@ -629,6 +653,9 @@ def revoke_business(user_id: int, body: dict = None, user=Depends(require_role("
             "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
             (target["role"], "商业资格已取消", msg, user_id)
         )
+    target_name = (target["display_name"] or target["username"]) if target else "unknown"
+    log_audit(conn, user["id"], "revoke_business", "user", user_id, target_name,
+              json.dumps({"reason": reason}) if reason else None)
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -754,8 +781,14 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
         raise HTTPException(401, "请先登录")
     conn = get_db()
     c = conn.cursor()
+    # Senior editors adding directly to public library: set owner to admin so everyone can see
+    owner_id = user["id"]
+    if user["role"] in ("senior_editor",):
+        admin = c.execute("SELECT id FROM users WHERE role = 'admin' LIMIT 1").fetchone()
+        if admin:
+            owner_id = admin["id"]
     c.execute("INSERT INTO recipes (name, note, owner_id) VALUES (?, ?, ?)",
-              (recipe.name, recipe.note, user["id"]))
+              (recipe.name, recipe.note, owner_id))
     rid = c.lastrowid
     for ing in recipe.ingredients:
         c.execute(
@@ -766,15 +799,21 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
         c.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (tag,))
         c.execute("INSERT OR IGNORE INTO recipe_tags (recipe_id, tag_name) VALUES (?, ?)", (rid, tag))
     log_audit(conn, user["id"], "create_recipe", "recipe", rid, recipe.name)
-    # Notify admin and senior editors when non-admin creates a recipe
-    if user["role"] not in ("admin", "senior_editor"):
-        who = user.get("display_name") or user["username"]
-        for role in ("admin", "senior_editor"):
-            conn.execute(
-                "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
-                (role, "📝 新配方待审核",
-                 f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
-            )
+    who = user.get("display_name") or user["username"]
+    if user["role"] == "senior_editor":
+        # Senior editor adds directly — just inform admin
+        conn.execute(
+            "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
+            ("admin", "📋 新配方已添加",
+             f"{who} 将配方「{recipe.name}」添加到了公共配方库。\n[recipe_id:{rid}]")
+        )
+    elif user["role"] not in ("admin",):
+        # Other users need review
+        conn.execute(
+            "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
+            ("admin", "📝 新配方待审核",
+             f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
+        )
     conn.commit()
     conn.close()
     return {"id": rid}
@@ -785,9 +824,7 @@ def _check_recipe_permission(conn, recipe_id, user):
     row = conn.execute("SELECT owner_id, name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     if not row:
         raise HTTPException(404, "Recipe not found")
-    if user["role"] in ("admin", "senior_editor"):
-        return row
-    if user["role"] in ("editor",) and row["owner_id"] == user.get("id"):
+    if user["role"] in ("admin", "senior_editor", "editor"):
         return row
     raise HTTPException(403, "权限不足")
 
@@ -881,7 +918,7 @@ def adopt_recipe(recipe_id: int, user=Depends(require_role("admin"))):
 
 
 @app.post("/api/recipes/{recipe_id}/reject")
-def reject_recipe(recipe_id: int, body: dict = None, user=Depends(require_role("admin"))):
+def reject_recipe(recipe_id: int, body: dict = None, user=Depends(require_role("admin", "senior_editor"))):
     conn = get_db()
     row = conn.execute("SELECT id, name, owner_id FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     if not row:
@@ -903,8 +940,55 @@ def reject_recipe(recipe_id: int, body: dict = None, user=Depends(require_role("
     conn.execute("DELETE FROM recipe_ingredients WHERE recipe_id = ?", (recipe_id,))
     conn.execute("DELETE FROM recipe_tags WHERE recipe_id = ?", (recipe_id,))
     conn.execute("DELETE FROM recipes WHERE id = ?", (recipe_id,))
+    from_name = (old_owner["display_name"] or old_owner["username"]) if old_owner else "unknown"
     log_audit(conn, user["id"], "reject_recipe", "recipe", recipe_id, row["name"],
-              json.dumps({"reason": reason}))
+              json.dumps({"reason": reason, "from_user": from_name}))
+    conn.commit()
+    conn.close()
+    return {"ok": True}
+
+
+@app.post("/api/recipes/{recipe_id}/recommend")
+def recommend_recipe(recipe_id: int, body: dict = None, user=Depends(get_current_user)):
+    """Senior editor recommends a recipe for admin approval."""
+    if user["role"] not in ("senior_editor", "admin"):
+        raise HTTPException(403, "权限不足")
+    conn = get_db()
+    recipe = conn.execute("SELECT name, owner_id FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    if not recipe:
+        conn.close()
+        raise HTTPException(404, "配方不存在")
+    who = user.get("display_name") or user.get("username")
+    conn.execute(
+        "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
+        ("admin", "👍 配方推荐通过",
+         f"{who} 审核了配方「{recipe['name']}」并推荐通过，请最终确认。\n[recipe_id:{recipe_id}]")
+    )
+    conn.commit()
+    conn.close()
+    return {"ok": True}
+
+
+@app.post("/api/recipes/{recipe_id}/assign-review")
+def assign_recipe_review(recipe_id: int, body: dict, user=Depends(require_role("admin"))):
+    reviewer_id = body.get("user_id")
+    if not reviewer_id:
+        raise HTTPException(400, "请选择审核人")
+    conn = get_db()
+    recipe = conn.execute("SELECT name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    if not recipe:
+        conn.close()
+        raise HTTPException(404, "配方不存在")
+    reviewer = conn.execute("SELECT role, display_name, username FROM users WHERE id = ?", (reviewer_id,)).fetchone()
+    if not reviewer:
+        conn.close()
+        raise HTTPException(404, "用户不存在")
+    conn.execute(
+        "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
+        (reviewer["role"], "📋 请审核配方",
+         f"管理员指派你审核配方「{recipe['name']}」，请到管理配方页面查看并反馈意见。\n[recipe_id:{recipe_id}]",
+         reviewer_id)
+    )
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1010,15 +1094,25 @@ def delete_user(user_id: int, user=Depends(require_role("admin"))):
 @app.put("/api/users/{user_id}")
 def update_user(user_id: int, body: UserUpdate, user=Depends(require_role("admin"))):
     conn = get_db()
+    target = conn.execute("SELECT role, display_name, username FROM users WHERE id = ?", (user_id,)).fetchone()
+    old_role = target["role"] if target else "unknown"
+    target_name = (target["display_name"] or target["username"]) if target else "unknown"
     if body.role is not None:
         if body.role == "admin":
             conn.close()
             raise HTTPException(403, "不能将用户设为管理员")
-        conn.execute("UPDATE users SET role = ? WHERE id = ?", (body.role, user_id))
+        conn.execute("UPDATE users SET role = ?, role_changed_at = datetime('now') WHERE id = ?", (body.role, user_id))
     if body.display_name is not None:
         conn.execute("UPDATE users SET display_name = ? WHERE id = ?", (body.display_name, user_id))
-    log_audit(conn, user["id"], "update_user", "user", user_id, None,
-              json.dumps({"role": body.role, "display_name": body.display_name}))
+    role_labels = {"admin": "管理员", "senior_editor": "高级编辑", "editor": "编辑", "viewer": "查看者"}
+    detail = {}
+    if body.role is not None and body.role != old_role:
+        detail["from_role"] = role_labels.get(old_role, old_role)
+        detail["to_role"] = role_labels.get(body.role, body.role)
+    if body.display_name is not None:
+        detail["display_name"] = body.display_name
+    log_audit(conn, user["id"], "update_user", "user", user_id, target_name,
+              json.dumps(detail, ensure_ascii=False))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1223,14 +1317,15 @@ def create_diary(body: dict, user=Depends(get_current_user)):
     name = body.get("name", "").strip()
     ingredients = body.get("ingredients", [])
     note = body.get("note", "")
+    tags = body.get("tags", [])
     source_id = body.get("source_recipe_id")
     if not name:
         raise HTTPException(400, "请输入配方名称")
     conn = get_db()
     c = conn.cursor()
     c.execute(
-        "INSERT INTO user_diary (user_id, source_recipe_id, name, ingredients, note) VALUES (?, ?, ?, ?, ?)",
-        (user["id"], source_id, name, json.dumps(ingredients, ensure_ascii=False), note)
+        "INSERT INTO user_diary (user_id, source_recipe_id, name, ingredients, note, tags) VALUES (?, ?, ?, ?, ?, ?)",
+        (user["id"], source_id, name, json.dumps(ingredients, ensure_ascii=False), note, json.dumps(tags, ensure_ascii=False))
     )
     conn.commit()
     did = c.lastrowid
@@ -1457,19 +1552,35 @@ def list_recipe_reviews(user=Depends(require_role("admin"))):
 @app.get("/api/me/contribution")
 def my_contribution(user=Depends(get_current_user)):
     if not user.get("id"):
-        return {"adopted_count": 0, "shared_count": 0}
+        return {"adopted_count": 0, "shared_count": 0, "adopted_names": [], "pending_names": []}
     conn = get_db()
-    # adopted_count: recipes adopted from this user (owner changed to admin)
-    adopted = conn.execute(
-        "SELECT COUNT(*) FROM audit_log WHERE action = 'adopt_recipe' AND detail LIKE ?",
-        (f'%"from_user": "{user.get("display_name") or user.get("username")}"%',)
-    ).fetchone()[0]
-    # pending: recipes still owned by user in public library (not yet adopted)
-    pending = conn.execute(
-        "SELECT COUNT(*) FROM recipes WHERE owner_id = ?", (user["id"],)
-    ).fetchone()[0]
+    display = user.get("display_name") or user.get("username")
+    # adopted: unique recipe names adopted from this user
+    adopted_rows = conn.execute(
+        "SELECT DISTINCT target_name FROM audit_log WHERE action = 'adopt_recipe' AND detail LIKE ?",
+        (f'%"from_user": "{display}"%',)
+    ).fetchall()
+    adopted_names = list(set(r["target_name"] for r in adopted_rows if r["target_name"]))
+    # pending: recipes still owned by user in public library
+    pending_rows = conn.execute(
+        "SELECT name FROM recipes WHERE owner_id = ?", (user["id"],)
+    ).fetchall()
+    pending_names = [r["name"] for r in pending_rows]
+    # rejected: unique recipe names rejected (not already adopted or pending)
+    rejected_rows = conn.execute(
+        "SELECT DISTINCT target_name FROM audit_log WHERE action = 'reject_recipe' AND detail LIKE ?",
+        (f'%"from_user": "{display}"%',)
+    ).fetchall()
+    rejected_names = set(r["target_name"] for r in rejected_rows if r["target_name"])
+    # Unique names across all: same recipe rejected then re-submitted counts as 1
+    all_names = set(adopted_names) | set(pending_names) | rejected_names
     conn.close()
-    return {"adopted_count": adopted, "shared_count": adopted + pending}
+    return {
+        "adopted_count": len(adopted_names),
+        "shared_count": len(all_names),
+        "adopted_names": adopted_names,
+        "pending_names": pending_names,
+    }
 
 
 # ── Notifications ──────────────────────────────────────
@@ -1478,15 +1589,19 @@ def get_notifications(user=Depends(get_current_user)):
     if not user["id"]:
         return []
     conn = get_db()
-    # Only show notifications created after user registration
-    user_created = conn.execute("SELECT created_at FROM users WHERE id = ?", (user["id"],)).fetchone()
-    created_at = user_created["created_at"] if user_created else "2000-01-01"
+    # Only show notifications after user registration or last role change (whichever is later)
+    user_row = conn.execute("SELECT created_at, role_changed_at FROM users WHERE id = ?", (user["id"],)).fetchone()
+    cutoff = "2000-01-01"
+    if user_row:
+        cutoff = user_row["created_at"] or cutoff
+        if user_row["role_changed_at"] and user_row["role_changed_at"] > cutoff:
+            cutoff = user_row["role_changed_at"]
     rows = conn.execute(
         "SELECT id, title, body, is_read, created_at FROM notifications "
         "WHERE (target_user_id = ? OR (target_user_id IS NULL AND (target_role = ? OR target_role = 'all'))) "
         "AND created_at >= ? "
         "ORDER BY is_read ASC, id DESC LIMIT 200",
-        (user["id"], user["role"], created_at)
+        (user["id"], user["role"], cutoff)
     ).fetchall()
     conn.close()
     return [dict(r) for r in rows]
@@ -1507,6 +1622,50 @@ def mark_notification_read(nid: int, body: dict = None, user=Depends(get_current
     return {"ok": True}
 
 
+@app.post("/api/notifications/{nid}/added")
+def mark_notification_added(nid: int, user=Depends(get_current_user)):
+    """Mark a 'search missing' notification as handled: notify others and the original requester."""
+    conn = get_db()
+    notif = conn.execute("SELECT title, body FROM notifications WHERE id = ?", (nid,)).fetchone()
+    if not notif:
+        conn.close()
+        raise HTTPException(404, "通知不存在")
+    # Mark this one as read
+    conn.execute("UPDATE notifications SET is_read = 1 WHERE id = ?", (nid,))
+    who = user.get("display_name") or user.get("username")
+    title = notif["title"] or ""
+    # Extract query from title "🔍 用户需求：XXX"
+    query = title.replace("🔍 用户需求：", "").strip() if "用户需求" in title else title
+    # Mark all same-title notifications as read
+    conn.execute("UPDATE notifications SET is_read = 1 WHERE title = ? AND is_read = 0", (title,))
+    # Notify other editors that it's been handled
+    for role in ("admin", "senior_editor"):
+        conn.execute(
+            "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
+            (role, "✅ 配方已添加",
+             f"{who} 已为「{query}」添加了配方，无需重复处理。")
+        )
+    # Notify the original requester (search the body for who searched)
+    body_text = notif["body"] or ""
+    # body format: "XXX 搜索了「YYY」..."
+    if "搜索了" in body_text:
+        requester_name = body_text.split(" 搜索了")[0].strip()
+        # Find the user
+        requester = conn.execute(
+            "SELECT id, role FROM users WHERE display_name = ? OR username = ?",
+            (requester_name, requester_name)
+        ).fetchone()
+        if requester:
+            conn.execute(
+                "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
+                (requester["role"], "🎉 你搜索的配方已添加",
+                 f"你之前搜索的「{query}」已有编辑添加了配方，快去查看吧！", requester["id"])
+            )
+    conn.commit()
+    conn.close()
+    return {"ok": True}
+
+
 @app.post("/api/notifications/{nid}/unread")
 def mark_notification_unread(nid: int, user=Depends(get_current_user)):
     conn = get_db()

frontend/cypress/e2e/recipe-detail.cy.js

@@ -1,8 +1,7 @@
-// Helper: dismiss any modal that may cover the detail overlay (login modal, error dialog)
 function dismissModals() {
   cy.get('body').then($body => {
     if ($body.find('.login-overlay').length) {
-      cy.get('.login-overlay').click('topLeft')  // click backdrop to close
+      cy.get('.login-overlay').click('topLeft')
     }
     if ($body.find('.dialog-overlay').length) {
       cy.get('.dialog-btn-primary').click()
@@ -60,51 +59,22 @@ describe('Recipe Detail', () => {
   })
 })
 
-describe('Recipe Detail - Editor (Admin)', () => {
-  const ADMIN_TOKEN = 'c86ae7afbe10fabe3c1d5e1a7fee74feaadfd5dc7be2ab62'
-
+describe('Recipe Detail - Card View', () => {
   beforeEach(() => {
-    cy.visit('/', {
-      onBeforeLoad(win) {
-        win.localStorage.setItem('oil_auth_token', ADMIN_TOKEN)
-      }
-    })
+    cy.visit('/')
     cy.get('.recipe-card', { timeout: 10000 }).should('have.length.gte', 1)
     dismissModals()
-  })
-
-  it('shows editable ingredients table in editor tab', () => {
     cy.get('.recipe-card').first().click()
     dismissModals()
-    cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
-    cy.get('.detail-overlay').then($el => {
-      if ($el.find(':contains("编辑")').filter('button').length) {
-        cy.contains('编辑').click()
-        cy.get('.editor-select, .editor-drops').should('exist')
-      } else {
-        cy.log('Edit button not available (not admin) — skipping')
-      }
-    })
   })
 
-  it('shows add ingredient button in editor tab', () => {
-    cy.get('.recipe-card').first().click()
-    dismissModals()
-    cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
-    cy.get('.detail-overlay').then($el => {
-      if ($el.find(':contains("编辑")').filter('button').length) {
-        cy.contains('编辑').click()
-        cy.contains('添加精油').should('exist')
-      } else {
-        cy.log('Edit button not available (not admin) — skipping')
-      }
-    })
+  it('shows export card with doTERRA branding', () => {
+    cy.get('.export-card').should('exist')
+    cy.contains('doTERRA').should('exist')
   })
 
-  it('shows save image button', () => {
-    cy.get('.recipe-card').first().click()
-    dismissModals()
-    cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
-    cy.contains('保存图片').should('exist')
+  it('shows language toggle', () => {
+    cy.contains('中文').should('exist')
+    cy.contains('English').should('exist')
   })
 })

frontend/package-lock.json

@@ -9,10 +9,12 @@
       "version": "0.0.0",
       "dependencies": {
         "exceljs": "^4.4.0",
+        "heic2any": "^0.0.4",
         "html2canvas": "^1.4.1",
         "pinia": "^2.3.1",
         "vue": "^3.5.32",
-        "vue-router": "^4.6.4"
+        "vue-router": "^4.6.4",
+        "xlsx": "^0.18.5"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^6.0.5",
@@ -1179,6 +1181,15 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -1637,6 +1648,19 @@
       "dev": true,
       "license": "Apache-2.0"
     },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/chai": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
@@ -1761,6 +1785,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/codepage": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2571,6 +2604,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -2830,6 +2872,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/heic2any": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/heic2any/-/heic2any-0.0.4.tgz",
+      "integrity": "sha512-3lLnZiDELfabVH87htnRolZ2iehX9zwpRyGNz22GKXIu0fznlblf0/ftppXKNqS26dqFSeqfIBhAmAj/uSp0cA==",
+      "license": "MIT"
+    },
     "node_modules/html-encoding-sniffer": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-6.0.0.tgz",
@@ -4684,6 +4732,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
@@ -5490,6 +5550,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -5533,6 +5611,27 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "license": "ISC"
     },
+    "node_modules/xlsx": {
+      "version": "0.18.5",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
+        "codepage": "~1.15.0",
+        "crc-32": "~1.2.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/xml-name-validator": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",

frontend/package.json

@@ -15,10 +15,12 @@
   },
   "dependencies": {
     "exceljs": "^4.4.0",
+    "heic2any": "^0.0.4",
     "html2canvas": "^1.4.1",
     "pinia": "^2.3.1",
     "vue": "^3.5.32",
-    "vue-router": "^4.6.4"
+    "vue-router": "^4.6.4",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^6.0.5",

frontend/src/App.vue

@@ -82,9 +82,6 @@ const allTabs = [
   { key: 'inventory', icon: '📦', label: '个人库存',  require: 'login' },
   { key: 'oils',      icon: '💧', label: '精油价目' },
   { key: 'projects',  icon: '💼', label: '商业核算',  require: 'login' },
-  { key: 'audit',     icon: '📜', label: '操作日志',  hide: 'admin' },
-  { key: 'bugs',      icon: '🐛', label: 'Bug',       hide: 'admin' },
-  { key: 'users',     icon: '👥', label: '用户管理',  hide: 'admin' },
 ]
 
 // 所有人都能看到大部分 tab，bug 和用户管理只有 admin 可见

frontend/src/__tests__/newFeatures.test.js

@@ -0,0 +1,87 @@
+import { describe, it, expect } from 'vitest'
+import { parseMultiRecipes } from '../composables/useSmartPaste'
+import { getPinyinInitials, matchesPinyinInitials } from '../composables/usePinyinMatch'
+
+const oilNames = ['薰衣草','茶树','柠檬','芳香调理','永久花','椒样薄荷','乳香','檀香','天竺葵','佛手柑','生姜']
+
+// ---------------------------------------------------------------------------
+// parseMultiRecipes
+// ---------------------------------------------------------------------------
+describe('parseMultiRecipes', () => {
+  it('parses single recipe with name', () => {
+    const results = parseMultiRecipes('舒缓放松，薰衣草3，茶树2', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('舒缓放松')
+    expect(results[0].ingredients).toHaveLength(2)
+  })
+
+  it('parses recipe with space-separated parts', () => {
+    const results = parseMultiRecipes('长高 芳香调理8 永久花10', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('长高')
+    expect(results[0].ingredients.length).toBeGreaterThanOrEqual(2)
+  })
+
+  it('parses recipe with concatenated name+oil', () => {
+    const results = parseMultiRecipes('长高芳香调理8永久花10', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('长高')
+  })
+
+  it('parses multiple recipes', () => {
+    const results = parseMultiRecipes('舒缓放松，薰衣草3，茶树2，提神醒脑，柠檬5', oilNames)
+    expect(results).toHaveLength(2)
+    expect(results[0].name).toBe('舒缓放松')
+    expect(results[1].name).toBe('提神醒脑')
+  })
+
+  it('handles recipe with no name', () => {
+    const results = parseMultiRecipes('薰衣草3，茶树2', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].ingredients).toHaveLength(2)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Pinyin matching
+// ---------------------------------------------------------------------------
+describe('getPinyinInitials', () => {
+  it('returns correct initials for common oils', () => {
+    expect(getPinyinInitials('薰衣草')).toBe('xyc')
+    expect(getPinyinInitials('茶树')).toBe('cs')
+    expect(getPinyinInitials('生姜')).toBe('sj')
+  })
+
+  it('handles 忍冬花', () => {
+    expect(getPinyinInitials('忍冬花呵护')).toBe('rdhhh')
+  })
+})
+
+describe('matchesPinyinInitials', () => {
+  it('matches prefix only', () => {
+    expect(matchesPinyinInitials('生姜', 's')).toBe(true)
+    expect(matchesPinyinInitials('生姜', 'sj')).toBe(true)
+    expect(matchesPinyinInitials('茶树', 's')).toBe(false) // cs doesn't start with s
+    expect(matchesPinyinInitials('茶树', 'cs')).toBe(true)
+  })
+
+  it('does not match substring', () => {
+    expect(matchesPinyinInitials('茶树', 's')).toBe(false)
+  })
+
+  it('matches 忍冬花 with r', () => {
+    expect(matchesPinyinInitials('忍冬花呵护', 'r')).toBe(true)
+    expect(matchesPinyinInitials('忍冬花呵护', 'rdh')).toBe(true)
+    expect(matchesPinyinInitials('忍冬花呵护', 'l')).toBe(false)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// EDITOR_ONLY_TAGS
+// ---------------------------------------------------------------------------
+describe('EDITOR_ONLY_TAGS', () => {
+  it('exports EDITOR_ONLY_TAGS from recipes store', async () => {
+    const { EDITOR_ONLY_TAGS } = await import('../stores/recipes')
+    expect(EDITOR_ONLY_TAGS).toContain('已审核')
+  })
+})

frontend/src/__tests__/polishFeatures.test.js

@@ -0,0 +1,126 @@
+import { describe, it, expect } from 'vitest'
+import { EDITOR_ONLY_TAGS } from '../stores/recipes'
+
+// ---------------------------------------------------------------------------
+// Tag sorting
+// ---------------------------------------------------------------------------
+describe('Tag sorting', () => {
+  it('sorts tags alphabetically with localeCompare zh', () => {
+    const tags = ['香水', '呼吸', '消化', '美容']
+    const sorted = [...tags].sort((a, b) => a.localeCompare(b, 'zh'))
+    expect(sorted[0]).toBe('呼吸')
+    // All sorted
+    for (let i = 1; i < sorted.length; i++) {
+      expect(sorted[i - 1].localeCompare(sorted[i], 'zh')).toBeLessThanOrEqual(0)
+    }
+  })
+
+  it('EDITOR_ONLY_TAGS filters correctly', () => {
+    const allTags = ['呼吸', '已审核', '消化', '香水']
+    const visible = allTags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+    expect(visible).not.toContain('已审核')
+    expect(visible).toContain('呼吸')
+    expect(visible).toHaveLength(3)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Recipe save data format
+// ---------------------------------------------------------------------------
+describe('Recipe data format', () => {
+  it('oil_name format overwrites oil format when spread', () => {
+    // This test documents the bug that was fixed
+    const localRecipe = {
+      ingredients: [{ oil: '薰衣草', drops: 3 }],
+    }
+    const payload = {
+      ingredients: [{ oil_name: '薰衣草', drops: 3 }],
+    }
+    const merged = { ...localRecipe, ...payload }
+    // After merge, ingredients have oil_name not oil — this was the bug
+    expect(merged.ingredients[0]).toHaveProperty('oil_name')
+    expect(merged.ingredients[0]).not.toHaveProperty('oil')
+  })
+
+  it('loadRecipes mapping converts oil_name to oil', () => {
+    // Simulate what loadRecipes does
+    const apiData = [
+      { id: 1, name: 'test', ingredients: [{ oil_name: '薰衣草', drops: 3 }], tags: [] }
+    ]
+    const mapped = apiData.map(r => ({
+      ...r,
+      ingredients: r.ingredients.map(ing => ({
+        oil: ing.oil_name ?? ing.oil,
+        drops: ing.drops,
+      }))
+    }))
+    expect(mapped[0].ingredients[0].oil).toBe('薰衣草')
+    expect(mapped[0].ingredients[0]).not.toHaveProperty('oil_name')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Volume detection from ingredients
+// ---------------------------------------------------------------------------
+describe('Volume detection', () => {
+  const DROPS_PER_ML = 18.6
+
+  function guessVolume(eoDrops, cocoDrops) {
+    const totalDrops = eoDrops + cocoDrops
+    const ml = totalDrops / DROPS_PER_ML
+    if (ml <= 2) return 'single'
+    if (Math.abs(ml - 5) < 1.5) return '5'
+    if (Math.abs(ml - 10) < 2.5) return '10'
+    if (Math.abs(ml - 15) < 2.5) return '15'
+    if (Math.abs(ml - 20) < 3) return '20'
+    if (Math.abs(ml - 30) < 6) return '30'
+    return 'custom'
+  }
+
+  it('detects single use (small amounts)', () => {
+    expect(guessVolume(5, 10)).toBe('single')
+  })
+
+  it('detects 5ml', () => {
+    expect(guessVolume(15, Math.round(5 * DROPS_PER_ML) - 15)).toBe('5')
+  })
+
+  it('detects 10ml', () => {
+    expect(guessVolume(20, Math.round(10 * DROPS_PER_ML) - 20)).toBe('10')
+  })
+
+  it('detects 30ml', () => {
+    expect(guessVolume(50, Math.round(30 * DROPS_PER_ML) - 50)).toBe('30')
+  })
+
+  it('no coconut returns no volume', () => {
+    // When cocoDrops is 0, function still returns based on total
+    // But in real code, no coconut → formVolume = ''
+    expect(guessVolume(10, 0)).toBe('single')
+  })
+
+  it('detects custom for large volumes', () => {
+    expect(guessVolume(100, 1000)).toBe('custom')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Dilution ratio calculation
+// ---------------------------------------------------------------------------
+describe('Dilution ratio', () => {
+  it('calculates ratio correctly', () => {
+    expect(Math.round(60 / 10)).toBe(6) // 1:6
+    expect(Math.round(30 / 10)).toBe(3) // 1:3
+    expect(Math.round(100 / 10)).toBe(10) // 1:10
+  })
+
+  it('snaps to nearest option', () => {
+    const options = [3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20]
+    const snap = (ratio) => options.reduce((a, b) => Math.abs(b - ratio) < Math.abs(a - ratio) ? b : a)
+    expect(snap(6)).toBe(6)
+    expect([10, 12]).toContain(snap(11)) // equidistant
+    expect(snap(13)).toBe(12)
+    expect([12, 15]).toContain(snap(14))
+    expect(snap(18)).toBe(20)
+  })
+})

frontend/src/components/RecipeCard.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="recipe-card" @click="$emit('click', index)">
     <div class="recipe-card-name">{{ recipe.name }}</div>
-    <div v-if="recipe.tags && recipe.tags.length" class="recipe-card-tags">
-      <span v-for="tag in recipe.tags" :key="tag" class="tag">{{ tag }}</span>
+    <div v-if="visibleTags.length" class="recipe-card-tags">
+      <span v-for="tag in visibleTags" :key="tag" class="tag" :class="{ 'tag-reviewed': tag === '已审核' }">{{ tag }}</span>
     </div>
     <div class="recipe-card-oils">{{ oilNames }}</div>
     <div class="recipe-card-bottom">
@@ -20,7 +20,8 @@
 <script setup>
 import { computed } from 'vue'
 import { useOilsStore } from '../stores/oils'
-import { useRecipesStore } from '../stores/recipes'
+import { useRecipesStore, EDITOR_ONLY_TAGS } from '../stores/recipes'
+import { useAuthStore } from '../stores/auth'
 
 const props = defineProps({
   recipe: { type: Object, required: true },
@@ -31,6 +32,13 @@ defineEmits(['click', 'toggle-fav'])
 
 const oilsStore = useOilsStore()
 const recipesStore = useRecipesStore()
+const auth = useAuthStore()
+
+const visibleTags = computed(() => {
+  if (!props.recipe.tags) return []
+  const tags = auth.canEdit ? [...props.recipe.tags] : props.recipe.tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+  return tags.sort((a, b) => a.localeCompare(b, 'zh'))
+})
 
 const oilNames = computed(() =>
   props.recipe.ingredients.map(i => i.oil).join('、')
@@ -79,6 +87,11 @@ const isFav = computed(() => recipesStore.isFavorite(props.recipe))
   color: #5a7d5e;
 }
 
+.tag-reviewed {
+  background: #e3f2fd;
+  color: #1565c0;
+}
+
 .recipe-card-oils {
   font-size: 12px;
   color: #9a8570;

frontend/src/components/RecipeDetailOverlay.vue

@@ -6,19 +6,16 @@
         <!-- Top bar with close + edit -->
         <div class="card-header">
           <div class="card-top-actions">
-            <button class="action-btn action-btn-fav action-btn-sm" @click="handleToggleFavorite">
-              {{ isFav ? '★ 已收藏' : '☆ 收藏' }}
-            </button>
-            <button v-if="!props.isDiary" class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
-              📔 存为我的
-            </button>
+            <template v-if="!props.isDiary">
+              <button class="action-btn action-btn-fav action-btn-sm" @click="handleToggleFavorite">
+                {{ isFav ? '★ 已收藏' : '☆ 收藏' }}
+              </button>
+              <button class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
+                📔 存为我的
+              </button>
+            </template>
           </div>
           <div style="flex:1"></div>
-          <button
-            v-if="canEditThisRecipe"
-            class="action-btn action-btn-sm"
-            @click="viewMode = 'editor'"
-          >编辑</button>
           <button class="detail-close-btn" @click="handleClose">✕</button>
         </div>
 
@@ -52,7 +49,7 @@
           <!-- Background image overlay -->
           <div v-if="brand.brand_bg" style="position:absolute;inset:0;width:100%;height:100%;background-size:cover;background-position:center;opacity:0.12;pointer-events:none;z-index:0" :style="{ backgroundImage: `url('${brand.brand_bg}')` }"></div>
           <!-- QR: top-right -->
-          <div v-if="brand.qr_code" style="position:absolute;top:20px;right:16px;display:flex;flex-direction:column;align-items:center;gap:3px;z-index:3">
+          <div v-if="brand.qr_code" style="position:absolute;top:36px;right:36px;display:flex;flex-direction:column;gap:3px;z-index:3" :style="{ alignItems: (brand.brand_align === 'left' ? 'flex-start' : brand.brand_align === 'right' ? 'flex-end' : 'center') }">
             <img :src="brand.qr_code" crossorigin="anonymous" style="width:54px;height:54px;object-fit:cover;border-radius:6px;box-shadow:0 2px 6px rgba(0,0,0,0.1)" />
             <div v-if="brand.brand_name" :style="{ textAlign: brand.brand_align || 'center' }" style="font-size:7px;color:var(--text-light);line-height:1.3;max-width:68px;white-space:pre-line">{{ brand.brand_name }}</div>
           </div>
@@ -61,7 +58,7 @@
             <div class="ec-subtitle">
               {{ cardLang === 'en' ? 'doTERRA · Gifts of the Earth' : 'doTERRA · 来自大地的礼物' }}
             </div>
-            <div class="ec-title">{{ getCardRecipeName() }}</div>
+            <div class="ec-title" :style="{ fontSize: cardTitleSize }">{{ getCardRecipeName() }}</div>
             <div style="width:80px;height:2px;background:linear-gradient(90deg,var(--sage),var(--gold));border-radius:2px;margin:14px 0"></div>
 
             <ul style="list-style:none;margin-bottom:20px;padding:0">
@@ -101,7 +98,7 @@
           <button class="action-btn" @click="saveImage">💾 保存图片</button>
           <button class="action-btn" @click="copyText">📋 复制文字</button>
           <button
-            v-if="cardLang === 'en' && authStore.canManage"
+            v-if="cardLang === 'en' && authStore.isAdmin"
             class="action-btn"
             @click="openTranslationEditor"
           >✏️ 修改翻译</button>
@@ -144,154 +141,72 @@
           </div>
         </div>
 
-        <!-- Tip -->
-        <div class="editor-tip">
-          💡 推荐按照单次用量（椰子油10~20滴）添加纯精油，系统会根据容量和稀释比例自动计算。
+        <!-- Volume selector -->
+        <div class="editor-section">
+          <label class="editor-label">容量</label>
+          <div class="volume-controls">
+            <button class="volume-btn" :class="{ active: selectedVolume === 'single' }" @click="selectedVolume = 'single'">单次</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '5' }" @click="selectedVolume = '5'">5ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '10' }" @click="selectedVolume = '10'">10ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '15' }" @click="selectedVolume = '15'">15ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '20' }" @click="selectedVolume = '20'">20ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '30' }" @click="selectedVolume = '30'">30ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === 'custom' }" @click="selectedVolume = 'custom'">自定义</button>
+          </div>
+          <div v-if="selectedVolume === 'custom'" class="custom-volume-row">
+            <input v-model.number="customVolumeValue" type="number" min="1" class="editor-drops" placeholder="ml" />
+            <span style="font-size:12px;color:#999">ml</span>
+          </div>
+          <div class="dilution-row">
+            <span class="dilution-label">参考比例 1:</span>
+            <select v-model.number="dilutionRatio" class="editor-select" style="width:60px">
+              <option v-for="n in [3,4,5,6,7,8,9,10,12,15,20]" :key="n" :value="n">{{ n }}</option>
+            </select>
+            <span class="ratio-hint">时，纯精油总数约为 {{ editorSuggestedEo }} 滴，现在为 {{ editorEoDrops }} 滴</span>
+          </div>
         </div>
 
-        <!-- Ingredients table -->
+        <!-- Ingredients table (EO only, coconut at bottom) -->
         <div class="editor-section">
           <table class="editor-table">
             <thead>
-              <tr>
-                <th>精油</th>
-                <th>滴数</th>
-                <th>单价/滴</th>
-                <th>小计</th>
-                <th></th>
-              </tr>
+              <tr><th>精油</th><th>滴数</th><th>单价/滴</th><th>小计</th><th></th></tr>
             </thead>
             <tbody>
-              <tr v-for="(ing, i) in editIngredients" :key="i">
+              <tr v-for="(ing, i) in editEoIngredients" :key="'eo-'+i">
                 <td>
                   <select v-model="ing.oil" class="editor-select">
                     <option value="">选择精油</option>
                     <option v-for="name in oilsStore.oilNames" :key="name" :value="name">{{ name }}</option>
                   </select>
                 </td>
+                <td><input v-model.number="ing.drops" type="number" min="0.5" step="0.5" class="editor-drops" /></td>
+                <td class="ing-ppd">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil)) : '-' }}</td>
+                <td class="ing-cost">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * (ing.drops || 0)) : '-' }}</td>
+                <td><button class="remove-row-btn" @click="editIngredients.splice(editIngredients.indexOf(ing), 1)">✕</button></td>
+              </tr>
+              <!-- Coconut oil row -->
+              <tr v-if="editCocoRow" class="coco-row">
+                <td><span class="coco-label">椰子油</span></td>
                 <td>
-                  <input
-                    v-model.number="ing.drops"
-                    type="number"
-                    min="0.5"
-                    step="0.5"
-                    class="editor-drops"
-                  />
-                </td>
-                <td class="ing-ppd">
-                  {{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil)) : '-' }}
-                </td>
-                <td class="ing-cost">
-                  {{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * (ing.drops || 0)) : '-' }}
-                </td>
-                <td>
-                  <button class="remove-row-btn" @click="removeIngredient(i)">✕</button>
+                  <template v-if="selectedVolume === 'single'">
+                    <input v-model.number="editCocoRow.drops" type="number" min="0" class="editor-drops" />
+                  </template>
+                  <template v-else>
+                    <span class="coco-fill">填满 (约{{ editorCocoFillMl }}ml)</span>
+                  </template>
                 </td>
+                <td class="ing-ppd">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop('椰子油')) }}</td>
+                <td class="ing-cost">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop('椰子油') * editorCocoActualDrops) }}</td>
+                <td><button class="remove-row-btn" @click="editCocoRow = null">✕</button></td>
               </tr>
             </tbody>
           </table>
-
-          <!-- Add ingredient row -->
-          <div v-if="showAddRow" class="add-ingredient-row">
-            <div class="oil-autocomplete">
-              <input
-                v-model="oilSearchQuery"
-                @focus="showOilDropdown = true"
-                @blur="closeOilDropdown"
-                @input="newIngOil = ''"
-                class="editor-input oil-search-input"
-                placeholder="搜索精油名称或英文..."
-                autocomplete="off"
-              />
-              <div v-if="showOilDropdown && filteredOilsForAdd.length" class="oil-dropdown">
-                <div
-                  v-for="name in filteredOilsForAdd"
-                  :key="name"
-                  class="oil-dropdown-item"
-                  :class="{ 'is-selected': newIngOil === name }"
-                  @mousedown.prevent="selectNewOil(name)"
-                >
-                  <span>{{ name }}</span>
-                  <span class="oil-dropdown-en">{{ oilEn(name) }}</span>
-                </div>
-              </div>
-            </div>
-            <input
-              v-model.number="newIngDrops"
-              type="number"
-              placeholder="滴数"
-              min="0.5"
-              step="0.5"
-              class="editor-drops"
-            />
-            <button class="action-btn action-btn-primary action-btn-sm" @click="confirmAddIngredient">确认</button>
-            <button class="action-btn action-btn-sm" @click="cancelAddRow">取消</button>
-          </div>
-          <button v-else class="add-row-btn" @click="showAddRow = true">+ 添加精油</button>
+          <button class="add-row-btn" @click="addEoRow">+ 添加精油</button>
         </div>
 
-        <!-- Volume & Dilution controls -->
-        <div class="editor-section">
-          <label class="editor-label">容量与稀释</label>
-          <div class="volume-controls">
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === 'single' }"
-              @click="selectedVolume = 'single'"
-            >单次</button>
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === '5' }"
-              @click="selectedVolume = '5'"
-            >5ml</button>
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === '10' }"
-              @click="selectedVolume = '10'"
-            >10ml</button>
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === '30' }"
-              @click="selectedVolume = '30'"
-            >30ml</button>
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === 'custom' }"
-              @click="selectedVolume = 'custom'"
-            >自定义</button>
-          </div>
-
-          <!-- Custom volume input -->
-          <div v-if="selectedVolume === 'custom'" class="custom-volume-row">
-            <input
-              v-model.number="customVolumeValue"
-              type="number"
-              min="1"
-              class="editor-drops"
-              placeholder="数量"
-            />
-            <select v-model="customVolumeUnit" class="editor-select" style="width:80px">
-              <option value="drops">滴</option>
-              <option value="ml">ml</option>
-            </select>
-          </div>
-
-          <!-- Dilution ratio -->
-          <div class="dilution-row">
-            <span class="dilution-label">稀释比例 1:</span>
-            <select v-model.number="dilutionRatio" class="editor-select" style="width:70px">
-              <option v-for="n in 20" :key="n" :value="n">{{ n }}</option>
-            </select>
-          </div>
-
-          <button class="action-btn action-btn-primary action-btn-sm" @click="applyVolumeDilution" style="margin-top:8px">
-            应用到配方
-          </button>
-
-          <div class="hint" style="margin-top:8px">
-            {{ dilutionHint }}
-          </div>
-        </div>
+        <!-- Real-time summary -->
+        <div class="recipe-summary">{{ editorSummaryText }}</div>
 
         <!-- Notes -->
         <div class="editor-section">
@@ -308,35 +223,18 @@
               <span class="tag-remove" @click="removeTag(tag)">×</span>
             </span>
           </div>
-          <!-- Candidate tags (from allTags, excluding already selected) -->
           <div class="candidate-tags" v-if="candidateTags.length">
-            <span
-              v-for="tag in candidateTags"
-              :key="tag"
-              class="candidate-tag"
-              @click="addTag(tag)"
-            >+ {{ tag }}</span>
+            <span v-for="tag in candidateTags" :key="tag" class="candidate-tag" @click="addTag(tag)">+ {{ tag }}</span>
           </div>
-          <!-- Manual tag input -->
           <div class="tag-input-row">
-            <input
-              v-model="newTagInput"
-              type="text"
-              class="editor-input"
-              placeholder="添加新标签..."
-              @keydown.enter="addNewTag"
-              style="flex:1"
-            />
+            <input v-model="newTagInput" type="text" class="editor-input" placeholder="添加新标签..." @keydown.enter="addNewTag" style="flex:1" />
             <button class="action-btn action-btn-sm" @click="addNewTag" :disabled="!newTagInput.trim()">+</button>
           </div>
         </div>
 
         <!-- Total cost -->
         <div class="editor-total">
-          总计: {{ editPriceInfo.cost }}
-          <span v-if="editPriceInfo.hasRetail" class="editor-retail">
-            零售 {{ editPriceInfo.retail }}
-          </span>
+          总计: {{ editorTotalCost }}
         </div>
       </div>
     </div>
@@ -687,6 +585,15 @@ function getCardRecipeName() {
   return displayRecipe.value.name
 }
 
+const cardTitleSize = computed(() => {
+  const name = getCardRecipeName()
+  const len = name.length
+  if (len <= 6) return '26px'
+  if (len <= 10) return '22px'
+  if (len <= 15) return '18px'
+  return '16px'
+})
+
 // ---- Favorite ----
 async function handleToggleFavorite() {
   if (!authStore.isLoggedIn) {
@@ -720,15 +627,10 @@ async function saveToDiary() {
   }
   const trimmed = name.trim()
   const dupDiary = diaryStore.userDiary.some(d => d.name === trimmed)
-  const dupPublic = recipesStore.recipes.some(r => r.name === trimmed)
   if (dupDiary) {
     ui.showToast('我的配方中已有同名配方「' + trimmed + '」')
     return
   }
-  if (dupPublic) {
-    ui.showToast('公共配方库中已有同名配方「' + trimmed + '」')
-    return
-  }
   try {
     const payload = {
       name: name.trim(),
@@ -789,7 +691,62 @@ function cancelAddRow() {
 const selectedVolume = ref('single')
 const customVolumeValue = ref(100)
 const customVolumeUnit = ref('drops')
-const dilutionRatio = ref(3)
+const dilutionRatio = ref(6)
+const editCocoRow = ref({ oil: '椰子油', drops: 10 })
+
+const editEoIngredients = computed(() =>
+  editIngredients.value.filter(i => i.oil !== '椰子油')
+)
+const editorEoDrops = computed(() =>
+  editEoIngredients.value.filter(i => i.oil && i.drops > 0).reduce((s, i) => s + i.drops, 0)
+)
+const editorTargetDrops = computed(() => {
+  if (selectedVolume.value === 'single') return null
+  if (selectedVolume.value === 'custom') return Math.round((customVolumeValue.value || 0) * DROPS_PER_ML)
+  return Math.round(Number(selectedVolume.value) * DROPS_PER_ML)
+})
+const editorCocoActualDrops = computed(() => {
+  if (!editCocoRow.value) return 0
+  if (selectedVolume.value === 'single') return editCocoRow.value.drops || 0
+  if (!editorTargetDrops.value) return 0
+  return Math.max(0, editorTargetDrops.value - editorEoDrops.value)
+})
+const editorCocoFillMl = computed(() => Math.round(editorCocoActualDrops.value / DROPS_PER_ML))
+const editorSuggestedEo = computed(() => {
+  if (selectedVolume.value === 'single') {
+    const coco = editCocoRow.value ? (editCocoRow.value.drops || 10) : 10
+    return Math.round(coco / dilutionRatio.value)
+  }
+  return Math.round((editorTargetDrops.value || 0) / (1 + dilutionRatio.value))
+})
+const editorSummaryText = computed(() => {
+  const eo = editorEoDrops.value
+  const coco = editorCocoActualDrops.value
+  const ratio = eo > 0 ? Math.round(coco / eo) : 0
+  if (selectedVolume.value === 'single') {
+    return `该配方为单次用量，纯精油 ${eo} 滴，椰子油 ${coco} 滴，稀释比例 1:${ratio}`
+  }
+  const vol = selectedVolume.value === 'custom' ? (customVolumeValue.value || 0) : Number(selectedVolume.value)
+  return `该配方总容量 ${vol}ml，纯精油 ${eo} 滴，剩余用椰子油填满，稀释比例 1:${ratio}`
+})
+const editorTotalCost = computed(() => {
+  let cost = editEoIngredients.value.filter(i => i.oil && i.drops > 0)
+    .reduce((s, i) => s + oilsStore.pricePerDrop(i.oil) * i.drops, 0)
+  cost += oilsStore.pricePerDrop('椰子油') * editorCocoActualDrops.value
+  return oilsStore.fmtPrice(cost)
+})
+
+function addEoRow() {
+  editIngredients.value.push({ oil: '', drops: 1 })
+}
+
+function goEditInManager() {
+  const r = recipe.value
+  // Store recipe id for manager to pick up
+  localStorage.setItem('oil_edit_recipe_id', String(r._id))
+  emit('close')
+  router.push('/manage')
+}
 
 const editPriceInfo = computed(() =>
   oilsStore.fmtCostWithRetail(editIngredients.value.filter(i => i.oil))
@@ -833,7 +790,10 @@ onMounted(() => {
   editName.value = r.name
   editNote.value = r.note || ''
   editTags.value = [...(r.tags || [])]
-  editIngredients.value = (r.ingredients || []).map(i => ({ oil: i.oil, drops: i.drops }))
+  const allIngs = (r.ingredients || [])
+  editIngredients.value = allIngs.filter(i => i.oil !== '椰子油').map(i => ({ oil: i.oil, drops: i.drops }))
+  const coco = allIngs.find(i => i.oil === '椰子油')
+  editCocoRow.value = coco ? { oil: '椰子油', drops: coco.drops } : { oil: '椰子油', drops: 10 }
   // Init translation defaults
   customRecipeNameEn.value = r.en_name || recipeNameEn(r.name)
   const enMap = {}
@@ -842,6 +802,23 @@ onMounted(() => {
   })
   customOilNameEn.value = enMap
 
+  // Calculate current dilution ratio and volume from ingredients
+  const cocoIng = allIngs.find(i => i.oil === '椰子油')
+  const eoTotal = allIngs.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
+  const cocoTotal = cocoIng ? (cocoIng.drops || 0) : 0
+  const totalDrops = eoTotal + cocoTotal
+  if (eoTotal > 0 && cocoTotal > 0) {
+    dilutionRatio.value = Math.round(cocoTotal / eoTotal)
+  }
+  const ml = totalDrops / DROPS_PER_ML
+  if (ml <= 1.5) selectedVolume.value = 'single'
+  else if (Math.abs(ml - 5) < 1.5) selectedVolume.value = '5'
+  else if (Math.abs(ml - 10) < 3) selectedVolume.value = '10'
+  else if (Math.abs(ml - 15) < 3) selectedVolume.value = '15'
+  else if (Math.abs(ml - 20) < 4) selectedVolume.value = '20'
+  else if (Math.abs(ml - 30) < 8) selectedVolume.value = '30'
+  else { selectedVolume.value = 'custom'; customVolumeValue.value = Math.round(ml) }
+
   loadBrand()
   nextTick(() => generateCardImage())
 })
@@ -1002,23 +979,28 @@ function previewFromEditor() {
 }
 
 async function saveRecipe() {
-  const ingredients = editIngredients.value.filter(i => i.oil && i.drops > 0)
+  const eoIngs = editIngredients.value.filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
   if (!editName.value.trim()) {
     ui.showToast('请输入配方名称')
     return
   }
-  if (ingredients.length === 0) {
+  if (eoIngs.length === 0) {
     ui.showToast('请至少添加一种精油')
     return
   }
 
+  const allIngs = eoIngs.map(i => ({ oil_name: i.oil, drops: i.drops }))
+  if (editCocoRow.value && editorCocoActualDrops.value > 0) {
+    allIngs.push({ oil_name: '椰子油', drops: editorCocoActualDrops.value })
+  }
+
   try {
     const payload = {
       ...recipe.value,
       name: editName.value.trim(),
       note: editNote.value.trim(),
       tags: editTags.value,
-      ingredients: ingredients.map(i => ({ oil_name: i.oil, drops: i.drops })),
+      ingredients: allIngs,
     }
     await recipesStore.saveRecipe(payload)
     // Reload recipes so the data is fresh when re-opened
@@ -1160,19 +1142,18 @@ async function saveRecipe() {
   font-size: 11px;
   letter-spacing: 3px;
   color: var(--sage);
-  margin-bottom: 8px;
+  margin-bottom: 6px;
+  margin-top: -4px;
   white-space: nowrap;
 }
 .ec-title {
-  font-size: 26px;
   font-weight: 700;
   color: var(--text-dark);
   margin-bottom: 6px;
-  line-height: 1.3;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: calc(100% - 80px); /* leave room for QR */
+  line-height: 1.35;
+  max-width: calc(100% - 70px);
+  overflow-wrap: break-word;
+  text-wrap: balance;
 }
 .ec-ing {
   display: flex;
@@ -1245,7 +1226,7 @@ async function saveRecipe() {
 @media (max-width: 420px) {
   .export-card { padding: 24px; }
   .ec-subtitle { font-size: 9px; letter-spacing: 2px; }
-  .ec-title { font-size: 20px; max-width: calc(100% - 65px); }
+  .ec-title { max-width: calc(100% - 60px); }
   .ec-ing { font-size: 12px; padding: 7px 0; }
   .ec-drops { width: 42px; font-size: 11px; }
   .ec-cost { width: 50px; font-size: 10px; }
@@ -1778,6 +1759,15 @@ async function saveRecipe() {
   color: var(--sage-dark, #5a7d5e);
 }
 
+.coco-row { background: #f8faf8; }
+.coco-label { font-weight: 600; color: #4a9d7e; font-size: 13px; }
+.coco-fill { font-size: 12px; color: #4a9d7e; font-weight: 500; }
+.recipe-summary {
+  padding: 10px 14px; background: #f0faf5; border-radius: 10px; border-left: 3px solid #7ec6a4;
+  font-size: 13px; color: #2e7d5a; margin-bottom: 12px; line-height: 1.6;
+}
+.ratio-hint { font-size: 12px; color: #4a9d7e; font-weight: 500; white-space: nowrap; }
+
 /* Volume controls */
 .volume-controls {
   display: flex;
@@ -1827,8 +1817,8 @@ async function saveRecipe() {
 }
 
 .dilution-label {
-  font-size: 13px;
-  color: var(--text-mid, #5a4a35);
+  font-size: 12px;
+  color: #4a9d7e;
   font-weight: 500;
 }
 

frontend/src/components/UserMenu.vue

@@ -14,6 +14,11 @@
         <button class="usermenu-btn" @click="showBugReport">
           🐛 反馈问题
         </button>
+        <template v-if="auth.isAdmin">
+          <button class="usermenu-btn" @click="goAdmin('audit')">📜 操作日志</button>
+          <button class="usermenu-btn" @click="goAdmin('bugs')">🐛 Bug管理</button>
+          <button class="usermenu-btn" @click="goAdmin('users')">👥 用户管理</button>
+        </template>
         <button class="usermenu-btn usermenu-btn-logout" @click="handleLogout">
           🚪 退出登录
         </button>
@@ -88,6 +93,11 @@ function goMyDiary() {
   router.push('/mydiary')
 }
 
+function goAdmin(section) {
+  emit('close')
+  router.push('/' + section)
+}
+
 function toggleNotifications() {
   showNotifPanel.value = !showNotifPanel.value
   showBugForm.value = false
@@ -121,17 +131,33 @@ function isSearchMissing(n) {
 
 function isReviewable(n) {
   if (!n.title) return false
-  return n.title.includes('待审核') || n.title.includes('商业认证') || n.title.includes('申请')
+  // Admin: review recipe/business/applications
+  if (auth.isAdmin) {
+    return n.title.includes('待审核') || n.title.includes('商业认证') || n.title.includes('申请') || n.title.includes('推荐通过')
+  }
+  // Senior editor: assigned reviews
+  if (auth.canManage && n.title.includes('请审核')) return true
+  return false
 }
 
 async function markAdded(n) {
-  await markOneRead(n)
+  const { showConfirm: confirm } = await import('../composables/useDialog')
+  const ok = await confirm('确认已添加该配方？将通知其他编辑者和搜索用户。')
+  if (!ok) return
+  try {
+    await api(`/api/notifications/${n.id}/added`, { method: 'POST' })
+    n.is_read = 1
+    ui.showToast('已标记，已通知相关人员')
+  } catch {
+    await markOneRead(n)
+  }
 }
 
 function goReview(n) {
   markOneRead(n)
   emit('close')
-  if (n.title.includes('配方')) {
+  if (n.title.includes('配方') || n.title.includes('审核') || n.title.includes('推荐')) {
+    localStorage.setItem('oil_open_pending', '1')
     router.push('/manage')
   } else if (n.title.includes('商业认证') || n.title.includes('申请')) {
     router.push('/users')

frontend/src/composables/usePinyinMatch.js

@@ -43,6 +43,20 @@ const PINYIN_MAP = {
   '丽': 'l', '清': 'q', '新': 'x', '自': 'z', '然': 'r',
   '植': 'z', '物': 'w', '芳': 'f', '疗': 'l', '复': 'f',
   '方': 'f', '单': 'd', '配': 'p', '调': 'd',
+  '忍': 'r', '圆': 'y', '侧': 'c', '呵': 'h', '铠': 'k',
+  '浆': 'j', '萸': 'y', '瑞': 'r', '芙': 'f', '蓉': 'r',
+  '桃': 't', '梅': 'm', '兰': 'l', '竹': 'z', '荆': 'j',
+  '藏': 'z', '蒿': 'h', '艾': 'a', '牡': 'm', '丹': 'd',
+  '参': 's', '芝': 'z', '灵': 'l', '芍': 's', '药': 'y',
+  '枫': 'f', '桦': 'h', '柳': 'l', '榉': 'j', '楠': 'n',
+  '海': 'h', '滨': 'b', '泽': 'z', '湖': 'h', '溪': 'x',
+  '威': 'w', '夷': 'y', '亚': 'y', '欧': 'o', '非': 'f',
+  '印': 'y', '澳': 'a', '美': 'm', '德': 'd', '法': 'f',
+  '意': 'y', '英': 'y', '日': 'r', '韩': 'h', '泰': 't',
+  '醒': 'x', '提': 't', '振': 'z', '镇': 'z', '抚': 'f',
+  '触': 'c', '修': 'x', '养': 'y', '滋': 'z', '润': 'r',
+  '呼': 'h', '吸': 'x', '消': 'x', '化': 'h', '排': 'p',
+  '毒': 'd', '净': 'j', '纤': 'x', '体': 't', '塑': 's',
 }
 
 /**
@@ -69,5 +83,5 @@ export function matchesPinyinInitials(name, query) {
   const initials = getPinyinInitials(name)
   if (!initials) return false
   const q = query.toLowerCase()
-  return initials.includes(q)
+  return initials.startsWith(q)
 }

frontend/src/router/index.js

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

frontend/src/stores/auth.js

@@ -73,10 +73,8 @@ export const useAuthStore = defineStore('auth', () => {
     user.value = { ...DEFAULT_USER }
   }
 
-  function canEditRecipe(recipe) {
-    if (isAdmin.value || user.value.role === 'senior_editor') return true
-    if (canEdit.value && recipe._owner_id === user.value.id) return true
-    return false
+  function canEditRecipe() {
+    return canEdit.value
   }
 
   return {

frontend/src/stores/recipes.js

@@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { api } from '../composables/useApi'
 
+export const EDITOR_ONLY_TAGS = ['已审核']
+
 export const useRecipesStore = defineStore('recipes', () => {
   const recipes = ref([])
   const allTags = ref([])
@@ -46,10 +48,8 @@ export const useRecipesStore = defineStore('recipes', () => {
   async function saveRecipe(recipe) {
     if (recipe._id) {
       const data = await api.put(`/api/recipes/${recipe._id}`, recipe)
-      const idx = recipes.value.findIndex((r) => r._id === recipe._id)
-      if (idx !== -1) {
-        recipes.value[idx] = { ...recipes.value[idx], ...recipe, _version: data._version ?? data.version ?? recipe._version }
-      }
+      // Reload from server to get properly formatted data (oil_name → oil mapping)
+      await loadRecipes()
       return data
     } else {
       const data = await api.post('/api/recipes', recipe)

frontend/src/views/AuditLog.vue

@@ -4,7 +4,7 @@
 
     <!-- Action Type Filters -->
     <div class="filter-row">
-      <span class="filter-label">操作类型:</span>
+      <span class="filter-label">操作:</span>
       <button
         v-for="action in actionTypes"
         :key="action.value"
@@ -15,7 +15,7 @@
     </div>
 
     <!-- User Filters -->
-    <div class="filter-row" v-if="uniqueUsers.length > 0">
+    <div class="filter-row" v-if="uniqueUsers.length > 1">
       <span class="filter-label">用户:</span>
       <button
         v-for="u in uniqueUsers"
@@ -26,26 +26,30 @@
       >{{ u }}</button>
     </div>
 
+    <!-- Target Type Filters -->
+    <div class="filter-row">
+      <span class="filter-label">对象:</span>
+      <button
+        v-for="t in targetTypes"
+        :key="t.value"
+        class="filter-btn"
+        :class="{ active: selectedTarget === t.value }"
+        @click="selectedTarget = selectedTarget === t.value ? '' : t.value"
+      >{{ t.label }}</button>
+    </div>
+
     <!-- Log List -->
     <div class="log-list">
-      <div v-for="log in filteredLogs" :key="log._id || log.id" class="log-item">
+      <div v-for="log in filteredLogs" :key="log.id" class="log-item">
         <div class="log-header">
-          <span class="log-action" :class="actionClass(log.action)">{{ actionLabel(log.action) }}</span>
+          <span class="log-action" :class="actionColorClass(log.action)">{{ actionLabel(log.action) }}</span>
           <span class="log-user">{{ log.user_name || log.username || '系统' }}</span>
           <span class="log-time">{{ formatTime(log.created_at) }}</span>
         </div>
         <div class="log-detail">
-          <span v-if="log.target_type" class="log-target">{{ log.target_type }}: </span>
-          <span class="log-desc">{{ log.description || log.detail || formatDetail(log) }}</span>
+          <span v-if="log.target_name" class="log-target-name">{{ log.target_name }}</span>
+          <span v-if="parsedDetail(log)" class="log-extra">{{ parsedDetail(log) }}</span>
         </div>
-        <div v-if="log.changes" class="log-changes">
-          <pre class="changes-pre">{{ typeof log.changes === 'string' ? log.changes : JSON.stringify(log.changes, null, 2) }}</pre>
-        </div>
-        <button
-          v-if="log.undoable"
-          class="btn-undo"
-          @click="undoLog(log)"
-        >↩ 撤销</button>
       </div>
       <div v-if="filteredLogs.length === 0" class="empty-hint">暂无日志记录</div>
     </div>
@@ -61,29 +65,52 @@
 
 <script setup>
 import { ref, computed, onMounted } from 'vue'
-import { useAuthStore } from '../stores/auth'
-import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
-import { showConfirm } from '../composables/useDialog'
-
-const auth = useAuthStore()
-const ui = useUiStore()
 
 const logs = ref([])
 const loading = ref(false)
 const hasMore = ref(true)
 const page = ref(0)
-const pageSize = 50
+const pageSize = 100
 const selectedAction = ref('')
 const selectedUser = ref('')
+const selectedTarget = ref('')
+
+const ACTION_MAP = {
+  create_recipe: '新增配方',
+  update_recipe: '编辑配方',
+  delete_recipe: '删除配方',
+  adopt_recipe: '采纳配方',
+  reject_recipe: '拒绝配方',
+  undo_delete_recipe: '恢复配方',
+  upsert_oil: '编辑精油',
+  delete_oil: '删除精油',
+  create_tag: '新增标签',
+  delete_tag: '删除标签',
+  create_user: '创建用户',
+  update_user: '修改用户',
+  delete_user: '删除用户',
+  undo_delete_user: '恢复用户',
+  business_apply: '申请商业认证',
+  approve_business: '通过商业认证',
+  reject_business: '拒绝商业认证',
+  grant_business: '开通商业认证',
+  revoke_business: '撤销商业认证',
+}
 
 const actionTypes = [
-  { value: 'create', label: '创建' },
-  { value: 'update', label: '更新' },
-  { value: 'delete', label: '删除' },
-  { value: 'login', label: '登录' },
-  { value: 'approve', label: '审核' },
-  { value: 'export', label: '导出' },
+  { value: 'recipe', label: '配方' },
+  { value: 'oil', label: '精油' },
+  { value: 'user', label: '用户' },
+  { value: 'tag', label: '标签' },
+  { value: 'adopt', label: '审核' },
+  { value: 'business', label: '商业认证' },
+]
+
+const targetTypes = [
+  { value: 'recipe', label: '配方' },
+  { value: 'oil', label: '精油' },
+  { value: 'user', label: '用户' },
 ]
 
 const uniqueUsers = computed(() => {
@@ -98,59 +125,56 @@ const uniqueUsers = computed(() => {
 const filteredLogs = computed(() => {
   let result = logs.value
   if (selectedAction.value) {
-    result = result.filter(l => l.action === selectedAction.value)
+    result = result.filter(l => l.action.includes(selectedAction.value))
   }
   if (selectedUser.value) {
-    result = result.filter(l =>
-      (l.user_name || l.username) === selectedUser.value
-    )
+    result = result.filter(l => (l.user_name || l.username) === selectedUser.value)
+  }
+  if (selectedTarget.value) {
+    result = result.filter(l => l.target_type === selectedTarget.value)
   }
   return result
 })
 
 function actionLabel(action) {
-  const map = {
-    create: '创建',
-    update: '更新',
-    delete: '删除',
-    login: '登录',
-    approve: '审核',
-    reject: '拒绝',
-    export: '导出',
-    undo: '撤销',
-  }
-  return map[action] || action
+  return ACTION_MAP[action] || action
 }
 
-function actionClass(action) {
-  return {
-    'action-create': action === 'create',
-    'action-update': action === 'update',
-    'action-delete': action === 'delete' || action === 'reject',
-    'action-login': action === 'login',
-    'action-approve': action === 'approve',
+function actionColorClass(action) {
+  if (action.includes('create') || action.includes('upsert')) return 'color-create'
+  if (action.includes('update')) return 'color-update'
+  if (action.includes('delete') || action.includes('reject')) return 'color-delete'
+  if (action.includes('adopt') || action.includes('undo')) return 'color-approve'
+  return ''
+}
+
+function parsedDetail(log) {
+  if (!log.detail) return ''
+  try {
+    const d = JSON.parse(log.detail)
+    const parts = []
+    if (d.from_role && d.to_role) parts.push(`${d.from_role} → ${d.to_role}`)
+    if (d.from_user) parts.push(`来自: ${d.from_user}`)
+    if (d.reason) parts.push(`原因: ${d.reason}`)
+    if (d.business_name) parts.push(`商户: ${d.business_name}`)
+    if (d.display_name) parts.push(`显示名: ${d.display_name}`)
+    if (d.original_log_id) parts.push(`恢复自 #${d.original_log_id}`)
+    if (parts.length) return parts.join(' · ')
+    // For deleted users, show username
+    if (d.username) return `用户名: ${d.username}`
+    return ''
+  } catch {
+    return log.detail.length > 100 ? log.detail.substring(0, 100) + '...' : log.detail
   }
 }
 
 function formatTime(t) {
   if (!t) return ''
-  const d = new Date(t)
-  return d.toLocaleString('zh-CN', {
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
+  return new Date(t + 'Z').toLocaleString('zh-CN', {
+    month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit',
   })
 }
 
-function formatDetail(log) {
-  if (log.target_name) return log.target_name
-  if (log.recipe_name) return log.recipe_name
-  if (log.oil_name) return log.oil_name
-  return ''
-}
-
 async function fetchLogs() {
   loading.value = true
   try {
@@ -158,9 +182,7 @@ async function fetchLogs() {
     if (res.ok) {
       const data = await res.json()
       const items = Array.isArray(data) ? data : data.logs || data.items || []
-      if (items.length < pageSize) {
-        hasMore.value = false
-      }
+      if (items.length < pageSize) hasMore.value = false
       logs.value.push(...items)
     }
   } catch {
@@ -174,207 +196,52 @@ function loadMore() {
   fetchLogs()
 }
 
-async function undoLog(log) {
-  const ok = await showConfirm('确定撤销此操作？')
-  if (!ok) return
-  try {
-    const id = log._id || log.id
-    const res = await api(`/api/audit-log/${id}/undo`, { method: 'POST' })
-    if (res.ok) {
-      ui.showToast('已撤销')
-      // Refresh
-      logs.value = []
-      page.value = 0
-      hasMore.value = true
-      await fetchLogs()
-    } else {
-      ui.showToast('撤销失败')
-    }
-  } catch {
-    ui.showToast('撤销失败')
-  }
-}
-
-onMounted(() => {
-  fetchLogs()
-})
+onMounted(() => fetchLogs())
 </script>
 
 <style scoped>
-.audit-log {
-  padding: 0 12px 24px;
-}
-
-.page-title {
-  margin: 0 0 16px;
-  font-size: 16px;
-  color: #3e3a44;
-}
+.audit-log { padding: 0 12px 24px; }
+.page-title { margin: 0 0 16px; font-size: 16px; color: #3e3a44; }
 
 .filter-row {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  margin-bottom: 10px;
-  flex-wrap: wrap;
+  display: flex; align-items: center; gap: 6px; margin-bottom: 8px; flex-wrap: wrap;
 }
-
-.filter-label {
-  font-size: 13px;
-  color: #6b6375;
-  font-weight: 500;
-  white-space: nowrap;
-}
-
+.filter-label { font-size: 13px; color: #6b6375; font-weight: 500; white-space: nowrap; }
 .filter-btn {
-  padding: 5px 14px;
-  border-radius: 16px;
-  border: 1.5px solid #e5e4e7;
-  background: #fff;
-  font-size: 12px;
-  cursor: pointer;
-  font-family: inherit;
-  color: #6b6375;
-  transition: all 0.15s;
-}
-
-.filter-btn.active {
-  background: #e8f5e9;
-  border-color: #7ec6a4;
-  color: #2e7d5a;
-  font-weight: 600;
-}
-
-.filter-btn:hover {
-  border-color: #d4cfc7;
-}
-
-.log-list {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
+  padding: 4px 12px; border-radius: 16px; border: 1.5px solid #e5e4e7;
+  background: #fff; font-size: 12px; cursor: pointer; font-family: inherit; color: #6b6375;
 }
+.filter-btn.active { background: #e8f5e9; border-color: #7ec6a4; color: #2e7d5a; font-weight: 600; }
+.filter-btn:hover { border-color: #d4cfc7; }
 
+.log-list { display: flex; flex-direction: column; gap: 4px; }
 .log-item {
-  padding: 12px 14px;
-  background: #fff;
-  border: 1.5px solid #e5e4e7;
-  border-radius: 10px;
-  transition: border-color 0.15s;
-}
-
-.log-item:hover {
-  border-color: #d4cfc7;
-}
-
-.log-header {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  margin-bottom: 4px;
+  padding: 10px 14px; background: #fff; border: 1.5px solid #e5e4e7; border-radius: 10px;
 }
+.log-item:hover { border-color: #d4cfc7; }
 
+.log-header { display: flex; align-items: center; gap: 8px; }
 .log-action {
-  padding: 2px 10px;
-  border-radius: 10px;
-  font-size: 11px;
-  font-weight: 600;
-  background: #f0eeeb;
-  color: #6b6375;
+  padding: 2px 10px; border-radius: 10px; font-size: 11px; font-weight: 600;
+  background: #f0eeeb; color: #6b6375; white-space: nowrap;
 }
+.color-create { background: #e8f5e9; color: #2e7d5a; }
+.color-update { background: #e3f2fd; color: #1565c0; }
+.color-delete { background: #ffebee; color: #c62828; }
+.color-approve { background: #f3e5f5; color: #7b1fa2; }
 
-.action-create { background: #e8f5e9; color: #2e7d5a; }
-.action-update { background: #e3f2fd; color: #1565c0; }
-.action-delete { background: #ffebee; color: #c62828; }
-.action-login { background: #fff3e0; color: #e65100; }
-.action-approve { background: #f3e5f5; color: #7b1fa2; }
-
-.log-user {
-  font-size: 13px;
-  font-weight: 500;
-  color: #3e3a44;
-}
-
-.log-time {
-  font-size: 11px;
-  color: #b0aab5;
-  margin-left: auto;
-}
-
-.log-detail {
-  font-size: 13px;
-  color: #6b6375;
-  margin-top: 2px;
-}
-
-.log-target {
-  font-weight: 500;
-  color: #3e3a44;
-}
-
-.log-changes {
-  margin-top: 6px;
-}
-
-.changes-pre {
-  font-size: 11px;
-  background: #f8f7f5;
-  padding: 8px 10px;
-  border-radius: 6px;
-  overflow-x: auto;
-  margin: 0;
-  color: #6b6375;
-  font-family: ui-monospace, Consolas, monospace;
-  line-height: 1.5;
-  max-height: 120px;
-}
-
-.btn-undo {
-  margin-top: 8px;
-  padding: 4px 12px;
-  border: 1.5px solid #e5e4e7;
-  border-radius: 8px;
-  background: #fff;
-  font-size: 12px;
-  cursor: pointer;
-  font-family: inherit;
-  color: #6b6375;
-}
-
-.btn-undo:hover {
-  border-color: #7ec6a4;
-  color: #4a9d7e;
-}
-
-.load-more {
-  text-align: center;
-  margin-top: 16px;
-}
+.log-user { font-size: 13px; font-weight: 500; color: #3e3a44; }
+.log-time { font-size: 11px; color: #b0aab5; margin-left: auto; white-space: nowrap; }
+.log-detail { font-size: 13px; color: #6b6375; margin-top: 2px; }
+.log-target-name { font-weight: 500; color: #3e3a44; margin-right: 8px; }
+.log-extra { color: #999; font-size: 12px; }
 
+.load-more { text-align: center; margin-top: 16px; }
 .btn-outline {
-  background: #fff;
-  color: #6b6375;
-  border: 1.5px solid #d4cfc7;
-  border-radius: 10px;
-  padding: 9px 28px;
-  font-size: 13px;
-  cursor: pointer;
-  font-family: inherit;
-}
-
-.btn-outline:hover {
-  background: #f8f7f5;
-}
-
-.btn-outline:disabled {
-  opacity: 0.5;
-  cursor: default;
-}
-
-.empty-hint {
-  text-align: center;
-  color: #b0aab5;
-  font-size: 13px;
-  padding: 32px 0;
+  background: #fff; color: #6b6375; border: 1.5px solid #d4cfc7; border-radius: 10px;
+  padding: 9px 28px; font-size: 13px; cursor: pointer; font-family: inherit;
 }
+.btn-outline:hover { background: #f8f7f5; }
+.btn-outline:disabled { opacity: 0.5; cursor: default; }
+.empty-hint { text-align: center; color: #b0aab5; font-size: 13px; padding: 32px 0; }
 </style>

frontend/src/views/MyDiary.vue

@@ -156,7 +156,8 @@
 
         <!-- Brand name -->
         <div class="form-group">
-          <label class="form-label">品牌名称或标语（显示在二维码下方）</label>
+          <label class="form-label">✍ 品牌名称或标语</label>
+          <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">显示在二维码下方</p>
           <textarea v-model="brandName" class="form-control" rows="2" placeholder="扫码申请成为优惠顾客&#10;我的精油小屋" style="max-width:350px;font-size:13px" @blur="saveBrandSettings"></textarea>
           <div style="display:flex;gap:6px;margin-top:6px">
             <button class="btn-align" :class="{ active: brandAlign === 'left' }" @click="brandAlign='left'; saveBrandSettings()">靠左</button>
@@ -173,7 +174,7 @@
             <div v-if="brandBg" style="position:absolute;inset:0;background-size:cover;background-position:center;opacity:0.12;pointer-events:none" :style="{ backgroundImage: 'url(' + brandBg + ')' }"></div>
             <!-- Logo: shown in bottom row, not as watermark -->
             <!-- QR: top-right -->
-            <div v-if="brandQrImage" style="position:absolute;top:16px;right:12px;display:flex;flex-direction:column;align-items:center;gap:2px;z-index:2">
+            <div v-if="brandQrImage" style="position:absolute;top:16px;right:12px;display:flex;flex-direction:column;gap:2px;z-index:2" :style="{ alignItems: brandAlign === 'left' ? 'flex-start' : brandAlign === 'right' ? 'flex-end' : 'center' }">
               <img :src="brandQrImage" style="width:36px;height:36px;object-fit:cover;border-radius:4px;box-shadow:0 1px 4px rgba(0,0,0,0.1)" />
               <div v-if="brandName" :style="{ textAlign: brandAlign }" style="font-size:5px;color:var(--text-light);line-height:1.2;max-width:42px;white-space:pre-line">{{ brandName }}</div>
             </div>
@@ -199,7 +200,7 @@
         </div>
 
         <div style="display:flex;gap:8px;align-items:center">
-          <button class="btn btn-primary" @click="saveBrandSettings">💾 保存品牌设置</button>
+          <span class="auto-save-hint">所有修改自动保存</span>
           <button v-if="returnRecipeId" class="btn btn-outline" @click="goBackToRecipe">← 返回配方卡片</button>
         </div>
       </div>
@@ -241,56 +242,58 @@
       </div>
 
       <!-- Business Verification -->
-      <div ref="bizCertRef" class="section-card">
-        <h4>💼 商业认证</h4>
+      <div ref="bizCertRef" class="section-card biz-card">
+        <h4>🏢 商业用户认证</h4>
 
         <!-- 已认证 -->
-        <div v-if="auth.isBusiness" class="biz-status biz-approved">
-          <div class="biz-status-icon">✅</div>
-          <div class="biz-status-text">已认证商业用户</div>
+        <div v-if="auth.isBusiness" class="biz-status-bar biz-approved">
+          <span>✅ 已认证商业用户</span>
         </div>
 
         <!-- 审核中 -->
-        <template v-else-if="bizApp.status === 'pending'">
-          <div class="biz-status biz-pending">
-            <div class="biz-status-icon">⏳</div>
-            <div class="biz-status-text">认证申请审核中</div>
-            <div class="biz-status-detail">商户名：{{ bizApp.business_name }}</div>
-            <div class="biz-status-detail">提交时间：{{ formatDate(bizApp.created_at) }}</div>
-          </div>
-        </template>
+        <div v-else-if="bizApp.status === 'pending'" class="biz-status-bar biz-pending">
+          <span>⏳ 认证申请审核中</span>
+          <div class="biz-status-detail">商户名：{{ bizApp.business_name }} · 提交时间：{{ formatDate(bizApp.created_at) }}</div>
+        </div>
 
-        <!-- 被拒绝，可重新申请 -->
+        <!-- 被拒绝 -->
         <template v-else-if="bizApp.status === 'rejected'">
-          <div class="biz-status biz-rejected">
-            <div class="biz-status-icon">❌</div>
-            <div class="biz-status-text">认证申请未通过</div>
-            <div v-if="bizApp.reject_reason" class="biz-reject-reason">原因：{{ bizApp.reject_reason }}</div>
+          <div class="biz-status-bar biz-rejected">
+            <span>❌ 认证申请未通过</span>
+            <div v-if="bizApp.reject_reason" class="biz-status-detail">原因：{{ bizApp.reject_reason }}</div>
           </div>
           <p class="hint-text">你可以修改信息后重新申请。</p>
-          <div class="form-group">
-            <label>商户名称</label>
-            <input v-model="businessName" class="form-input" placeholder="你的商户/品牌名称" />
-          </div>
-          <div class="form-group">
-            <label>申请说明</label>
-            <textarea v-model="businessReason" class="form-textarea" rows="3" placeholder="请说明您的业务情况和申请理由..."></textarea>
-          </div>
-          <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim()">重新申请</button>
         </template>
 
-        <!-- 首次申请 -->
-        <template v-else>
-          <p class="hint-text">申请商业认证后可使用商业核算功能，请填写以下信息。</p>
-          <div class="form-group">
-            <label>商户名称</label>
-            <input v-model="businessName" class="form-input" placeholder="你的商户/品牌名称" />
+        <!-- 申请表单（首次或被拒后重新申请） -->
+        <template v-if="!auth.isBusiness && bizApp.status !== 'pending'">
+          <div class="biz-form">
+            <div class="form-group">
+              <label class="form-label">认证类型 *</label>
+              <select v-model="bizType" class="form-select">
+                <option value="">请选择</option>
+                <option value="individual">个体经营户</option>
+                <option value="company">公司</option>
+                <option value="studio">工作室/美容院</option>
+                <option value="distributor">代理商</option>
+              </select>
+            </div>
+            <div class="form-group">
+              <label class="form-label">企业/商户名称 *</label>
+              <input v-model="businessName" class="form-input" placeholder="你的企业或品牌名称" />
+            </div>
+            <div class="form-group">
+              <label class="form-label">联系电话 *</label>
+              <input v-model="bizPhone" class="form-input" type="tel" placeholder="联系电话" />
+            </div>
+            <div class="form-group">
+              <label class="form-label">业务描述</label>
+              <textarea v-model="businessReason" class="form-textarea" rows="3" placeholder="描述你的业务范围和计划..."></textarea>
+            </div>
+            <div style="display:flex;gap:10px;margin-top:12px">
+              <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim() || !bizType">💾 提交申请</button>
+            </div>
           </div>
-          <div class="form-group">
-            <label>申请说明</label>
-            <textarea v-model="businessReason" class="form-textarea" rows="3" placeholder="请说明您的业务情况和申请理由..."></textarea>
-          </div>
-          <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim()">提交申请</button>
         </template>
       </div>
     </div>
@@ -341,6 +344,8 @@ const newPassword = ref('')
 const confirmPassword = ref('')
 const businessName = ref('')
 const businessReason = ref('')
+const bizType = ref('')
+const bizPhone = ref('')
 const bizApp = ref({ status: null })
 
 onMounted(async () => {
@@ -500,36 +505,38 @@ function readFileAsBase64(file) {
   })
 }
 
-// Compress image if too large (keeps PNG for small images, JPEG for large)
-function compressImage(base64, maxSize = 500000) {
+// Compress image if too large
+function compressImage(base64, maxSize = 500000, maxDim = 800) {
   return new Promise((resolve) => {
     if (base64.length <= maxSize) { resolve(base64); return }
     const img = new Image()
     img.onload = () => {
       const canvas = document.createElement('canvas')
       let w = img.width, h = img.height
-      const maxDim = 600
+      // Shrink progressively until it fits
+      let scale = 1
       if (w > maxDim || h > maxDim) {
-        const ratio = Math.min(maxDim / w, maxDim / h)
-        w = Math.round(w * ratio)
-        h = Math.round(h * ratio)
+        scale = Math.min(maxDim / w, maxDim / h)
       }
-      canvas.width = w
-      canvas.height = h
-      canvas.getContext('2d').drawImage(img, 0, 0, w, h)
-      // Try PNG first, then JPEG with decreasing quality
-      let result = canvas.toDataURL('image/png')
-      if (result.length > maxSize) {
-        let quality = 0.85
-        while (quality > 0.2) {
+      for (let attempt = 0; attempt < 5; attempt++) {
+        const cw = Math.round(w * scale)
+        const ch = Math.round(h * scale)
+        canvas.width = cw
+        canvas.height = ch
+        canvas.getContext('2d').drawImage(img, 0, 0, cw, ch)
+        let quality = 0.8
+        let result = canvas.toDataURL('image/jpeg', quality)
+        while (result.length > maxSize && quality > 0.2) {
+          quality -= 0.15
           result = canvas.toDataURL('image/jpeg', quality)
-          if (result.length <= maxSize) break
-          quality -= 0.1
         }
+        if (result.length <= maxSize) { resolve(result); return }
+        scale *= 0.7 // shrink more
       }
-      resolve(result)
+      // Last resort
+      resolve(canvas.toDataURL('image/jpeg', 0.3))
     }
-    img.onerror = () => resolve(base64) // fallback: return original
+    img.onerror = () => resolve(base64)
     img.src = base64
   })
 }
@@ -567,9 +574,35 @@ function checkSquare(base64) {
 }
 
 async function handleUpload(type, event) {
-  const file = event.target.files[0]
+  let file = event.target.files[0]
   if (!file) return
   try {
+    // Convert HEIC/HEIF to JPEG
+    const isHeic = file.name.toLowerCase().match(/\.hei[cf]$/) ||
+      file.type === 'image/heic' || file.type === 'image/heif'
+    if (isHeic) {
+      ui.showToast('正在转换格式...')
+      try {
+        const heic2any = (await import('heic2any')).default
+        let blob = await heic2any({ blob: file, toType: 'image/jpeg', quality: 0.8 })
+        if (Array.isArray(blob)) blob = blob[0]
+        file = new File([blob], 'photo.jpg', { type: 'image/jpeg' })
+      } catch {
+        // Fallback: try createImageBitmap (works on some browsers)
+        try {
+          const bmp = await createImageBitmap(file)
+          const canvas = document.createElement('canvas')
+          canvas.width = bmp.width
+          canvas.height = bmp.height
+          canvas.getContext('2d').drawImage(bmp, 0, 0)
+          const jpegBlob = await new Promise(r => canvas.toBlob(r, 'image/jpeg', 0.8))
+          file = new File([jpegBlob], 'photo.jpg', { type: 'image/jpeg' })
+        } catch {
+          ui.showToast('该格式暂不支持，请在相册中选择"自动"格式或转为JPG后上传')
+          return
+        }
+      }
+    }
     let base64 = await readFileAsBase64(file)
 
     // QR: check if square, offer to crop
@@ -577,15 +610,16 @@ async function handleUpload(type, event) {
       const isSquare = await checkSquare(base64)
       if (!isSquare) {
         const { showConfirm: confirm } = await import('../composables/useDialog')
-        const ok = await confirm('二维码图片不是正方形，是否自动裁剪为正方形？\n（取中心区域）')
+        const ok = await confirm('图片非正方形，自动裁剪？')
         if (ok) {
           base64 = await cropToSquare(base64)
         }
       }
     }
 
-    const maxSize = type === 'bg' ? 1000000 : 500000
-    base64 = await compressImage(base64, maxSize)
+    const maxSize = type === 'bg' ? 600000 : 300000
+    const maxDim = type === 'bg' ? 1000 : 600
+    base64 = await compressImage(base64, maxSize, maxDim)
     const fieldMap = { logo: 'brand_logo', bg: 'brand_bg', qr: 'qr_code' }
     const field = fieldMap[type]
     if (!field) return
@@ -669,24 +703,30 @@ async function changePassword() {
 }
 
 async function applyBusiness() {
-  if (!businessName.value.trim()) {
-    ui.showToast('请填写商户名称')
+  if (!businessName.value.trim() || !bizType.value) {
+    ui.showToast('请填写必填项')
     return
   }
+  const typeLabels = { individual: '个体经营户', company: '公司', studio: '工作室/美容院', distributor: '代理商' }
+  const info = [
+    `认证类型：${typeLabels[bizType.value] || bizType.value}`,
+    bizPhone.value ? `联系电话：${bizPhone.value}` : '',
+    businessReason.value ? `业务描述：${businessReason.value}` : '',
+  ].filter(Boolean).join('\n')
   try {
     const res = await api('/api/business-apply', {
       method: 'POST',
       body: JSON.stringify({
         business_name: businessName.value.trim(),
-        document: businessReason.value.trim(),
+        document: info,
       }),
     })
     if (res.ok) {
       businessName.value = ''
       businessReason.value = ''
-      bizApp.value = { status: 'pending', business_name: businessName.value }
+      bizType.value = ''
+      bizPhone.value = ''
       ui.showToast('申请已提交，请等待管理员审核')
-      // Reload status
       const bizRes = await api('/api/my-business-application')
       if (bizRes.ok) bizApp.value = await bizRes.json()
     } else {
@@ -1138,6 +1178,8 @@ async function applyBusiness() {
   margin-bottom: 12px;
 }
 
+.auto-save-hint { font-size: 12px; color: #999; font-style: italic; }
+
 .verified-badge {
   padding: 12px;
   background: #e8f5e9;
@@ -1147,19 +1189,27 @@ async function applyBusiness() {
   text-align: center;
 }
 
-.biz-status {
-  padding: 16px;
-  border-radius: 12px;
-  text-align: center;
+.biz-card { border-radius: 16px; }
+.biz-status-bar {
+  padding: 12px 16px;
+  border-radius: 10px;
+  font-size: 14px;
+  font-weight: 500;
   margin-bottom: 12px;
+  line-height: 1.6;
 }
-.biz-status-icon { font-size: 32px; margin-bottom: 8px; }
-.biz-status-text { font-size: 15px; font-weight: 600; margin-bottom: 4px; }
-.biz-status-detail { font-size: 12px; color: #999; }
-.biz-approved { background: #e8f5e9; color: #2e7d5a; }
-.biz-pending { background: #fff8e1; color: #e65100; }
-.biz-rejected { background: #fce4ec; color: #c62828; }
-.biz-reject-reason { font-size: 13px; margin-top: 8px; padding: 8px 12px; background: rgba(0,0,0,0.05); border-radius: 8px; }
+.biz-status-bar.biz-approved { background: #e8f5e9; color: #2e7d32; border-left: 3px solid #4caf50; }
+.biz-status-bar.biz-pending { background: #fff3e0; color: #e65100; border-left: 3px solid #ff9800; }
+.biz-status-bar.biz-rejected { background: #ffebee; color: #c62828; border-left: 3px solid #f44336; }
+.biz-status-detail { font-size: 12px; margin-top: 4px; opacity: 0.8; }
+.biz-form { margin-top: 8px; }
+.biz-form .form-group { margin-bottom: 14px; }
+.biz-form .form-label { display: block; font-size: 13px; font-weight: 600; color: #3e3a44; margin-bottom: 6px; }
+.biz-form .form-select {
+  width: 100%; padding: 10px 14px; border: 1.5px solid #d4cfc7; border-radius: 10px;
+  font-size: 14px; font-family: inherit; background: #fff; outline: none; box-sizing: border-box;
+}
+.biz-form .form-select:focus { border-color: #7ec6a4; }
 
 /* Buttons */
 .btn-primary {

frontend/src/views/OilReference.vue

@@ -98,15 +98,15 @@
         <button @click="viewMode = 'drop'" :style="viewMode === 'drop' ? 'background:var(--sage);color:white' : 'background:white;color:var(--text-mid)'" style="border:none;border-radius:0;font-size:12px;padding:6px 12px;cursor:pointer">每滴价</button>
       </div>
       <!-- Desktop: text buttons -->
-      <button v-if="auth.canEdit" class="toolbar-btn-text" @click="showAddForm = !showAddForm">{{ showAddForm ? '收起' : '＋ 新增' }}</button>
+      <button v-if="auth.canManage" class="toolbar-btn-text" @click="showAddForm = !showAddForm">{{ showAddForm ? '收起' : '＋ 新增' }}</button>
       <button v-if="auth.isAdmin" class="toolbar-btn-text" @click="exportPDF">📥 导出PDF</button>
       <!-- Mobile: emoji-only buttons -->
-      <button v-if="auth.canEdit" class="toolbar-btn-icon" @click="showAddForm = !showAddForm" title="新增精油">➕</button>
+      <button v-if="auth.canManage" class="toolbar-btn-icon" @click="showAddForm = !showAddForm" title="新增精油">➕</button>
       <button v-if="auth.isAdmin" class="toolbar-btn-icon" @click="exportPDF" title="导出PDF">📄</button>
     </div>
 
     <!-- Add Oil Form (toggleable) -->
-    <div v-if="showAddForm && auth.canEdit" class="add-oil-form">
+    <div v-if="showAddForm && auth.canManage" class="add-oil-form">
       <div class="form-row">
         <input v-model="newOilName" style="flex:1;min-width:120px" placeholder="精油名称" class="form-input-sm" />
         <input v-model="newOilEnName" style="flex:1;min-width:100px" placeholder="英文名" class="form-input-sm" />
@@ -152,7 +152,7 @@
             </div>
           </template>
         </div>
-        <div v-if="auth.canEdit" class="oil-chip-actions" @click.stop>
+        <div v-if="auth.canManage" class="oil-chip-actions" @click.stop>
           <button @click="editOil(name)" title="编辑">✏️</button>
           <button @click="removeOil(name)" title="删除">🗑</button>
         </div>
@@ -260,7 +260,7 @@
     </div>
 
     <!-- Edit Oil Overlay -->
-    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="saveEditOil">
+    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="$event.isComposing || saveEditOil()">
       <div class="modal-panel">
         <div class="modal-header">
           <h3>{{ editingOilName }}</h3>

frontend/src/views/Projects.vue

@@ -42,26 +42,53 @@
         <button class="btn-outline btn-sm" @click="importFromRecipe">📋 从配方导入</button>
       </div>
 
-      <!-- Ingredients Editor -->
+      <!-- Ingredients Table -->
       <div class="ingredients-section">
-        <h4>🧴 配方成分</h4>
-        <div v-for="(ing, i) in selectedProject.ingredients" :key="i" class="ing-row">
-          <select v-model="ing.oil" class="form-select" @change="saveProject">
-            <option value="">选择精油</option>
-            <option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
-          </select>
-          <input
-            v-model.number="ing.drops"
-            type="number"
-            min="0"
-            class="form-input-sm"
-            placeholder="滴数"
-            @change="saveProject"
-          />
-          <span class="ing-cost">{{ ing.oil ? oils.fmtPrice(oils.pricePerDrop(ing.oil) * (ing.drops || 0)) : '--' }}</span>
-          <button class="btn-icon-sm" @click="removeIngredient(i)">✕</button>
+        <div class="section-header-row">
+          <h4>🧴 配方成分</h4>
+          <div class="section-actions">
+            <button class="btn-outline btn-sm" @click="addIngredient">＋ 添加精油</button>
+          </div>
+        </div>
+        <table class="ingredients-table">
+          <thead>
+            <tr>
+              <th>精油</th>
+              <th>单次用量(滴)</th>
+              <th>单价/滴</th>
+              <th>小计</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="(ing, i) in selectedProject.ingredients" :key="i">
+              <td>
+                <select v-model="ing.oil" class="form-select" @change="saveProject">
+                  <option value="">— 选择精油 —</option>
+                  <option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
+                </select>
+              </td>
+              <td>
+                <input v-model.number="ing.drops" type="number" min="0" step="0.5" class="drops-input" @change="saveProject" />
+              </td>
+              <td class="cell-ppd">{{ ing.oil ? oils.fmtPrice(oils.pricePerDrop(ing.oil)) : '—' }}</td>
+              <td class="cell-subtotal">{{ ing.oil && ing.drops ? oils.fmtPrice(oils.pricePerDrop(ing.oil) * ing.drops) : '—' }}</td>
+              <td><button class="remove-btn" @click="removeIngredient(i)">×</button></td>
+            </tr>
+          </tbody>
+        </table>
+        <div class="total-row">
+          <span class="total-label">配方总成本</span>
+          <span class="total-price">{{ oils.fmtPrice(materialCost) }}</span>
+        </div>
+
+        <!-- Pricing -->
+        <div class="pricing-inline">
+          <div class="price-field">
+            <label>定价 ¥</label>
+            <input v-model.number="selectedProject.selling_price" type="number" class="price-input" placeholder="/次" @change="saveProject" />
+          </div>
         </div>
-        <button class="btn-outline btn-sm" @click="addIngredient">+ 添加成分</button>
       </div>
 
       <!-- Pricing Section -->
@@ -492,12 +519,38 @@ function formatDate(d) {
   color: #3e3a44;
 }
 
-.ing-row {
-  display: flex;
-  gap: 6px;
-  align-items: center;
-  margin-bottom: 6px;
+.section-header-row {
+  display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px;
 }
+.section-header-row h4 { margin: 0; }
+.section-actions { display: flex; gap: 6px; }
+
+.ingredients-table { width: 100%; border-collapse: collapse; margin-bottom: 12px; }
+.ingredients-table th {
+  text-align: center; padding: 10px 8px; font-size: 12px; font-weight: 600;
+  color: var(--text-light, #999); border-bottom: 2px solid #e5e4e7;
+}
+.ingredients-table td { padding: 10px 8px; border-bottom: 1px solid #f0f0f0; text-align: center; }
+.ingredients-table .form-select { width: 100%; padding: 6px 8px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; font-family: inherit; background: #fff; }
+.drops-input { width: 65px; padding: 6px 8px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; text-align: center; outline: none; font-family: inherit; }
+.drops-input:focus { border-color: #7ec6a4; }
+.cell-ppd { color: #999; font-size: 12px; }
+.cell-subtotal { color: #4a9d7e; font-weight: 600; }
+.remove-btn { border: none; background: none; color: #ccc; cursor: pointer; font-size: 18px; }
+.remove-btn:hover { color: #c0392b; }
+
+.total-row {
+  background: #e8f5e9; border-radius: 12px; padding: 14px 18px;
+  display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px;
+}
+.total-label { font-size: 14px; color: #3e3a44; font-weight: 500; }
+.total-price { font-size: 20px; font-weight: 700; color: #2e7d5a; }
+
+.pricing-inline { margin-top: 12px; }
+.price-field { display: flex; align-items: center; gap: 8px; }
+.price-field label { font-size: 13px; font-weight: 600; color: #3e3a44; white-space: nowrap; }
+.price-input { width: 100px; padding: 8px 10px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 14px; font-family: inherit; outline: none; }
+.price-input:focus { border-color: #7ec6a4; }
 
 .form-select {
   flex: 1;
@@ -520,14 +573,6 @@ function formatDate(d) {
   text-align: center;
 }
 
-.ing-cost {
-  font-size: 13px;
-  color: #4a9d7e;
-  font-weight: 500;
-  min-width: 60px;
-  text-align: right;
-}
-
 .price-row {
   display: flex;
   justify-content: space-between;

frontend/src/views/RecipeSearch.vue

@@ -169,7 +169,7 @@ import { ref, computed, onMounted, nextTick, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
-import { useRecipesStore } from '../stores/recipes'
+import { useRecipesStore, EDITOR_ONLY_TAGS } from '../stores/recipes'
 import { useDiaryStore } from '../stores/diary'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
@@ -315,7 +315,8 @@ const exactResults = computed(() => {
   const q = searchQuery.value.trim().toLowerCase()
   return recipeStore.recipes.filter(r => {
     const nameMatch = r.name.toLowerCase().includes(q)
-    const tagMatch = r.tags && r.tags.some(t => t.toLowerCase().includes(q))
+    const visibleTags = auth.canEdit ? (r.tags || []) : (r.tags || []).filter(t => !EDITOR_ONLY_TAGS.includes(t))
+    const tagMatch = visibleTags.some(t => t.toLowerCase().includes(q))
     return nameMatch || tagMatch
   }).sort((a, b) => a.name.localeCompare(b.name, 'zh'))
 })
@@ -719,7 +720,7 @@ function onCarouselTouchEnd(e) {
   font-size: 14px;
   font-weight: 600;
   color: #3e3a44;
-  padding: 8px 4px;
+  padding: 10px 12px;
   margin-bottom: 8px;
 }
 

frontend/src/views/UserManagement.vue

@@ -22,17 +22,33 @@
     </div>
 
     <!-- Business Application Approval -->
-    <div v-if="businessApps.length > 0" class="review-section">
+    <div v-if="groupedBizApps.length > 0" class="review-section">
       <h4 class="section-title">💼 商业认证申请</h4>
       <div class="review-list">
-        <div v-for="app in businessApps" :key="app._id || app.id" class="review-item">
-          <div class="review-info">
-            <span class="review-name">{{ app.display_name || app.username }}</span>
-            <span class="review-reason">商户名：{{ app.business_name }}</span>
+        <div v-for="group in groupedBizApps" :key="group.user_id" class="biz-app-group">
+          <div class="review-item">
+            <div class="review-info">
+              <span class="review-name">{{ group.latest.display_name || group.latest.username }}</span>
+              <span class="review-reason">商户名：{{ group.latest.business_name }}</span>
+              <span class="biz-status-tag" :class="'biz-' + group.latest.status">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.latest.status] }}</span>
+            </div>
+            <div class="review-actions">
+              <template v-if="group.latest.status === 'pending'">
+                <button class="btn-sm btn-approve" @click="approveBusiness(group.latest)">通过</button>
+                <button class="btn-sm btn-reject" @click="rejectBusiness(group.latest)">拒绝</button>
+              </template>
+              <button v-if="group.history.length > 1" class="btn-sm btn-outline" @click="group.expanded = !group.expanded">
+                {{ group.expanded ? '收起' : `历史 (${group.history.length})` }}
+              </button>
+            </div>
           </div>
-          <div class="review-actions">
-            <button class="btn-sm btn-approve" @click="approveBusiness(app)">通过</button>
-            <button class="btn-sm btn-reject" @click="rejectBusiness(app)">拒绝</button>
+          <div v-if="group.expanded" class="biz-history">
+            <div v-for="app in group.history" :key="app.id" class="biz-history-item">
+              <span class="biz-status-tag small" :class="'biz-' + app.status">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[app.status] }}</span>
+              <span>{{ app.business_name }}</span>
+              <span v-if="app.reject_reason" class="biz-reject-reason">拒绝原因：{{ app.reject_reason }}</span>
+              <span class="biz-time">{{ formatDate(app.created_at) }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -86,6 +102,8 @@
             <option value="editor">编辑</option>
             <option value="senior_editor">高级编辑</option>
           </select>
+          <button v-if="!u.business_verified" class="btn-sm btn-outline" @click="grantBusiness(u)" title="开通商业认证">💼</button>
+          <button v-else class="btn-sm btn-outline" @click="revokeBusiness(u)" title="撤销商业认证" style="opacity:0.5">💼✕</button>
           <button class="btn-sm btn-delete" @click="removeUser(u)" title="删除用户">🗑️</button>
         </div>
       </div>
@@ -111,6 +129,27 @@ const searchQuery = ref('')
 const filterRole = ref('')
 const translations = ref([])
 const businessApps = ref([])
+import { reactive } from 'vue'
+
+const groupedBizApps = computed(() => {
+  const map = {}
+  for (const app of businessApps.value) {
+    const uid = app.user_id
+    if (!map[uid]) map[uid] = { user_id: uid, history: [], latest: null, expanded: false }
+    map[uid].history.push(app)
+  }
+  return Object.values(map).map(g => {
+    g.history.sort((a, b) => b.id - a.id)
+    g.latest = g.history[0]
+    return reactive(g)
+  }).filter(g => g.latest)
+})
+
+function formatDate(d) {
+  if (!d) return ''
+  return new Date(d + 'Z').toLocaleString('zh-CN', { month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' })
+}
+
 const roles = [
   { value: 'admin', label: '管理员' },
   { value: 'senior_editor', label: '高级编辑' },
@@ -138,10 +177,6 @@ function roleLabel(role) {
   return map[role] || role
 }
 
-function formatDate(d) {
-  if (!d) return '--'
-  return new Date(d).toLocaleDateString('zh-CN')
-}
 
 async function loadUsers() {
   try {
@@ -207,6 +242,36 @@ async function removeUser(user) {
   }
 }
 
+async function grantBusiness(user) {
+  const ok = await showConfirm(`直接为「${user.display_name || user.username}」开通商业认证？`)
+  if (!ok) return
+  const id = user._id || user.id
+  try {
+    const res = await api(`/api/business-grant/${id}`, { method: 'POST' })
+    if (res.ok) {
+      user.business_verified = 1
+      ui.showToast('已开通商业认证')
+    }
+  } catch {
+    ui.showToast('操作失败')
+  }
+}
+
+async function revokeBusiness(user) {
+  const ok = await showConfirm(`撤销「${user.display_name || user.username}」的商业认证？`)
+  if (!ok) return
+  const id = user._id || user.id
+  try {
+    const res = await api(`/api/business-revoke/${id}`, { method: 'POST' })
+    if (res.ok) {
+      user.business_verified = 0
+      ui.showToast('已撤销商业认证')
+    }
+  } catch {
+    ui.showToast('操作失败')
+  }
+}
+
 async function approveTranslation(t) {
   const id = t._id || t.id
   try {
@@ -352,8 +417,26 @@ onMounted(() => {
 .review-actions {
   display: flex;
   gap: 6px;
+  flex-shrink: 0;
 }
 
+.biz-app-group { margin-bottom: 6px; }
+.biz-status-tag {
+  font-size: 11px; padding: 2px 8px; border-radius: 8px; font-weight: 500; white-space: nowrap;
+}
+.biz-status-tag.small { font-size: 10px; padding: 1px 6px; }
+.biz-pending { background: #fff3e0; color: #e65100; }
+.biz-approved { background: #e8f5e9; color: #2e7d32; }
+.biz-rejected { background: #fce4ec; color: #c62828; }
+.biz-history {
+  margin: 4px 0 8px 16px; padding: 8px 12px; background: #fafaf8; border-radius: 8px; border-left: 3px solid #e5e4e7;
+}
+.biz-history-item {
+  display: flex; align-items: center; gap: 8px; font-size: 12px; padding: 4px 0; flex-wrap: wrap;
+}
+.biz-reject-reason { color: #c62828; font-size: 11px; }
+.biz-time { color: #bbb; font-size: 11px; margin-left: auto; }
+
 .btn-approve {
   background: #4a9d7e;
   color: #fff;