fix: CI动态端口+超时控制，避免e2e卡死

- 后端端口随机9000-9999，前端4000-4999
- 数据库文件按端口号隔离
- vite proxy支持VITE_API_PORT环境变量
- 服务启动超时30秒，失败即退出
- Cypress: defaultCommandTimeout=5s, pageLoadTimeout=10s
- 整个e2e job timeout 5分钟

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

.gitea/workflows/test.yml

@@ -12,6 +12,7 @@ jobs:
   e2e-test:
     runs-on: test
     needs: unit-test
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
 
@@ -23,24 +24,41 @@ jobs:
 
       - name: E2E tests
         run: |
+          # Dynamic ports to avoid conflicts
+          BE_PORT=$(shuf -i 9000-9999 -n 1)
+          FE_PORT=$(shuf -i 4000-4999 -n 1)
+          DB_FILE="/tmp/ci_oil_test_${BE_PORT}.db"
+          echo "Using backend=$BE_PORT frontend=$FE_PORT db=$DB_FILE"
+
           # Start backend
-          DB_PATH=/tmp/ci_oil_test.db FRONTEND_DIR=/dev/null \
-            /tmp/ci-venv/bin/uvicorn backend.main:app --port 8000 &
+          DB_PATH="$DB_FILE" FRONTEND_DIR=/dev/null \
+            /tmp/ci-venv/bin/uvicorn backend.main:app --port $BE_PORT &
+          BE_PID=$!
 
-          # Start frontend (in subshell to not change cwd)
-          (cd frontend && npx vite --port 5173) &
+          # Start frontend with proxy to dynamic backend port
+          (cd frontend && VITE_API_PORT=$BE_PORT npx vite --port $FE_PORT) &
+          FE_PID=$!
 
-          # Wait for both servers
+          # Wait for both servers (max 30s, fail fast)
+          READY=0
           for i in $(seq 1 30); do
-            if curl -sf http://localhost:8000/api/version > /dev/null 2>&1 && \
-               curl -sf http://localhost:5173/ > /dev/null 2>&1; then
-              echo "Both servers ready"
+            if curl -sf http://localhost:$BE_PORT/api/oils > /dev/null 2>&1 && \
+               curl -sf http://localhost:$FE_PORT/ > /dev/null 2>&1; then
+              echo "Both servers ready in ${i}s"
+              READY=1
               break
             fi
             sleep 1
           done
 
-          # Run core cypress specs (proven stable)
+          if [ "$READY" = "0" ]; then
+            echo "ERROR: Servers failed to start within 30s"
+            kill $BE_PID $FE_PID 2>/dev/null
+            rm -f "$DB_FILE"
+            exit 1
+          fi
+
+          # Run core cypress specs with timeouts
           cd frontend
           npx cypress run --spec "\
           cypress/e2e/recipe-detail.cy.js,\
@@ -50,13 +68,12 @@ jobs:
           cypress/e2e/category-modules.cy.js,\
           cypress/e2e/notification-flow.cy.js,\
           cypress/e2e/registration-flow.cy.js\
-          " --config video=false
+          " --config "video=false,defaultCommandTimeout=5000,pageLoadTimeout=10000,baseUrl=http://localhost:$FE_PORT"
           EXIT_CODE=$?
 
           # Cleanup
-          pkill -f "uvicorn backend" || true
-          pkill -f "node.*vite" || true
-          rm -f /tmp/ci_oil_test.db
+          kill $BE_PID $FE_PID 2>/dev/null
+          rm -f "$DB_FILE"
           exit $EXIT_CODE
 
   build-check:

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

@@ -324,7 +324,7 @@ def symptom_search(body: dict, user=Depends(get_current_user)):
     # If user reports no match, notify editors
     if body.get("report_missing"):
         who = user.get("display_name") or user.get("username") or "用户"
-        for role in ("admin", "senior_editor", "editor"):
+        for role in ("admin", "senior_editor"):
             conn.execute(
                 "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
                 (role, "🔍 用户需求：" + query,
@@ -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,13 +799,20 @@ 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 when non-admin creates a recipe
-    if user["role"] != "admin":
-        who = user.get("display_name") or user["username"]
+    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}」，请到管理配方查看并采纳。")
+             f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
         )
     conn.commit()
     conn.close()
@@ -780,15 +820,13 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
 
 
 def _check_recipe_permission(conn, recipe_id, user):
-    """Check if user can modify this recipe."""
+    """Check if user can modify this recipe. Requires editor+ role."""
     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"):
+    if user["role"] in ("admin", "senior_editor", "editor"):
         return row
-    if row["owner_id"] == user.get("id"):
-        return row
-    raise HTTPException(403, "只能修改自己创建的配方")
+    raise HTTPException(403, "权限不足")
 
 
 @app.put("/api/recipes/{recipe_id}")
@@ -862,11 +900,95 @@ def adopt_recipe(recipe_id: int, user=Depends(require_role("admin"))):
     if row["owner_id"] == user["id"]:
         conn.close()
         return {"ok": True, "msg": "already owned"}
-    old_owner = conn.execute("SELECT display_name, username FROM users WHERE id = ?", (row["owner_id"],)).fetchone()
+    old_owner = conn.execute("SELECT id, role, display_name, username FROM users WHERE id = ?", (row["owner_id"],)).fetchone()
     old_name = (old_owner["display_name"] or old_owner["username"]) if old_owner else "unknown"
     conn.execute("UPDATE recipes SET owner_id = ?, updated_by = ? WHERE id = ?", (user["id"], user["id"], recipe_id))
     log_audit(conn, user["id"], "adopt_recipe", "recipe", recipe_id, row["name"],
               json.dumps({"from_user": old_name}))
+    # Notify submitter that recipe was approved
+    if old_owner and old_owner["id"] != user["id"]:
+        conn.execute(
+            "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
+            (old_owner["role"], "🎉 配方已采纳",
+             f"你共享的配方「{row['name']}」已被采纳到公共配方库！", old_owner["id"])
+        )
+    conn.commit()
+    conn.close()
+    return {"ok": True}
+
+
+@app.post("/api/recipes/{recipe_id}/reject")
+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:
+        conn.close()
+        raise HTTPException(404, "Recipe not found")
+    reason = (body or {}).get("reason", "").strip()
+    # Notify submitter
+    old_owner = conn.execute("SELECT id, role, display_name, username FROM users WHERE id = ?", (row["owner_id"],)).fetchone()
+    if old_owner and old_owner["id"] != user["id"]:
+        msg = f"你共享的配方「{row['name']}」未被采纳。"
+        if reason:
+            msg += f"\n原因：{reason}"
+        msg += "\n你可以修改后重新共享。"
+        conn.execute(
+            "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
+            (old_owner["role"], "配方未被采纳", msg, old_owner["id"])
+        )
+    # Delete the recipe
+    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, "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}
@@ -972,12 +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:
-        conn.execute("UPDATE users SET role = ? WHERE id = ?", (body.role, user_id))
+        if body.role == "admin":
+            conn.close()
+            raise HTTPException(403, "不能将用户设为管理员")
+        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}
@@ -1107,17 +1242,32 @@ def list_projects():
     conn = get_db()
     rows = conn.execute("SELECT * FROM profit_projects ORDER BY id DESC").fetchall()
     conn.close()
-    return [{ **dict(r), "ingredients": json.loads(r["ingredients"]) } for r in rows]
+    result = []
+    for r in rows:
+        d = dict(r)
+        d["ingredients"] = json.loads(r["ingredients"])
+        try:
+            extra = json.loads(r["pricing"]) if r["pricing"] else {}
+            if isinstance(extra, dict):
+                d.update(extra)
+        except (json.JSONDecodeError, TypeError):
+            pass
+        result.append(d)
+    return result
 
 
 @app.post("/api/projects", status_code=201)
 def create_project(body: dict, user=Depends(require_role("admin", "senior_editor"))):
     conn = get_db()
     c = conn.cursor()
+    extra = {}
+    for k in ("selling_price", "packaging_cost", "labor_cost", "other_cost", "quantity"):
+        if k in body:
+            extra[k] = body[k]
     c.execute(
         "INSERT INTO profit_projects (name, ingredients, pricing, note, created_by) VALUES (?, ?, ?, ?, ?)",
         (body["name"], json.dumps(body.get("ingredients", []), ensure_ascii=False),
-         body.get("pricing", 0), body.get("note", ""), user["id"])
+         json.dumps(extra) if extra else '{}', body.get("note", ""), user["id"])
     )
     conn.commit()
     pid = c.lastrowid
@@ -1137,6 +1287,14 @@ def update_project(pid: int, body: dict, user=Depends(require_role("admin", "sen
         conn.execute("UPDATE profit_projects SET pricing = ? WHERE id = ?", (body["pricing"], pid))
     if "note" in body:
         conn.execute("UPDATE profit_projects SET note = ? WHERE id = ?", (body["note"], pid))
+    # Store extra cost fields in pricing as JSON
+    extra = {}
+    for k in ("selling_price", "packaging_cost", "labor_cost", "other_cost", "quantity"):
+        if k in body:
+            extra[k] = body[k]
+    if extra:
+        conn.execute("UPDATE profit_projects SET pricing = ? WHERE id = ?",
+                     (json.dumps(extra, ensure_ascii=False), pid))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1182,14 +1340,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
@@ -1397,17 +1556,75 @@ def get_unmatched_searches(days: int = 7, user=Depends(require_role("admin", "se
     return [dict(r) for r in rows]
 
 
+# ── Recipe review history ──────────────────────────────
+@app.get("/api/recipe-reviews")
+def list_recipe_reviews(user=Depends(require_role("admin"))):
+    conn = get_db()
+    rows = conn.execute(
+        "SELECT a.id, a.action, a.target_name, a.detail, a.created_at, "
+        "u.display_name, u.username "
+        "FROM audit_log a LEFT JOIN users u ON a.user_id = u.id "
+        "WHERE a.action IN ('adopt_recipe', 'reject_recipe') "
+        "ORDER BY a.id DESC LIMIT 100"
+    ).fetchall()
+    conn.close()
+    return [dict(r) for r in rows]
+
+
+# ── Contribution stats ─────────────────────────────────
+@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, "adopted_names": [], "pending_names": []}
+    conn = get_db()
+    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": len(adopted_names),
+        "shared_count": len(all_names),
+        "adopted_names": adopted_names,
+        "pending_names": pending_names,
+    }
+
+
 # ── Notifications ──────────────────────────────────────
 @app.get("/api/notifications")
 def get_notifications(user=Depends(get_current_user)):
     if not user["id"]:
         return []
     conn = get_db()
+    # 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"])
+        (user["id"], user["role"], cutoff)
     ).fetchall()
     conn.close()
     return [dict(r) for r in rows]
@@ -1428,6 +1645,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/oil-data-integrity.cy.js

@@ -25,7 +25,7 @@ describe('Oil Data Integrity', () => {
         const ppd = oil.bottle_price / oil.drop_count
         expect(ppd).to.be.a('number')
         expect(ppd).to.be.gte(0)
-        expect(ppd).to.be.lte(100) // sanity check: no oil costs >100 per drop
+        expect(ppd).to.be.lte(300) // sanity check: some premium oils can cost >100 per drop
       })
     })
   })

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

@@ -1,45 +1,57 @@
+function dismissModals() {
+  cy.get('body').then($body => {
+    if ($body.find('.login-overlay').length) {
+      cy.get('.login-overlay').click('topLeft')
+    }
+    if ($body.find('.dialog-overlay').length) {
+      cy.get('.dialog-btn-primary').click()
+    }
+  })
+}
+
 describe('Recipe Detail', () => {
   beforeEach(() => {
     cy.visit('/')
     cy.get('.recipe-card', { timeout: 10000 }).should('have.length.gte', 1)
+    dismissModals()
   })
 
   it('opens detail panel when clicking a recipe card', () => {
     cy.get('.recipe-card').first().click()
-    cy.get('[class*="detail"]').should('be.visible')
+    dismissModals()
+    cy.get('.detail-overlay').should('exist')
   })
 
   it('shows recipe name in detail view', () => {
-    cy.get('.recipe-card').first().invoke('text').then(cardText => {
-      cy.get('.recipe-card').first().click()
-      cy.wait(500)
-      cy.get('[class*="detail"]').should('be.visible')
-    })
+    cy.get('.recipe-card').first().click()
+    dismissModals()
+    cy.get('.detail-overlay').should('exist')
   })
 
   it('shows ingredient info with drops', () => {
     cy.get('.recipe-card').first().click()
-    cy.wait(500)
+    dismissModals()
     cy.contains('滴').should('exist')
   })
 
   it('shows cost with ¥ symbol', () => {
     cy.get('.recipe-card').first().click()
-    cy.wait(500)
+    dismissModals()
     cy.contains('¥').should('exist')
   })
 
   it('closes detail panel when clicking close button', () => {
     cy.get('.recipe-card').first().click()
-    cy.get('[class*="detail"]').should('be.visible')
-    cy.get('button').contains(/✕|关闭/).first().click()
+    dismissModals()
+    cy.get('.detail-overlay').should('exist')
+    cy.get('.detail-close-btn').first().click({ force: true })
     cy.get('.recipe-card').should('be.visible')
   })
 
   it('shows action buttons in detail', () => {
     cy.get('.recipe-card').first().click()
-    cy.wait(500)
-    cy.get('[class*="detail"] button').should('have.length.gte', 1)
+    dismissModals()
+    cy.get('.detail-overlay button').should('have.length.gte', 1)
   })
 
   it('shows favorite star on recipe cards', () => {
@@ -47,35 +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()
+    cy.get('.recipe-card').first().click()
+    dismissModals()
   })
 
-  it('shows editable ingredients table in editor tab', () => {
-    cy.get('.recipe-card').first().click()
-    cy.wait(500)
-    cy.contains('编辑').click()
-    cy.get('.editor-select, .editor-drops').should('exist')
+  it('shows export card with doTERRA branding', () => {
+    cy.get('.export-card').should('exist')
+    cy.contains('doTERRA').should('exist')
   })
 
-  it('shows add ingredient button in editor tab', () => {
-    cy.get('.recipe-card').first().click()
-    cy.wait(500)
-    cy.contains('编辑').click()
-    cy.contains('添加精油').should('exist')
-  })
-
-  it('shows export image button', () => {
-    cy.get('.recipe-card').first().click()
-    cy.wait(500)
-    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

@@ -1,6 +1,6 @@
 <template>
   <div v-if="isPreview" style="background:#e65100;color:white;text-align:center;padding:6px 16px;font-size:13px;font-weight:600;letter-spacing:0.5px;position:sticky;top:0;z-index:100">
-    ⚠️ 预览环境 · PR #{{ prId }} · 数据为生产副本，修改不影响正式环境
+    ⚠️ 预览环境 · PR #{{ prId }} · 数据为生产副本，修改不影响正式环境 · {{ buildInfo }}
   </div>
   <div class="app-header">
     <div class="header-inner">
@@ -9,12 +9,14 @@
         <div class="header-title">
           <h1>doTERRA 配方计算器</h1>
           <p>查询配方 · 计算成本 · 自制配方 · 导出卡片 · 精油知识</p>
+          <p v-if="auth.isAdmin" class="version-info">v2.0.0 · 2026-04-10</p>
         </div>
       </div>
       <div class="header-right" @click="toggleUserMenu">
         <template v-if="auth.isLoggedIn">
           <span v-if="auth.isBusiness" class="biz-badge" title="商业认证用户">🏢</span>
           <span class="user-name">{{ auth.user.display_name || auth.user.username }} ▾</span>
+          <span v-if="unreadNotifCount > 0" class="notif-badge">{{ unreadNotifCount }}</span>
         </template>
         <template v-else>
           <span class="login-btn">登录</span>
@@ -24,22 +26,19 @@
   </div>
 
   <!-- User Menu Popup -->
-  <UserMenu v-if="showUserMenu" @close="showUserMenu = false" />
+  <UserMenu v-if="showUserMenu" @close="showUserMenu = false; loadUnreadCount()" />
 
   <!-- Nav tabs -->
-  <div class="nav-tabs" :style="isPreview ? { top: '36px' } : {}">
-    <div class="nav-tab" :class="{ active: ui.currentSection === 'search' }" @click="goSection('search')">🔍 配方查询</div>
-    <div class="nav-tab" :class="{ active: ui.currentSection === 'manage' }" @click="requireLogin('manage')">📋 管理配方</div>
-    <div class="nav-tab" :class="{ active: ui.currentSection === 'inventory' }" @click="requireLogin('inventory')">📦 个人库存</div>
-    <div class="nav-tab" :class="{ active: ui.currentSection === 'oils' }" @click="goSection('oils')">💧 精油价目</div>
-    <div v-if="auth.isBusiness" class="nav-tab" :class="{ active: ui.currentSection === 'projects' }" @click="goSection('projects')">💼 商业核算</div>
-    <div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'audit' }" @click="goSection('audit')">📜 操作日志</div>
-    <div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'bugs' }" @click="goSection('bugs')">🐛 Bug</div>
-    <div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'users' }" @click="goSection('users')">👥 用户管理</div>
+  <div class="nav-tabs" ref="navTabsRef" :style="isPreview ? { top: '36px' } : {}">
+    <div v-for="tab in visibleTabs" :key="tab.key"
+      class="nav-tab"
+      :class="{ active: ui.currentSection === tab.key }"
+      @click="handleTabClick(tab)"
+    >{{ tab.icon }} {{ tab.label }}</div>
   </div>
 
   <!-- Main content -->
-  <div class="main">
+  <div class="main" @touchstart="onSwipeStart" @touchend="onSwipeEnd">
     <router-view />
   </div>
 
@@ -54,7 +53,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue'
+import { ref, computed, onMounted, watch, nextTick } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useAuthStore } from './stores/auth'
 import { useOilsStore } from './stores/oils'
@@ -63,6 +62,7 @@ import { useUiStore } from './stores/ui'
 import LoginModal from './components/LoginModal.vue'
 import CustomDialog from './components/CustomDialog.vue'
 import UserMenu from './components/UserMenu.vue'
+import { api } from './composables/useApi'
 
 const auth = useAuthStore()
 const oils = useOilsStore()
@@ -71,12 +71,44 @@ const ui = useUiStore()
 const router = useRouter()
 const route = useRoute()
 const showUserMenu = ref(false)
+const navTabsRef = ref(null)
+
+// Tab 定义，顺序固定
+// require: 点击时需要的条件，不满足则提示
+// hide: 完全隐藏（只有满足条件才显示）
+const allTabs = [
+  { key: 'search',    icon: '🔍', label: '配方查询' },
+  { key: 'manage',    icon: '📋', label: '管理配方',  require: 'login' },
+  { key: 'inventory', icon: '📦', label: '个人库存',  require: 'login' },
+  { key: 'oils',      icon: '💧', label: '精油价目' },
+  { key: 'projects',  icon: '💼', label: '商业核算',  require: 'login' },
+]
+
+// 所有人都能看到大部分 tab，bug 和用户管理只有 admin 可见
+const visibleTabs = computed(() => allTabs.filter(t => {
+  if (!t.hide) return true
+  if (t.hide === 'admin') return auth.isAdmin
+  return true
+}))
+const unreadNotifCount = ref(0)
+
+async function loadUnreadCount() {
+  if (!auth.isLoggedIn) return
+  try {
+    const res = await api('/api/notifications')
+    if (res.ok) {
+      const data = await res.json()
+      unreadNotifCount.value = data.filter(n => !n.is_read).length
+    }
+  } catch {}
+}
 
 // Sync ui.currentSection from route on load and navigation
 const routeToSection = { '/': 'search', '/manage': 'manage', '/inventory': 'inventory', '/oils': 'oils', '/projects': 'projects', '/mydiary': 'mydiary', '/audit': 'audit', '/bugs': 'bugs', '/users': 'users' }
 watch(() => route.path, (path) => {
   const section = routeToSection[path] || 'search'
   ui.showSection(section)
+  nextTick(() => scrollActiveTabToCenter())
 }, { immediate: true })
 
 // Preview environment detection: pr-{id}.oil.oci.euphon.net
@@ -84,10 +116,37 @@ const hostname = window.location.hostname
 const prMatch = hostname.match(/^pr-(\d+)\./)
 const isPreview = !!prMatch
 const prId = prMatch ? prMatch[1] : ''
+const buildInfo = __BUILD_TIME__ || ''
+
+function handleTabClick(tab) {
+  if (tab.require === 'login' && !auth.isLoggedIn) {
+    ui.openLogin(() => goSection(tab.key))
+    return
+  }
+  if (tab.require === 'business' && !auth.isBusiness) {
+    if (!auth.isLoggedIn) {
+      ui.openLogin(() => goSection(tab.key))
+    } else {
+      ui.showToast('需要商业认证才能使用此功能')
+    }
+    return
+  }
+  goSection(tab.key)
+}
 
 function goSection(name) {
   ui.showSection(name)
   router.push('/' + (name === 'search' ? '' : name))
+  nextTick(() => scrollActiveTabToCenter())
+}
+
+function scrollActiveTabToCenter() {
+  if (!navTabsRef.value) return
+  const active = navTabsRef.value.querySelector('.nav-tab.active')
+  if (!active) return
+  const container = navTabsRef.value
+  const scrollLeft = active.offsetLeft - container.clientWidth / 2 + active.clientWidth / 2
+  container.scrollTo({ left: scrollLeft, behavior: 'smooth' })
 }
 
 function requireLogin(name) {
@@ -106,6 +165,38 @@ function toggleUserMenu() {
   showUserMenu.value = !showUserMenu.value
 }
 
+// ── 左右滑动切换 tab ──
+// 滑动顺序 = visibleTabs 的顺序（根据用户角色动态决定）
+// 轮播区域（data-no-tab-swipe）内的滑动不触发 tab 切换
+const swipeStartX = ref(0)
+const swipeStartY = ref(0)
+
+function onSwipeStart(e) {
+  swipeStartX.value = e.touches[0].clientX
+  swipeStartY.value = e.touches[0].clientY
+}
+
+function onSwipeEnd(e) {
+  const dx = e.changedTouches[0].clientX - swipeStartX.value
+  const dy = e.changedTouches[0].clientY - swipeStartY.value
+  // 必须是水平滑动 > 50px，且水平距离大于垂直距离
+  if (Math.abs(dx) < 50 || Math.abs(dy) > Math.abs(dx)) return
+  // 轮播区域内不触发 tab 切换
+  if (e.target.closest && e.target.closest('[data-no-tab-swipe]')) return
+
+  const tabs = visibleTabs.value.map(t => t.key)
+  const currentIdx = tabs.indexOf(ui.currentSection)
+  if (currentIdx < 0) return
+
+  let nextIdx = -1
+  if (dx < 0 && currentIdx < tabs.length - 1) nextIdx = currentIdx + 1
+  else if (dx > 0 && currentIdx > 0) nextIdx = currentIdx - 1
+  if (nextIdx >= 0) {
+    const tab = visibleTabs.value[nextIdx]
+    handleTabClick(tab)
+  }
+}
+
 onMounted(async () => {
   await auth.initToken()
   await Promise.all([
@@ -115,6 +206,7 @@ onMounted(async () => {
   ])
   if (auth.isLoggedIn) {
     await recipeStore.loadFavorites()
+    await loadUnreadCount()
   }
 
   // Periodic refresh
@@ -122,6 +214,7 @@ onMounted(async () => {
     if (document.visibilityState !== 'visible') return
     try {
       await auth.loadMe()
+      await loadUnreadCount()
     } catch {}
   }, 15000)
 })
@@ -161,6 +254,11 @@ onMounted(async () => {
   letter-spacing: 0.5px;
   white-space: nowrap;
 }
+.version-info {
+  font-size: 10px !important;
+  opacity: 0.5 !important;
+  margin-top: 1px !important;
+}
 .header-right {
   flex-shrink: 0;
   cursor: pointer;
@@ -175,6 +273,19 @@ onMounted(async () => {
   opacity: 0.95;
   white-space: nowrap;
 }
+.notif-badge {
+  background: #e53935;
+  color: #fff;
+  font-size: 11px;
+  font-weight: 700;
+  min-width: 18px;
+  height: 18px;
+  line-height: 18px;
+  text-align: center;
+  border-radius: 9px;
+  padding: 0 5px;
+  margin-left: 4px;
+}
 .login-btn {
   color: white;
   background: rgba(255,255,255,0.2);

frontend/src/__tests__/inventoryCommercial.test.js

@@ -0,0 +1,146 @@
+import { describe, it, expect } from 'vitest'
+
+// ---------------------------------------------------------------------------
+// Kit definitions
+// ---------------------------------------------------------------------------
+describe('Kit definitions', () => {
+  const KITS = {
+    family: ['乳香', '茶树', '薰衣草', '柠檬', '椒样薄荷', '保卫', '牛至', '乐活', '顺畅呼吸', '舒缓'],
+    home3988: ['乳香', '野橘', '柠檬', '薰衣草', '椒样薄荷', '冬青', '茶树', '生姜', '柠檬草', '西班牙牛至',
+      '西洋蓍草石榴籽', '乐活', '保卫', '新瑞活力', '舒缓', '安定情绪', '安宁神气', '顺畅呼吸', '柑橘清新', '芳香调理', '元气焕能'],
+    aroma: ['薰衣草', '舒缓', '安定情绪', '芳香调理', '野橘', '椒样薄荷', '保卫', '茶树'],
+  }
+
+  it('family kit has 10 oils', () => {
+    expect(KITS.family).toHaveLength(10)
+  })
+
+  it('home3988 kit has 21 oils', () => {
+    expect(KITS.home3988).toHaveLength(21)
+  })
+
+  it('aroma kit has 8 oils', () => {
+    expect(KITS.aroma).toHaveLength(8)
+    expect(KITS.aroma).toContain('薰衣草')
+    expect(KITS.aroma).toContain('芳香调理')
+    expect(KITS.aroma).toContain('茶树')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Recipe matching (exclude coconut oil)
+// ---------------------------------------------------------------------------
+describe('Recipe matching', () => {
+  function matchRecipe(recipe, ownedSet) {
+    const needed = recipe.ingredients.filter(i => i.oil !== '椰子油').map(i => i.oil)
+    if (needed.length === 0) return false
+    const coverage = needed.filter(o => ownedSet.has(o)).length
+    return coverage >= 1
+  }
+
+  it('matches recipe when user has at least one oil', () => {
+    const recipe = { ingredients: [{ oil: '乳香', drops: 3 }, { oil: '茶树', drops: 2 }, { oil: '椰子油', drops: 100 }] }
+    expect(matchRecipe(recipe, new Set(['乳香']))).toBe(true)
+  })
+
+  it('does not match when user has none of the oils', () => {
+    const recipe = { ingredients: [{ oil: '乳香', drops: 3 }, { oil: '茶树', drops: 2 }] }
+    expect(matchRecipe(recipe, new Set(['薰衣草']))).toBe(false)
+  })
+
+  it('excludes coconut oil from matching', () => {
+    const recipe = { ingredients: [{ oil: '椰子油', drops: 100 }] }
+    expect(matchRecipe(recipe, new Set(['椰子油']))).toBe(false)
+  })
+
+  it('matches when user has all oils', () => {
+    const recipe = { ingredients: [{ oil: '乳香', drops: 3 }, { oil: '茶树', drops: 2 }] }
+    expect(matchRecipe(recipe, new Set(['乳香', '茶树']))).toBe(true)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Consumption analysis
+// ---------------------------------------------------------------------------
+describe('Consumption analysis', () => {
+  function calcConsumption(ingredients, oilsMeta) {
+    return ingredients
+      .filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
+      .map(i => {
+        const bottleDrops = oilsMeta[i.oil]?.dropCount || 0
+        const sessions = bottleDrops > 0 ? Math.floor(bottleDrops / i.drops) : 0
+        return { oil: i.oil, drops: i.drops, bottleDrops, sessions }
+      })
+  }
+
+  function findLimit(data) {
+    const valid = data.filter(c => c.sessions > 0)
+    if (!valid.length) return { oil: '', sessions: 0, allSame: true }
+    const min = Math.min(...valid.map(c => c.sessions))
+    const allSame = valid.every(c => c.sessions === valid[0].sessions)
+    const limiting = valid.find(c => c.sessions === min)
+    return { oil: limiting.oil, sessions: min, allSame }
+  }
+
+  const meta = {
+    '芳香调理': { dropCount: 280 },
+    '薰衣草': { dropCount: 280 },
+    '茶树': { dropCount: 280 },
+  }
+
+  it('calculates sessions correctly', () => {
+    const data = calcConsumption([{ oil: '芳香调理', drops: 10 }], meta)
+    expect(data[0].sessions).toBe(28)
+  })
+
+  it('finds limiting oil', () => {
+    const data = calcConsumption([
+      { oil: '芳香调理', drops: 10 },
+      { oil: '薰衣草', drops: 20 },
+    ], meta)
+    const limit = findLimit(data)
+    expect(limit.oil).toBe('薰衣草')
+    expect(limit.sessions).toBe(14)
+    expect(limit.allSame).toBe(false)
+  })
+
+  it('detects all same sessions', () => {
+    const data = calcConsumption([
+      { oil: '芳香调理', drops: 10 },
+      { oil: '茶树', drops: 10 },
+    ], meta)
+    const limit = findLimit(data)
+    expect(limit.allSame).toBe(true)
+    expect(limit.sessions).toBe(28)
+  })
+
+  it('excludes coconut oil', () => {
+    const data = calcConsumption([
+      { oil: '芳香调理', drops: 10 },
+      { oil: '椰子油', drops: 200 },
+    ], meta)
+    expect(data).toHaveLength(1)
+    expect(data[0].oil).toBe('芳香调理')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Project pricing persistence
+// ---------------------------------------------------------------------------
+describe('Project pricing JSON', () => {
+  it('serializes extra fields to JSON', () => {
+    const extra = { selling_price: 299, packaging_cost: 5, labor_cost: 30, other_cost: 10, quantity: 1 }
+    const json = JSON.stringify(extra)
+    const parsed = JSON.parse(json)
+    expect(parsed.selling_price).toBe(299)
+    expect(parsed.quantity).toBe(1)
+  })
+
+  it('merges extra fields back into project', () => {
+    const project = { id: 1, name: 'test', ingredients: [], pricing: '{"selling_price":299,"quantity":1}' }
+    const extra = JSON.parse(project.pricing)
+    const merged = { ...project, ...extra }
+    expect(merged.selling_price).toBe(299)
+    expect(merged.quantity).toBe(1)
+  })
+})

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/assets/styles.css

@@ -69,6 +69,24 @@ body {
 .nav-tab:hover { color: var(--sage-dark); }
 .nav-tab.active { color: var(--sage-dark); border-bottom-color: var(--sage); }
 
+.section-title-bar {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: white;
+  padding: 12px 0;
+  position: sticky;
+  top: 0;
+  z-index: 50;
+}
+.section-title-text {
+  font-size: 15px;
+  font-weight: 600;
+  color: var(--sage-dark);
+  border-bottom: 2px solid var(--sage);
+  padding-bottom: 4px;
+}
+
 /* Main content */
 .main { padding: 24px; max-width: 960px; margin: 0 auto; }
 

frontend/src/components/LoginModal.vue

@@ -51,6 +51,15 @@
         <button class="login-submit" :disabled="loading" @click="submit">
           {{ loading ? '请稍候...' : (mode === 'login' ? '登录' : '注册') }}
         </button>
+
+        <div class="login-divider"></div>
+        <button v-if="!showFeedback" class="login-feedback-btn" @click="showFeedback = true">🐛 反馈问题（无需登录）</button>
+        <div v-if="showFeedback" class="feedback-section">
+          <textarea v-model="feedbackText" class="login-input" rows="3" placeholder="描述你遇到的问题..." style="resize:vertical;"></textarea>
+          <button class="login-submit" :disabled="!feedbackText.trim() || feedbackLoading" @click="submitFeedback">
+            {{ feedbackLoading ? '提交中...' : '提交反馈' }}
+          </button>
+        </div>
       </div>
     </div>
   </div>
@@ -60,6 +69,7 @@
 import { ref } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
+import { api } from '../composables/useApi'
 
 const emit = defineEmits(['close'])
 
@@ -73,6 +83,9 @@ const confirmPassword = ref('')
 const displayName = ref('')
 const errorMsg = ref('')
 const loading = ref(false)
+const showFeedback = ref(false)
+const feedbackText = ref('')
+const feedbackLoading = ref(false)
 
 async function submit() {
   errorMsg.value = ''
@@ -115,6 +128,26 @@ async function submit() {
     loading.value = false
   }
 }
+
+async function submitFeedback() {
+  if (!feedbackText.value.trim()) return
+  feedbackLoading.value = true
+  try {
+    const res = await api('/api/bug-report', {
+      method: 'POST',
+      body: JSON.stringify({ content: feedbackText.value.trim(), priority: 0 }),
+    })
+    if (res.ok) {
+      feedbackText.value = ''
+      showFeedback.value = false
+      ui.showToast('反馈已提交，感谢！')
+    }
+  } catch {
+    ui.showToast('提交失败')
+  } finally {
+    feedbackLoading.value = false
+  }
+}
 </script>
 
 <style scoped>
@@ -209,4 +242,31 @@ async function submit() {
   opacity: 0.6;
   cursor: not-allowed;
 }
+
+.login-divider {
+  height: 1px;
+  background: #eee;
+  margin: 4px 0;
+}
+
+.login-feedback-btn {
+  background: none;
+  border: none;
+  color: #999;
+  font-size: 13px;
+  cursor: pointer;
+  font-family: inherit;
+  text-align: center;
+  padding: 4px 0;
+}
+
+.login-feedback-btn:hover {
+  color: #666;
+}
+
+.feedback-section {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
 </style>

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="!recipe._diary_id" 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>
@@ -355,10 +253,13 @@ import { useDiaryStore } from '../stores/diary'
 import { api } from '../composables/useApi'
 import { showConfirm, showPrompt } from '../composables/useDialog'
 import { oilEn, recipeNameEn } from '../composables/useOilTranslation'
+import { matchesPinyinInitials } from '../composables/usePinyinMatch'
 // TagPicker replaced with inline tag editing
 
 const props = defineProps({
-  recipeIndex: { type: Number, required: true },
+  recipeIndex: { type: Number, default: null },
+  recipeData: { type: Object, default: null },
+  isDiary: { type: Boolean, default: false },
 })
 
 const emit = defineEmits(['close'])
@@ -385,9 +286,10 @@ const generatingImage = ref(false)
 const previewOverride = ref(null)
 
 // ---- Source recipe ----
-const recipe = computed(() =>
-  recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
-)
+const recipe = computed(() => {
+  if (props.recipeData) return props.recipeData
+  return recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
+})
 
 // ---- Display recipe: previewOverride when in preview mode, otherwise saved recipe ----
 const displayRecipe = computed(() => {
@@ -396,8 +298,8 @@ const displayRecipe = computed(() => {
 })
 
 const canEditThisRecipe = computed(() => {
+  if (props.isDiary) return false
   if (authStore.canEdit) return true
-  if (authStore.isLoggedIn && recipe.value._owner_id === authStore.user.id) return true
   return false
 })
 
@@ -683,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) {
@@ -709,22 +620,26 @@ async function saveToDiary() {
     return
   }
   const name = await showPrompt('保存为我的配方，名称：', recipe.value.name)
-  // null = user cancelled (clicked 取消)
   if (name === null) return
-  // empty string = user cleared the name field
   if (!name.trim()) {
     ui.showToast('请输入配方名称')
     return
   }
+  const trimmed = name.trim()
+  const dupDiary = diaryStore.userDiary.some(d => d.name === trimmed)
+  if (dupDiary) {
+    ui.showToast('我的配方中已有同名配方「' + trimmed + '」')
+    return
+  }
   try {
     const payload = {
       name: name.trim(),
       note: recipe.value.note || '',
-      ingredients: recipe.value.ingredients.map(i => ({ oil_name: i.oil, drops: i.drops })),
+      ingredients: recipe.value.ingredients.map(i => ({ oil: i.oil, drops: i.drops })),
       tags: recipe.value.tags || [],
+      source_recipe_id: recipe.value._id || null,
     }
-    console.log('[saveToDiary] saving recipe:', payload)
-    await recipesStore.saveRecipe(payload)
+    await diaryStore.createDiary(payload)
     ui.showToast('已保存！可在「配方查询 → 我的配方」查看')
   } catch (e) {
     console.error('[saveToDiary] failed:', e)
@@ -751,7 +666,7 @@ const filteredOilsForAdd = computed(() => {
   if (!q) return oilsStore.oilNames
   return oilsStore.oilNames.filter(n => {
     const en = oilEn(n).toLowerCase()
-    return n.includes(q) || en.startsWith(q) || en.includes(q)
+    return n.includes(q) || en.startsWith(q) || en.includes(q) || matchesPinyinInitials(n, q)
   })
 })
 
@@ -776,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))
@@ -820,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 = {}
@@ -829,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())
 })
@@ -989,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
@@ -1147,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;
@@ -1232,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; }
@@ -1765,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;
@@ -1814,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>
@@ -28,7 +33,17 @@
         <div class="notif-list">
           <div v-for="n in notifications.slice(0, 20)" :key="n.id"
                class="notif-item" :class="{ unread: !n.is_read }">
-            <div class="notif-title">{{ n.title }}</div>
+            <div class="notif-item-header">
+              <div class="notif-title">{{ n.title }}</div>
+              <div v-if="!n.is_read" class="notif-actions">
+                <!-- 搜索未收录通知：已添加按钮 -->
+                <button v-if="isSearchMissing(n)" class="notif-action-btn notif-btn-added" @click="markAdded(n)">已添加</button>
+                <!-- 审核类通知：去审核按钮 -->
+                <button v-else-if="isReviewable(n)" class="notif-action-btn notif-btn-review" @click="goReview(n)">去审核</button>
+                <!-- 默认：已读按钮 -->
+                <button v-else class="notif-mark-one" @click="markOneRead(n)">已读</button>
+              </div>
+            </div>
             <div v-if="n.body" class="notif-body">{{ n.body }}</div>
             <div class="notif-time">{{ formatTime(n.created_at) }}</div>
           </div>
@@ -78,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
@@ -105,6 +125,52 @@ async function submitBug() {
   }
 }
 
+function isSearchMissing(n) {
+  return n.title && n.title.includes('用户需求')
+}
+
+function isReviewable(n) {
+  if (!n.title) return false
+  // 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) {
+  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('配方') || 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')
+  }
+}
+
+async function markOneRead(n) {
+  try {
+    await api(`/api/notifications/${n.id}/read`, { method: 'POST', body: '{}' })
+    n.is_read = 1
+  } catch {}
+}
+
 async function markAllRead() {
   try {
     await api('/api/notifications/read-all', { method: 'POST', body: '{}' })
@@ -123,11 +189,7 @@ function handleLogout() {
   auth.logout()
   ui.showToast('已退出登录')
   emit('close')
-  if (router.currentRoute.value.meta.requiresAuth) {
-    router.push('/')
-  } else {
-    window.location.reload()
-  }
+  window.location.href = '/'
 }
 
 onMounted(loadNotifications)
@@ -191,7 +253,24 @@ onMounted(loadNotifications)
   padding: 8px 0; border-bottom: 1px solid #f5f5f5; font-size: 13px;
 }
 .notif-item.unread { background: #fafafa; }
-.notif-title { font-weight: 500; color: #333; }
+.notif-item-header { display: flex; justify-content: space-between; align-items: center; gap: 6px; }
+.notif-title { font-weight: 500; color: #333; flex: 1; }
+.notif-mark-one {
+  background: none; border: 1px solid #ccc; border-radius: 6px;
+  font-size: 11px; color: #7a9e7e; cursor: pointer; padding: 2px 8px;
+  font-family: inherit; white-space: nowrap; flex-shrink: 0;
+}
+.notif-mark-one:hover { background: #f0faf5; border-color: #7a9e7e; }
+.notif-actions { display: flex; gap: 4px; flex-shrink: 0; }
+.notif-action-btn {
+  background: none; border: 1px solid #ccc; border-radius: 6px;
+  font-size: 11px; cursor: pointer; padding: 2px 8px;
+  font-family: inherit; white-space: nowrap;
+}
+.notif-btn-added { color: #4a9d7e; border-color: #7ec6a4; }
+.notif-btn-added:hover { background: #e8f5e9; }
+.notif-btn-review { color: #e65100; border-color: #ffb74d; }
+.notif-btn-review:hover { background: #fff3e0; }
 .notif-body { color: #888; font-size: 12px; margin-top: 2px; white-space: pre-line; }
 .notif-time { color: #bbb; font-size: 11px; margin-top: 2px; }
 .notif-empty { text-align: center; color: #ccc; padding: 16px; font-size: 13px; }

frontend/src/composables/usePinyinMatch.js

@@ -0,0 +1,87 @@
+/**
+ * Simple pinyin initial matching for Chinese oil names.
+ * Maps common Chinese characters used in essential oil names to their pinyin initials.
+ * This is a lightweight approach - no full pinyin library needed.
+ */
+
+// Common characters in essential oil / herb names mapped to pinyin initials
+const PINYIN_MAP = {
+  '薰': 'x', '衣': 'y', '草': 'c', '茶': 'c', '树': 's',
+  '柠': 'n', '檬': 'm', '薄': 'b', '荷': 'h', '迷': 'm',
+  '迭': 'd', '香': 'x', '乳': 'r', '沉': 'c', '丝': 's',
+  '柏': 'b', '尤': 'y', '加': 'j', '利': 'l', '丁': 'd',
+  '肉': 'r', '桂': 'g', '罗': 'l', '勒': 'l', '百': 'b',
+  '里': 'l', '牛': 'n', '至': 'z', '马': 'm', '鞭': 'b',
+  '天': 't', '竺': 'z', '葵': 'k', '生': 's', '姜': 'j',
+  '黑': 'h', '胡': 'h', '椒': 'j', '玫': 'm', '瑰': 'g',
+  '茉': 'm', '莉': 'l', '依': 'y', '兰': 'l', '花': 'h',
+  '橙': 'c', '佛': 'f', '手': 's', '柑': 'g', '葡': 'p',
+  '萄': 't', '柚': 'y', '甜': 't', '苦': 'k', '野': 'y',
+  '山': 's', '松': 's', '杉': 's', '杜': 'd', '雪': 'x',
+  '莲': 'l', '芦': 'l', '荟': 'h', '白': 'b', '芷': 'z',
+  '当': 'd', '归': 'g', '川': 'c', '芎': 'x', '红': 'h',
+  '枣': 'z', '枸': 'g', '杞': 'q', '菊': 'j', '洋': 'y',
+  '甘': 'g', '菘': 's', '蓝': 'l', '永': 'y', '久': 'j',
+  '快': 'k', '乐': 'l', '鼠': 's', '尾': 'w', '岩': 'y',
+  '冷': 'l', '杰': 'j', '绿': 'lv', '芫': 'y', '荽': 's',
+  '椰': 'y', '子': 'z', '油': 'y', '基': 'j', '底': 'd',
+  '精': 'j', '纯': 'c', '露': 'l', '木': 'm', '果': 'g',
+  '叶': 'y', '根': 'g', '皮': 'p', '籽': 'z', '仁': 'r',
+  '大': 'd', '小': 'x', '西': 'x', '东': 'd', '南': 'n',
+  '北': 'b', '中': 'z', '新': 'x', '古': 'g', '老': 'l',
+  '春': 'c', '夏': 'x', '秋': 'q', '冬': 'd', '温': 'w',
+  '热': 'r', '凉': 'l', '冰': 'b', '火': 'h', '水': 's',
+  '金': 'j', '银': 'y', '铜': 't', '铁': 't', '玉': 'y',
+  '珍': 'z', '珠': 'z', '翠': 'c', '碧': 'b', '紫': 'z',
+  '青': 'q', '蓝': 'l', '绿': 'lv', '黄': 'h', '棕': 'z',
+  '褐': 'h', '灰': 'h', '粉': 'f', '豆': 'd', '蔻': 'k',
+  '藿': 'h', '苏': 's', '萃': 'c', '缬': 'x', '安': 'a',
+  '息': 'x', '宁': 'n', '静': 'j', '和': 'h', '平': 'p',
+  '舒': 's', '缓': 'h', '放': 'f', '松': 's', '活': 'h',
+  '力': 'l', '能': 'n', '量': 'l', '保': 'b', '护': 'h',
+  '防': 'f', '御': 'y', '健': 'j', '康': 'k', '美': 'm',
+  '丽': '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',
+}
+
+/**
+ * Get pinyin initials string for a Chinese name.
+ * e.g. "薰衣草" -> "xyc"
+ */
+export function getPinyinInitials(name) {
+  let result = ''
+  for (const char of name) {
+    const initial = PINYIN_MAP[char]
+    if (initial) {
+      result += initial
+    }
+  }
+  return result
+}
+
+/**
+ * Check if a query matches a name by pinyin initials.
+ * The query is matched as a prefix or substring of the pinyin initials.
+ */
+export function matchesPinyinInitials(name, query) {
+  if (!query || !name) return false
+  const initials = getPinyinInitials(name)
+  if (!initials) return false
+  const q = query.toLowerCase()
+  return initials.startsWith(q)
+}

frontend/src/composables/useSmartPaste.js

@@ -260,3 +260,99 @@ export function parseSingleBlock(raw, oilNames) {
     notFound
   }
 }
+
+/**
+ * Parse multi-recipe text. Each time an unrecognized non-number token
+ * appears after some oils have been found, it starts a new recipe.
+ */
+export function parseMultiRecipes(raw, oilNames) {
+  // First split by lines/commas, then within each part also try space splitting
+  const roughParts = raw.split(/[,，、\n\r]+/).map(s => s.trim()).filter(s => s)
+  const parts = []
+  for (const rp of roughParts) {
+    // If the part has spaces and contains mixed name+oil, split by spaces too
+    // But only if spaces actually separate meaningful chunks
+    const spaceParts = rp.split(/\s+/).filter(s => s)
+    if (spaceParts.length > 1) {
+      parts.push(...spaceParts)
+    } else {
+      // No spaces or single chunk — try to separate name prefix from oil+number
+      // e.g. "长高芳香调理8" → check if any oil is inside
+      const hasOilInside = oilNames.some(oil => rp.includes(oil))
+      if (hasOilInside && rp.length > 2) {
+        // Find the earliest oil match position
+        let earliest = rp.length
+        let earliestOil = ''
+        for (const oil of oilNames) {
+          const pos = rp.indexOf(oil)
+          if (pos >= 0 && pos < earliest) {
+            earliest = pos
+            earliestOil = oil
+          }
+        }
+        if (earliest > 0) {
+          parts.push(rp.substring(0, earliest))
+          parts.push(rp.substring(earliest))
+        } else {
+          parts.push(rp)
+        }
+      } else {
+        parts.push(rp)
+      }
+    }
+  }
+
+  const recipes = []
+  let current = { nameParts: [], ingredientParts: [], foundOil: false }
+
+  for (const part of parts) {
+    const hasNumber = /\d/.test(part)
+    const hasOil = oilNames.some(oil => part.includes(oil)) ||
+                   Object.keys(OIL_HOMOPHONES).some(alias => part.includes(alias))
+    // Also check fuzzy: 3+ char parts
+    const fuzzyOil = !hasOil && part.replace(/\d+\.?\d*/g, '').length >= 2 &&
+                     findOil(part.replace(/\d+\.?\d*/g, '').trim(), oilNames)
+
+    if (current.foundOil && !hasOil && !fuzzyOil && !hasNumber && part.length >= 2) {
+      // New recipe starts
+      recipes.push(current)
+      current = { nameParts: [], ingredientParts: [], foundOil: false }
+      current.nameParts.push(part)
+    } else if (!current.foundOil && !hasOil && !fuzzyOil && !hasNumber) {
+      current.nameParts.push(part)
+    } else {
+      current.foundOil = true
+      current.ingredientParts.push(part)
+    }
+  }
+  recipes.push(current)
+
+  // Convert each block to parsed recipe
+  return recipes.filter(r => r.ingredientParts.length > 0 || r.nameParts.length > 0).map(r => {
+    const allIngs = []
+    const notFound = []
+    for (const p of r.ingredientParts) {
+      const parsed = parseOilChunk(p, oilNames)
+      for (const item of parsed) {
+        if (item.notFound) notFound.push(item.oil)
+        else allIngs.push(item)
+      }
+    }
+    // Deduplicate
+    const deduped = []
+    const seen = {}
+    for (const item of allIngs) {
+      if (seen[item.oil] !== undefined) {
+        deduped[seen[item.oil]].drops += item.drops
+      } else {
+        seen[item.oil] = deduped.length
+        deduped.push({ ...item })
+      }
+    }
+    return {
+      name: r.nameParts.join(' ') || '未命名配方',
+      ingredients: deduped,
+      notFound,
+    }
+  })
+}

frontend/src/stores/auth.js

@@ -28,16 +28,6 @@ export const useAuthStore = defineStore('auth', () => {
 
   // Actions
   async function initToken() {
-    const params = new URLSearchParams(window.location.search)
-    const urlToken = params.get('token')
-    if (urlToken) {
-      token.value = urlToken
-      localStorage.setItem('oil_auth_token', urlToken)
-      // Clean URL
-      const url = new URL(window.location)
-      url.searchParams.delete('token')
-      window.history.replaceState({}, '', url)
-    }
     if (token.value) {
       await loadMe()
     }
@@ -83,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 (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/Inventory.vue

@@ -1,29 +1,29 @@
 <template>
   <div class="inventory-page">
-    <!-- Search -->
+    <!-- Search + direct add -->
     <div class="search-box">
       <input
         class="search-input"
         v-model="searchQuery"
-        placeholder="搜索精油..."
+        placeholder="搜索精油名称，回车添加..."
+        @keydown.enter="addFromSearch"
       />
       <button v-if="searchQuery" class="search-clear-btn" @click="searchQuery = ''">✕</button>
     </div>
-
-    <!-- Oil Picker Grid -->
-    <div class="section-label">点击添加到库存</div>
-    <div class="oil-picker-grid">
-      <div
-        v-for="name in filteredOilNames"
-        :key="name"
-        class="oil-pick-chip"
-        :class="{ owned: ownedSet.has(name) }"
-        @click="toggleOil(name)"
-      >
+    <!-- Search results for direct add -->
+    <div v-if="searchQuery && searchResults.length" class="search-results">
+      <div v-for="name in searchResults" :key="name" class="search-result-item" @click="addOil(name)">
         <span class="pick-dot" :class="{ active: ownedSet.has(name) }">{{ ownedSet.has(name) ? '✓' : '+' }}</span>
-        <span class="pick-name">{{ name }}</span>
+        {{ name }}
       </div>
-      <div v-if="filteredOilNames.length === 0" class="empty-hint">未找到精油</div>
+    </div>
+
+    <!-- Quick add kits -->
+    <div class="kit-bar">
+      <button class="kit-btn" @click="addKit('family')">家庭医生</button>
+      <button class="kit-btn" @click="addKit('home3988')">居家呵护(3988)</button>
+      <button class="kit-btn" @click="addKit('aroma')">芳香调理</button>
+      <button class="kit-btn" @click="addKit('full')">全精油</button>
     </div>
 
     <!-- Owned Oils Section -->
@@ -36,7 +36,25 @@
         {{ name }} ✕
       </div>
     </div>
-    <div v-else class="empty-hint">暂未添加精油，点击上方精油添加到库存</div>
+    <div v-else class="empty-hint">搜索添加精油，或点击上方套装快捷添加</div>
+
+    <!-- Oil Picker Grid (collapsed by default) -->
+    <div class="section-header clickable" @click="showPicker = !showPicker">
+      <span>📦 全部精油</span>
+      <span class="toggle-icon">{{ showPicker ? '▾' : '▸' }}</span>
+    </div>
+    <div v-if="showPicker" class="oil-picker-grid">
+      <div
+        v-for="name in oils.oilNames"
+        :key="name"
+        class="oil-pick-chip"
+        :class="{ owned: ownedSet.has(name) }"
+        @click="toggleOil(name)"
+      >
+        <span class="pick-dot" :class="{ active: ownedSet.has(name) }">{{ ownedSet.has(name) ? '✓' : '+' }}</span>
+        <span class="pick-name">{{ name }}</span>
+      </div>
+    </div>
 
     <!-- Matching Recipes Section -->
     <div class="section-header" style="margin-top:20px">
@@ -85,32 +103,86 @@ const ui = useUiStore()
 const searchQuery = ref('')
 const ownedOils = ref([])
 const loading = ref(false)
+const showPicker = ref(false)
 
 const ownedSet = computed(() => new Set(ownedOils.value))
 
-const filteredOilNames = computed(() => {
-  if (!searchQuery.value.trim()) return oils.oilNames
+const searchResults = computed(() => {
+  if (!searchQuery.value.trim()) return []
   const q = searchQuery.value.trim().toLowerCase()
-  return oils.oilNames.filter(n => n.toLowerCase().includes(q))
+  return oils.oilNames.filter(n => n.toLowerCase().includes(q)).slice(0, 15)
 })
 
+// Kit definitions
+const KITS = {
+  family: ['乳香', '茶树', '薰衣草', '柠檬', '椒样薄荷', '保卫', '牛至', '乐活', '顺畅呼吸', '舒缓'],
+  home3988: ['乳香', '野橘', '柠檬', '薰衣草', '椒样薄荷', '冬青', '茶树', '生姜', '柠檬草', '西班牙牛至',
+    '西洋蓍草石榴籽', '乐活', '保卫', '新瑞活力', '舒缓', '安定情绪', '安宁神气', '顺畅呼吸', '柑橘清新', '芳香调理', '元气焕能'],
+  aroma: ['薰衣草', '舒缓', '安定情绪', '芳香调理', '野橘', '椒样薄荷', '保卫', '茶树'],
+  full: ['侧柏', '乳香', '雪松', '芫荽', '丝柏', '圆柚', '红橘', '冬青', '没药', '扁柏', '檀香', '姜黄', '玫瑰',
+    '绿薄荷', '薰衣草', '永久花', '香蜂草', '迷迭香', '麦卢卡', '天竺葵', '蓝艾菊', '小茴香',
+    '古巴香脂', '依兰依兰', '丁香花蕾', '柠檬尤加利', '藿香', '西班牙牛至尾草',
+    '罗勒', '莱姆', '生姜', '柠檬', '茶树', '野橘', '香茅', '枫香',
+    '芹菜籽', '岩兰草', '苦橙叶', '柠檬草', '山鸡椒', '黑云杉',
+    '马郁兰', '佛手柑', '黑胡椒', '小豆蔻', '尤加利', '百里香',
+    '椒样薄荷', '杜松浆果', '加州白鼠尾草',
+    '快乐鼠尾草', '西伯利亚冷杉',
+    '西班牙牛至', '斯里兰卡肉桂']
+}
+
+function addKit(kitName) {
+  const kit = KITS[kitName]
+  if (!kit) return
+  let added = 0
+  for (const name of kit) {
+    // Match existing oil names (fuzzy)
+    const match = oils.oilNames.find(n => n === name) || oils.oilNames.find(n => n.includes(name) || name.includes(n))
+    if (match && !ownedOils.value.includes(match)) {
+      ownedOils.value.push(match)
+      added++
+    }
+  }
+  ownedOils.value.sort((a, b) => a.localeCompare(b, 'zh'))
+  saveInventory()
+  ui.showToast(`已添加 ${added} 种精油`)
+}
+
+function addFromSearch() {
+  if (searchResults.value.length > 0) {
+    addOil(searchResults.value[0])
+  }
+}
+
+function addOil(name) {
+  if (!ownedOils.value.includes(name)) {
+    ownedOils.value.push(name)
+    ownedOils.value.sort((a, b) => a.localeCompare(b, 'zh'))
+    saveInventory()
+  }
+  searchQuery.value = ''
+}
+
 const matchingRecipes = computed(() => {
   if (ownedOils.value.length === 0) return []
   return recipeStore.recipes
     .filter(r => {
-      const needed = r.ingredients.map(i => i.oil)
+      // Exclude coconut oil from matching
+      const needed = r.ingredients.filter(i => i.oil !== '椰子油').map(i => i.oil)
+      if (needed.length === 0) return false
       const coverage = needed.filter(o => ownedSet.value.has(o)).length
-      return coverage >= Math.ceil(needed.length * 0.5)
+      // Show if at least 1 oil matches
+      return coverage >= 1
     })
     .sort((a, b) => {
       const aCov = coverageRatio(a)
       const bCov = coverageRatio(b)
-      return bCov - aCov
+      if (bCov !== aCov) return bCov - aCov
+      return a.name.localeCompare(b.name, 'zh')
     })
 })
 
 function coverageRatio(recipe) {
-  const needed = recipe.ingredients.map(i => i.oil)
+  const needed = recipe.ingredients.filter(i => i.oil !== '椰子油').map(i => i.oil)
   if (needed.length === 0) return 0
   return needed.filter(o => ownedSet.value.has(o)).length / needed.length
 }
@@ -205,6 +277,27 @@ onMounted(() => {
   padding: 4px;
 }
 
+.search-results {
+  margin-bottom: 10px; max-height: 200px; overflow-y: auto;
+  border: 1.5px solid #e5e4e7; border-radius: 10px; background: #fff;
+}
+.search-result-item {
+  padding: 8px 12px; cursor: pointer; font-size: 13px; display: flex; align-items: center; gap: 6px;
+  border-bottom: 1px solid #f5f5f5;
+}
+.search-result-item:hover { background: #f0faf5; }
+.search-result-item:last-child { border-bottom: none; }
+
+.kit-bar { display: flex; gap: 6px; flex-wrap: wrap; margin-bottom: 12px; }
+.kit-btn {
+  padding: 5px 12px; border: 1.5px solid #e5e4e7; border-radius: 20px; background: #fff;
+  font-size: 12px; cursor: pointer; font-family: inherit; color: #6b6375;
+}
+.kit-btn:hover { border-color: #7ec6a4; color: #4a9d7e; }
+
+.clickable { cursor: pointer; }
+.toggle-icon { font-size: 12px; color: #999; margin-left: auto; }
+
 .section-label {
   font-size: 12px;
   color: #b0aab5;

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,26 +242,52 @@
       </div>
 
       <!-- Business Verification -->
-      <div v-if="!auth.isBusiness" class="section-card">
-        <h4>💼 商业认证</h4>
-        <p class="hint-text">申请商业认证后可使用商业核算功能。</p>
-        <div class="form-group">
-          <label>申请说明</label>
-          <textarea v-model="businessReason" class="form-textarea" rows="3" placeholder="请说明您的申请理由..."></textarea>
+      <div ref="bizCertRef" class="section-card biz-card">
+        <h4>🏢 商业用户认证</h4>
+
+        <!-- Status bar -->
+        <div v-if="auth.isBusiness" class="biz-status-bar biz-approved">
+          <span>✅ 已认证商业用户</span>
+        </div>
+        <div v-else-if="bizApp.status === 'pending'" class="biz-status-bar biz-pending">
+          <span>⏳ 认证申请审核中</span>
+        </div>
+        <div v-else-if="bizApp.status === 'rejected'" class="biz-status-bar biz-rejected">
+          <span>❌ 认证申请未通过</span>
+          <div v-if="bizApp.reject_reason" class="biz-status-detail">原因：{{ bizApp.reject_reason }}</div>
+          <p style="font-size:12px;margin-top:4px">你可以修改后重新申请</p>
+        </div>
+
+        <!-- Always show filled info (like QR page) -->
+        <div class="biz-form">
+          <div class="form-group">
+            <label class="form-label">商户名称 *</label>
+            <input v-model="businessName" class="form-input" placeholder="你的商户或品牌名称" :disabled="bizApp.status === 'pending'" />
+          </div>
+          <div class="form-group">
+            <label class="form-label">证明图片 *</label>
+            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">营业执照或相关证明材料</p>
+            <div class="upload-box" @click="$refs.bizDocInput?.click()">
+              <img v-if="bizDocImage" :src="bizDocImage" class="upload-box-img" />
+              <span v-else class="upload-box-hint">点击上传</span>
+            </div>
+            <input ref="bizDocInput" type="file" accept="image/*" style="display:none" @change="handleBizDocUpload" />
+            <button v-if="bizDocImage" class="btn-clear" @click="bizDocImage = ''">清除</button>
+          </div>
+          <template v-if="!auth.isBusiness && bizApp.status !== 'pending'">
+            <div style="margin-top:12px">
+              <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim() || !bizDocImage">💾 提交申请</button>
+            </div>
+          </template>
         </div>
-        <button class="btn-primary" @click="applyBusiness" :disabled="!businessReason.trim()">提交申请</button>
-      </div>
-      <div v-else class="section-card">
-        <h4>💼 商业认证</h4>
-        <div class="verified-badge">✅ 已认证商业用户</div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue'
-import { useRouter } from 'vue-router'
+import { ref, nextTick, onMounted, watch } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useDiaryStore } from '../stores/diary'
@@ -274,8 +301,10 @@ const oils = useOilsStore()
 const diaryStore = useDiaryStore()
 const ui = useUiStore()
 const router = useRouter()
+const route = useRoute()
+const bizCertRef = ref(null)
 
-const activeTab = ref('brand')
+const activeTab = ref(route.query.tab || 'brand')
 const pasteText = ref('')
 const selectedDiaryId = ref(null)
 const returnRecipeId = ref(null)
@@ -298,13 +327,32 @@ const displayName = ref('')
 const oldPassword = ref('')
 const newPassword = ref('')
 const confirmPassword = ref('')
+const businessName = ref('')
 const businessReason = ref('')
+const bizType = ref('')
+const bizPhone = ref('')
+const bizDocImage = ref('')
+const bizApp = ref({ status: null })
 
 onMounted(async () => {
   await diaryStore.loadDiary()
   displayName.value = auth.user.display_name || ''
   await loadBrandSettings()
   returnRecipeId.value = localStorage.getItem('oil_return_recipe_id') || null
+  // Load business application status
+  try {
+    const bizRes = await api('/api/my-business-application')
+    if (bizRes.ok) {
+      bizApp.value = await bizRes.json()
+      if (bizApp.value.business_name) businessName.value = bizApp.value.business_name
+      if (bizApp.value.document) bizDocImage.value = bizApp.value.document
+    }
+  } catch {}
+  // 从商业核算跳转过来，滚到商业认证区域
+  if (route.query.section === 'biz-cert') {
+    await nextTick()
+    bizCertRef.value?.scrollIntoView({ behavior: 'smooth', block: 'center' })
+  }
 })
 
 function goBackToRecipe() {
@@ -447,36 +495,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
   })
 }
@@ -514,9 +564,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
@@ -524,15 +600,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
@@ -615,14 +692,40 @@ async function changePassword() {
   }
 }
 
+async function handleBizDocUpload(event) {
+  const file = event.target.files[0]
+  if (!file) return
+  let base64 = await readFileAsBase64(file)
+  base64 = await compressImage(base64, 300000, 600)
+  bizDocImage.value = base64
+}
+
 async function applyBusiness() {
+  if (!businessName.value.trim() || !bizDocImage.value) {
+    ui.showToast('请填写商户名称并上传证明图片')
+    return
+  }
   try {
-    await api('/api/business-apply', {
+    const res = await api('/api/business-apply', {
       method: 'POST',
-      body: JSON.stringify({ reason: businessReason.value }),
+      body: JSON.stringify({
+        business_name: businessName.value.trim(),
+        document: bizDocImage.value,
+      }),
     })
-    businessReason.value = ''
-    ui.showToast('申请已提交，请等待审核')
+    if (res.ok) {
+      // Don't clear — keep showing submitted data
+      ui.showToast('申请已提交，请等待管理员审核')
+      const bizRes = await api('/api/my-business-application')
+      if (bizRes.ok) {
+        bizApp.value = await bizRes.json()
+        // Restore document image from app data
+        if (bizApp.value.document) bizDocImage.value = bizApp.value.document
+      }
+    } else {
+      const err = await res.json().catch(() => ({}))
+      ui.showToast(err.detail || '提交失败')
+    }
   } catch {
     ui.showToast('提交失败')
   }
@@ -1068,6 +1171,8 @@ async function applyBusiness() {
   margin-bottom: 12px;
 }
 
+.auto-save-hint { font-size: 12px; color: #999; font-style: italic; }
+
 .verified-badge {
   padding: 12px;
   background: #e8f5e9;
@@ -1077,6 +1182,28 @@ async function applyBusiness() {
   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-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 {
   background: linear-gradient(135deg, #7ec6a4 0%, #4a9d7e 100%);

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" />
@@ -132,7 +132,7 @@
         v-for="name in filteredOilNames"
         :key="name + '-' + cardVersion"
         class="oil-chip"
-        :class="{ 'oil-chip--inactive': getMeta(name)?.isActive === false, 'oil-chip--incomplete': auth.isAdmin && isIncomplete(name) }"
+        :class="{ 'oil-chip--inactive': getMeta(name)?.isActive === false, 'oil-chip--incomplete': auth.canManage && isIncomplete(name) }"
         :style="chipStyle(name)"
         @click="openOilDetail(name)"
       >
@@ -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,11 +260,14 @@
     </div>
 
     <!-- Edit Oil Overlay -->
-    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null">
+    <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>
-          <button class="btn-close" @click="editingOilName = null">✕</button>
+          <div style="display:flex;gap:8px;align-items:center">
+            <button class="btn-primary" style="padding:6px 16px;font-size:13px" @click="saveEditOil">保存</button>
+            <button class="btn-close" @click="editingOilName = null">✕</button>
+          </div>
         </div>
         <div class="modal-body">
           <div class="form-group">

frontend/src/views/Projects.vue

@@ -1,14 +1,33 @@
 <template>
   <div class="projects-page">
+    <!-- Header -->
+    <div class="commercial-header">
+      <div class="commercial-icon">💼</div>
+      <div class="commercial-desc">商业用户专属功能，包含项目核算、成本分析等工具</div>
+    </div>
+
     <!-- Project List -->
-    <div class="toolbar">
-      <h3 class="page-title">💼 商业核算</h3>
-      <button class="btn-primary" @click="createProject">+ 新建项目</button>
+    <div class="toolbar-sticky">
+      <div class="toolbar-inner">
+        <h3 class="page-title">📊 服务项目成本利润分析</h3>
+        <button class="btn-primary btn-sm" @click="handleCreateProject">+ 新增项目</button>
+      </div>
     </div>
 
     <div v-if="!selectedProject" class="project-list">
+      <!-- Demo project (first one, or fallback) -->
+      <div v-if="demoProject" class="project-card demo-card" @click="selectDemoProject">
+        <div class="proj-header">
+          <span class="proj-name">{{ demoProject.name }}</span>
+          <span class="proj-badge">体验</span>
+        </div>
+        <div class="proj-summary">
+          <span>点击体验成本利润分析</span>
+        </div>
+      </div>
+      <!-- Real projects (exclude demo) -->
       <div
-        v-for="p in projects"
+        v-for="p in userProjects"
         :key="p._id || p.id"
         class="project-card"
         @click="selectProject(p)"
@@ -23,11 +42,10 @@
             成本 {{ oils.fmtPrice(oils.calcCost(p.ingredients)) }}
           </span>
         </div>
-        <div class="proj-actions" @click.stop>
+        <div class="proj-actions proj-actions-hover" @click.stop>
           <button class="btn-icon-sm" @click="deleteProject(p)" title="删除">🗑️</button>
         </div>
       </div>
-      <div v-if="projects.length === 0" class="empty-hint">暂无项目，点击上方创建</div>
     </div>
 
     <!-- Project Detail -->
@@ -39,101 +57,138 @@
           class="proj-name-input"
           @blur="saveProject"
         />
-        <button class="btn-outline btn-sm" @click="importFromRecipe">📋 从配方导入</button>
+        <button class="btn-outline btn-sm" :disabled="isDemoMode && !auth.isAdmin" @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>
-        <button class="btn-outline btn-sm" @click="addIngredient">+ 添加成分</button>
-      </div>
-
-      <!-- Pricing Section -->
-      <div class="pricing-section">
-        <h4>💰 价格计算</h4>
-        <div class="price-row">
-          <span class="price-label">原料成本</span>
-          <span class="price-value cost">{{ oils.fmtPrice(materialCost) }}</span>
-        </div>
-
-        <div class="price-row">
-          <span class="price-label">包装费用</span>
-          <div class="price-input-wrap">
-            <span>¥</span>
-            <input v-model.number="selectedProject.packaging_cost" type="number" class="form-input-inline" @change="saveProject" />
+        <div class="section-header-row">
+          <h4>🧴 配方成分</h4>
+          <div class="section-actions">
+            <button v-if="!isDemoMode || auth.isAdmin" 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" :class="{ 'readonly-row': isDemoMode && !auth.isAdmin }">
+              <td>
+                <template v-if="isDemoMode && !auth.isAdmin">
+                  <span class="readonly-oil">{{ ing.oil || '—' }}</span>
+                </template>
+                <template v-else>
+                  <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>
+                </template>
+              </td>
+              <td>
+                <template v-if="isDemoMode && !auth.isAdmin">
+                  <span class="readonly-drops">{{ ing.drops }}</span>
+                </template>
+                <template v-else>
+                  <input v-model.number="ing.drops" type="number" min="0" step="0.5" class="drops-input" @change="saveProject" />
+                </template>
+              </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 v-if="!isDemoMode || auth.isAdmin" class="remove-btn" @click="removeIngredient(i)">×</button></td>
+            </tr>
+          </tbody>
+        </table>
+        <table class="ingredients-table total-table">
+          <tr>
+            <td class="total-label-cell">配方总成本</td>
+            <td></td>
+            <td></td>
+            <td class="total-price-cell">{{ oils.fmtPrice(materialCost) }}</td>
+            <td></td>
+          </tr>
+        </table>
 
-        <div class="price-row">
-          <span class="price-label">人工费用</span>
-          <div class="price-input-wrap">
-            <span>¥</span>
-            <input v-model.number="selectedProject.labor_cost" type="number" class="form-input-inline" @change="saveProject" />
+        <!-- Consumption Analysis -->
+        <div v-if="consumptionData.length" class="consumption-section" style="margin-top:12px">
+          <h4>🧪 消耗分析</h4>
+          <table class="ingredients-table">
+            <thead>
+              <tr><th>精油</th><th>单次用量</th><th>瓶装容量</th><th>可做次数</th><th></th></tr>
+            </thead>
+            <tbody>
+              <tr v-for="c in consumptionData" :key="c.oil" :class="{ 'limit-oil': c.isLimit }">
+                <td>{{ c.oil }}</td>
+                <td>{{ c.drops }}滴</td>
+                <td>{{ c.bottleDrops }}滴</td>
+                <td>{{ c.sessions }}次</td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+          <div class="consumption-summary">
+            <span v-if="allSameSession">可做 <strong>{{ maxSessions }}</strong> 次</span>
+            <span v-else>⚠️ <strong>{{ limitingOil }}</strong> 最先消耗完，可做 <strong>{{ maxSessions }}</strong> 次</span>
           </div>
         </div>
-
-        <div class="price-row">
-          <span class="price-label">其他成本</span>
-          <div class="price-input-wrap">
-            <span>¥</span>
-            <input v-model.number="selectedProject.other_cost" type="number" class="form-input-inline" @change="saveProject" />
-          </div>
-        </div>
-
-        <div class="price-row total">
-          <span class="price-label">总成本</span>
-          <span class="price-value cost">{{ oils.fmtPrice(totalCost) }}</span>
-        </div>
-
-        <div class="price-row">
-          <span class="price-label">售价</span>
-          <div class="price-input-wrap">
-            <span>¥</span>
-            <input v-model.number="selectedProject.selling_price" type="number" class="form-input-inline" @change="saveProject" />
-          </div>
-        </div>
-
-        <div class="price-row">
-          <span class="price-label">批量数量</span>
-          <input v-model.number="selectedProject.quantity" type="number" min="1" class="form-input-inline" @change="saveProject" />
-        </div>
       </div>
 
-      <!-- Profit Analysis -->
-      <div class="profit-section">
-        <h4>📊 利润分析</h4>
-        <div class="profit-grid">
+      <!-- Pricing + Profit side by side -->
+      <div class="price-profit-row">
+        <div class="pricing-col">
+          <h4>💰 价格计算</h4>
+          <div class="price-row">
+            <span class="price-label">原料成本</span>
+            <span class="price-val-box">{{ oils.fmtPrice(materialCost) }}</span>
+          </div>
+          <div class="price-row">
+            <span class="price-label">包装费用</span>
+            <div class="price-input-wrap"><span>¥</span><input v-model.number="selectedProject.packaging_cost" type="number" class="form-input-inline" placeholder="0" @focus="clearZero($event)" @change="saveProject" /></div>
+          </div>
+          <div class="price-row">
+            <span class="price-label">人工费用</span>
+            <div class="price-input-wrap"><span>¥</span><input v-model.number="selectedProject.labor_cost" type="number" class="form-input-inline" placeholder="0" @focus="clearZero($event)" @change="saveProject" /></div>
+          </div>
+          <div class="price-row">
+            <span class="price-label">其他成本</span>
+            <div class="price-input-wrap"><span>¥</span><input v-model.number="selectedProject.other_cost" type="number" class="form-input-inline" placeholder="0" @focus="clearZero($event)" @change="saveProject" /></div>
+          </div>
+          <div class="price-row total">
+            <span class="price-label">总成本</span>
+            <span class="price-val-box">{{ oils.fmtPrice(totalCost) }}</span>
+          </div>
+          <div class="price-row">
+            <span class="price-label">售价</span>
+            <div class="price-input-wrap"><span>¥</span><input v-model.number="selectedProject.selling_price" type="number" class="form-input-inline" @change="saveProject" /></div>
+          </div>
+          <div class="price-row">
+            <span class="price-label">批量数量</span>
+            <input v-model.number="selectedProject.quantity" type="number" min="1" class="form-input-inline" @change="saveProject" />
+          </div>
+        </div>
+        <div class="profit-col">
+          <h4>📊 利润分析</h4>
           <div class="profit-card">
-            <div class="profit-label">单件利润</div>
-            <div class="profit-value" :class="{ negative: unitProfit < 0 }">{{ oils.fmtPrice(unitProfit) }}</div>
+            <div class="profit-card-label">单件利润</div>
+            <div class="profit-card-value" :class="{ negative: unitProfit < 0 }">{{ oils.fmtPrice(unitProfit) }}</div>
           </div>
           <div class="profit-card">
-            <div class="profit-label">利润率</div>
-            <div class="profit-value" :class="{ negative: profitMargin < 0 }">{{ profitMargin.toFixed(1) }}%</div>
+            <div class="profit-card-label">利润率</div>
+            <div class="profit-card-value" :class="{ negative: profitMargin < 0 }">{{ profitMargin.toFixed(1) }}%</div>
           </div>
           <div class="profit-card">
-            <div class="profit-label">批量总利润</div>
-            <div class="profit-value" :class="{ negative: batchProfit < 0 }">{{ oils.fmtPrice(batchProfit) }}</div>
+            <div class="profit-card-label">批量总收入</div>
+            <div class="profit-card-value">{{ oils.fmtPrice(batchRevenue) }}</div>
           </div>
           <div class="profit-card">
-            <div class="profit-label">批量总收入</div>
-            <div class="profit-value">{{ oils.fmtPrice(batchRevenue) }}</div>
+            <div class="profit-card-label">批量总利润</div>
+            <div class="profit-card-value" :class="{ negative: batchProfit < 0 }">{{ oils.fmtPrice(batchProfit) }}</div>
           </div>
         </div>
       </div>
@@ -177,6 +232,7 @@
 
 <script setup>
 import { ref, computed, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useRecipesStore } from '../stores/recipes'
@@ -188,6 +244,14 @@ const auth = useAuthStore()
 const oils = useOilsStore()
 const recipeStore = useRecipesStore()
 const ui = useUiStore()
+const router = useRouter()
+
+async function showCertPrompt() {
+  const ok = await showConfirm('此功能需要商业认证，是否前往申请认证？', { okText: '去认证', cancelText: '取消' })
+  if (ok) {
+    router.push('/mydiary?tab=account&section=biz-cert')
+  }
+}
 
 const projects = ref([])
 const selectedProject = ref(null)
@@ -208,6 +272,38 @@ async function loadProjects() {
   }
 }
 
+// Demo = first project (芳香调理技术), managed by admin
+const demoProject = computed(() => projects.value.find(p => p.name && p.name.includes('芳香调理')) || projects.value[0] || null)
+const userProjects = computed(() => {
+  const demoId = demoProject.value?._id || demoProject.value?.id
+  return projects.value.filter(p => (p._id || p.id) !== demoId)
+})
+const isDemoMode = computed(() => selectedProject.value?._demo === true)
+
+function selectDemoProject() {
+  const p = demoProject.value
+  if (!p) return
+  selectedProject.value = {
+    ...p,
+    _demo: true,
+    ingredients: (p.ingredients || []).map(i => ({ ...i })),
+    packaging_cost: p.packaging_cost || 0,
+    labor_cost: p.labor_cost || 0,
+    other_cost: p.other_cost || 0,
+    selling_price: p.selling_price || 299,
+    quantity: p.quantity || 1,
+    notes: p.notes || '',
+  }
+}
+
+function handleCreateProject() {
+  if (!auth.isBusiness && !auth.isAdmin) {
+    showCertPrompt()
+    return
+  }
+  createProject()
+}
+
 async function createProject() {
   const name = await showPrompt('项目名称:', '新项目')
   if (!name) return
@@ -220,7 +316,7 @@ async function createProject() {
         packaging_cost: 0,
         labor_cost: 0,
         other_cost: 0,
-        selling_price: 0,
+        selling_price: 299,
         quantity: 1,
         notes: '',
       }),
@@ -237,13 +333,17 @@ async function createProject() {
 }
 
 function selectProject(p) {
+  if (!auth.isBusiness && !auth.isAdmin) {
+    showCertPrompt()
+    return
+  }
   selectedProject.value = {
     ...p,
     ingredients: (p.ingredients || []).map(i => ({ ...i })),
     packaging_cost: p.packaging_cost || 0,
     labor_cost: p.labor_cost || 0,
     other_cost: p.other_cost || 0,
-    selling_price: p.selling_price || 0,
+    selling_price: p.selling_price || 299,
     quantity: p.quantity || 1,
     notes: p.notes || '',
   }
@@ -251,7 +351,10 @@ function selectProject(p) {
 
 async function saveProject() {
   if (!selectedProject.value) return
+  // Demo mode for non-admin: only save locally, don't hit API
+  if (isDemoMode.value && !auth.isAdmin) return
   const id = selectedProject.value._id || selectedProject.value.id
+  if (!id) return
   try {
     await api(`/api/projects/${id}`, {
       method: 'PUT',
@@ -332,6 +435,41 @@ const batchRevenue = computed(() => {
   return (selectedProject.value?.selling_price || 0) * (selectedProject.value?.quantity || 1)
 })
 
+const consumptionData = computed(() => {
+  if (!selectedProject.value) return []
+  const ings = (selectedProject.value.ingredients || []).filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
+  return ings.map(i => {
+    const meta = oils.oilsMeta[i.oil]
+    const bottleDrops = meta ? meta.dropCount : 0
+    const sessions = bottleDrops > 0 && i.drops > 0 ? Math.floor(bottleDrops / i.drops) : 0
+    return { oil: i.oil, drops: i.drops, bottleDrops, sessions, isLimit: false }
+  })
+})
+
+const limitingOil = computed(() => {
+  const data = consumptionData.value.filter(c => c.sessions > 0)
+  if (!data.length) return ''
+  const min = data.reduce((a, b) => a.sessions < b.sessions ? a : b)
+  min.isLimit = true
+  return min.oil
+})
+
+const allSameSession = computed(() => {
+  const data = consumptionData.value.filter(c => c.sessions > 0)
+  if (data.length <= 1) return true
+  return data.every(c => c.sessions === data[0].sessions)
+})
+
+const maxSessions = computed(() => {
+  const data = consumptionData.value.filter(c => c.sessions > 0)
+  if (!data.length) return 0
+  return Math.min(...data.map(c => c.sessions))
+})
+
+function clearZero(e) {
+  if (e.target.value === '0' || e.target.value === 0) e.target.value = ''
+}
+
 function formatDate(d) {
   if (!d) return ''
   return new Date(d).toLocaleDateString('zh-CN')
@@ -343,11 +481,44 @@ function formatDate(d) {
   padding: 0 12px 24px;
 }
 
-.toolbar {
+.commercial-header {
+  text-align: center; padding: 24px 16px 16px; margin-bottom: 16px;
+}
+.commercial-icon { font-size: 48px; margin-bottom: 8px; }
+.commercial-desc { font-size: 14px; color: var(--text-light, #999); }
+.demo-card { border-style: dashed !important; opacity: 0.85; }
+.proj-actions-hover { opacity: 0; transition: opacity 0.15s; }
+.project-card:hover .proj-actions-hover { opacity: 1; }
+
+.readonly-row { background: #f8f7f5; }
+.readonly-oil { font-size: 13px; color: #6b6375; }
+.readonly-drops { font-size: 13px; color: #3e3a44; font-weight: 500; }
+
+.consumption-section { margin-bottom: 20px; padding: 14px; background: #f8f7f5; border-radius: 12px; border: 1.5px solid #e5e4e7; }
+.consumption-section h4 { margin: 0 0 12px; font-size: 14px; color: #3e3a44; }
+.consumption-table { width: 100%; border-collapse: collapse; font-size: 13px; margin-bottom: 10px; }
+.consumption-table th { text-align: left; padding: 6px 8px; color: #999; font-size: 12px; border-bottom: 1px solid #eee; }
+.consumption-table td { padding: 6px 8px; border-bottom: 1px solid #f5f5f5; }
+.consumption-table .limit-oil { background: #fff3e0; font-weight: 600; }
+.consumption-summary { font-size: 13px; color: #e65100; padding: 8px; background: #fff8e1; border-radius: 8px; }
+.proj-badge {
+  font-size: 10px; background: #fff3e0; color: #e65100; padding: 2px 8px; border-radius: 8px;
+}
+
+.toolbar-sticky {
+  position: sticky;
+  top: 0;
+  z-index: 20;
+  background: linear-gradient(135deg, #f0faf5 0%, #e8f0e8 100%);
+  margin: 0 -12px;
+  padding: 0 12px;
+  border-bottom: 1.5px solid #d4e8d4;
+}
+.toolbar-inner {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 16px;
+  padding: 12px 0;
 }
 
 .page-title {
@@ -479,12 +650,37 @@ 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 { white-space: nowrap; }
+.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: 6px 4px; border-bottom: 1px solid #f0f0f0; text-align: center; white-space: nowrap; }
+.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: 45px; padding: 4px 4px; border: 1.5px solid #d4cfc7; border-radius: 6px; font-size: 12px; 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: 12px; padding: 0; width: 16px; }
+.remove-btn:hover { color: #c0392b; }
+
+.total-table { background: #e8f5e9; border-radius: 10px; margin-bottom: 0; }
+.total-table td { border: none; padding: 10px 8px; }
+.total-label-cell { font-size: 14px; color: #3e3a44; font-weight: 600; }
+.total-price-cell { font-size: 18px; font-weight: 700; color: #2e7d5a; text-align: center; }
+
+.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;
@@ -507,22 +703,20 @@ 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;
   align-items: center;
-  padding: 8px 0;
+  justify-content: space-between;
+  padding: 6px 0;
   border-bottom: 1px solid #eae8e5;
-  font-size: 14px;
+  font-size: 13px;
 }
+.price-row .price-label { color: #6b6375; }
+.price-row .price-value { text-align: right; font-weight: 600; }
+.price-val-box { width: 70px; text-align: right; font-weight: 600; color: #4a9d7e; font-size: 13px; }
+.price-row .price-input-wrap { display: flex; align-items: center; gap: 2px; }
+.price-row .form-input-inline, .price-row input[type="number"] { width: 70px; text-align: right; padding: 4px 6px; border: 1px solid #d4cfc7; border-radius: 6px; font-size: 13px; font-family: inherit; outline: none; }
+.price-row .form-input-inline:focus, .price-row input[type="number"]:focus { border-color: #7ec6a4; }
 
 .price-row.total {
   border-top: 2px solid #d4cfc7;
@@ -567,35 +761,20 @@ function formatDate(d) {
   border-color: #7ec6a4;
 }
 
-.profit-grid {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 8px;
+.price-profit-row {
+  display: flex; gap: 16px; margin-bottom: 20px;
 }
-
+.pricing-col, .profit-col {
+  flex: 1; padding: 14px; background: #f8f7f5; border-radius: 12px; border: 1.5px solid #e5e4e7;
+}
+.pricing-col h4, .profit-col h4 { margin: 0 0 10px; font-size: 14px; color: #3e3a44; }
 .profit-card {
-  padding: 12px;
-  background: #fff;
-  border-radius: 10px;
-  text-align: center;
-  border: 1.5px solid #e5e4e7;
-}
-
-.profit-label {
-  font-size: 12px;
-  color: #6b6375;
-  margin-bottom: 4px;
-}
-
-.profit-value {
-  font-size: 18px;
-  font-weight: 700;
-  color: #4a9d7e;
-}
-
-.profit-value.negative {
-  color: #ef5350;
+  padding: 10px 12px; background: #fff; border-radius: 10px;
+  border: 1.5px solid #e5e4e7; text-align: center; margin-bottom: 6px;
 }
+.profit-card-label { font-size: 12px; color: #6b6375; margin-bottom: 2px; }
+.profit-card-value { font-size: 18px; font-weight: 700; color: #4a9d7e; }
+.profit-card-value.negative { color: #ef5350; }
 
 .notes-textarea {
   width: 100%;

frontend/src/views/RecipeSearch.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="recipe-search">
     <!-- Category Carousel (full-width image slides) -->
-    <div class="cat-wrap" v-if="categories.length && !selectedCategory">
+    <div class="cat-wrap" v-if="categories.length && !selectedCategory" data-no-tab-swipe @touchstart="onCarouselTouchStart" @touchend="onCarouselTouchEnd">
       <div class="cat-track" :style="{ transform: `translateX(-${catIdx * 100}%)` }">
         <div
           v-for="cat in categories"
@@ -49,57 +49,91 @@
 
     <!-- Personal Section (logged in) -->
     <div v-if="auth.isLoggedIn" class="personal-section">
+      <template v-if="!searchQuery || myDiaryRecipes.length > 0">
       <div class="section-header" @click="showMyRecipes = !showMyRecipes">
         <span>📖 我的配方 ({{ myDiaryRecipes.length }})</span>
+        <span v-if="!auth.isAdmin && sharedCount.total > 0" class="contrib-badge">已贡献 {{ sharedCount.adopted }}/{{ sharedCount.total }} 条</span>
         <span class="toggle-icon">{{ showMyRecipes ? '▾' : '▸' }}</span>
       </div>
       <div v-if="showMyRecipes" class="recipe-grid">
-        <div
-          v-for="d in myDiaryRecipes"
-          :key="'diary-' + d.id"
-          class="recipe-card diary-card"
-          @click="openDiaryDetail(d)"
-        >
-          <div class="card-name">{{ d.name }}</div>
-          <div class="card-oils">{{ (d.ingredients || []).map(i => i.oil).join('、') }}</div>
-          <div class="card-bottom">
-            <span class="card-price">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
-            <button class="share-btn" @click.stop="shareDiaryToPublic(d)" title="共享到公共配方库">📤</button>
-          </div>
+        <div v-for="d in myDiaryRecipes" :key="'diary-' + d.id" class="diary-card-wrap">
+          <RecipeCard
+            :recipe="diaryAsRecipe(d)"
+            :index="-1"
+            @click="openDiaryDetail(d)"
+          />
+          <span v-if="getDiaryShareStatus(d) === 'shared'" class="share-status shared">已共享</span>
+          <span v-else-if="getDiaryShareStatus(d) === 'pending'" class="share-status pending">审核中</span>
         </div>
         <div v-if="myDiaryRecipes.length === 0" class="empty-hint">暂无个人配方</div>
       </div>
+      </template>
 
-      <div class="section-header" @click="showFavorites = !showFavorites">
-        <span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
-        <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
-      </div>
-      <div v-if="showFavorites" class="recipe-grid">
-        <RecipeCard
-          v-for="r in favoritesPreview"
-          :key="r._id"
-          :recipe="r"
-          :index="findGlobalIndex(r)"
-          @click="openDetail(findGlobalIndex(r))"
-          @toggle-fav="handleToggleFav(r)"
-        />
-        <div v-if="favoritesPreview.length === 0" class="empty-hint">暂无收藏配方</div>
-      </div>
+      <template v-if="!searchQuery || favoritesPreview.length > 0">
+        <div class="section-header" @click="showFavorites = !showFavorites">
+          <span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
+          <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
+        </div>
+        <div v-if="showFavorites" class="recipe-grid">
+          <RecipeCard
+            v-for="r in favoritesPreview"
+            :key="r._id"
+            :recipe="r"
+            :index="findGlobalIndex(r)"
+            @click="openDetail(findGlobalIndex(r))"
+            @toggle-fav="handleToggleFav(r)"
+          />
+          <div v-if="favoritesPreview.length === 0" class="empty-hint">暂无收藏配方</div>
+        </div>
+      </template>
     </div>
 
     <!-- Search Results (public recipes) -->
     <div v-if="searchQuery" class="search-results-section">
-      <div class="section-label">🔍 公共配方搜索结果 ({{ fuzzyResults.length }})</div>
-      <div class="recipe-grid">
-        <RecipeCard
-          v-for="(r, i) in fuzzyResults"
-          :key="r._id"
-          :recipe="r"
-          :index="findGlobalIndex(r)"
-          @click="openDetail(findGlobalIndex(r))"
-          @toggle-fav="handleToggleFav(r)"
-        />
-        <div v-if="fuzzyResults.length === 0" class="empty-hint">未找到匹配的公共配方</div>
+      <!-- Exact matches -->
+      <template v-if="exactResults.length > 0">
+        <div class="section-label">🔍 搜索结果 ({{ exactResults.length }})</div>
+        <div class="recipe-grid">
+          <RecipeCard
+            v-for="r in exactResults"
+            :key="r._id"
+            :recipe="r"
+            :index="findGlobalIndex(r)"
+            @click="openDetail(findGlobalIndex(r))"
+            @toggle-fav="handleToggleFav(r)"
+          />
+        </div>
+      </template>
+
+      <!-- Similar/related matches -->
+      <template v-if="similarResults.length > 0">
+        <div class="section-label similar-label">
+          {{ exactResults.length > 0 ? '💡 相关配方' : '💡 没有完全匹配，以下是相关配方' }}
+          ({{ similarResults.length }})
+        </div>
+        <div class="recipe-grid">
+          <RecipeCard
+            v-for="r in similarResults"
+            :key="'sim-' + r._id"
+            :recipe="r"
+            :index="findGlobalIndex(r)"
+            @click="openDetail(findGlobalIndex(r))"
+            @toggle-fav="handleToggleFav(r)"
+          />
+        </div>
+      </template>
+
+      <!-- No results at all -->
+      <div v-if="exactResults.length === 0 && similarResults.length === 0" class="no-match-box">
+        <div class="empty-hint">未找到「{{ searchQuery }}」相关配方</div>
+      </div>
+
+      <!-- Report missing button (always shown at bottom) -->
+      <div class="no-match-box" style="margin-top:12px">
+        <button v-if="!reportedMissing" class="btn-report-missing" @click="reportMissing">
+          📢 没找到想要的？通知编辑添加
+        </button>
+        <div v-else class="reported-hint">已通知编辑，感谢反馈！</div>
       </div>
     </div>
 
@@ -121,9 +155,11 @@
 
     <!-- Recipe Detail Overlay -->
     <RecipeDetailOverlay
-      v-if="selectedRecipeIndex !== null"
+      v-if="selectedRecipeIndex !== null || selectedDiaryRecipe !== null"
       :recipeIndex="selectedRecipeIndex"
-      @close="selectedRecipeIndex = null"
+      :recipeData="selectedDiaryRecipe"
+      :isDiary="selectedDiaryRecipe !== null"
+      @close="selectedRecipeIndex = null; selectedDiaryRecipe = null"
     />
   </div>
 </template>
@@ -133,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'
@@ -152,9 +188,11 @@ const searchQuery = ref('')
 const selectedCategory = ref(null)
 const categories = ref([])
 const selectedRecipeIndex = ref(null)
-const showMyRecipes = ref(true)
-const showFavorites = ref(true)
+const selectedDiaryRecipe = ref(null)
+const showMyRecipes = ref(false)
+const showFavorites = ref(false)
 const catIdx = ref(0)
+const sharedCount = ref({ adopted: 0, total: 0 })
 
 onMounted(async () => {
   try {
@@ -164,9 +202,16 @@ onMounted(async () => {
     }
   } catch {}
 
-  // Load personal diary recipes
+  // Load personal diary recipes & contribution stats
   if (auth.isLoggedIn) {
     await diaryStore.loadDiary()
+    try {
+      const cRes = await api('/api/me/contribution')
+      if (cRes.ok) {
+        const data = await cRes.json()
+        sharedCount.value = { adopted: data.adopted_count || 0, total: data.shared_count || 0 }
+      }
+    } catch {}
   }
 
   // Return to a recipe card after QR upload redirect
@@ -206,21 +251,108 @@ const filteredRecipes = computed(() => {
   if (selectedCategory.value) {
     list = list.filter(r => r.tags && r.tags.includes(selectedCategory.value))
   }
-  return list
+  return list.slice().sort((a, b) => a.name.localeCompare(b.name, 'zh'))
 })
 
-// Search results from public recipes
-const fuzzyResults = computed(() => {
+// Synonym groups for broader fuzzy matching
+const synonymGroups = [
+  ['胸', '乳腺', '乳房', '丰胸', '胸部'],
+  ['瘦', '减肥', '减脂', '消脂', '纤体', '塑形', '体重'],
+  ['痘', '痤疮', '粉刺', '暗疮', '长痘', '祛痘'],
+  ['斑', '色斑', '淡斑', '雀斑', '黑色素', '美白', '亮肤'],
+  ['皱', '抗皱', '皱纹', '紧致', '抗衰', '抗老'],
+  ['睡', '眠', '失眠', '助眠', '安眠', '好眠', '入睡'],
+  ['焦虑', '紧张', '压力', '情绪', '放松', '舒缓', '安神', '宁神'],
+  ['头', '头痛', '头疼', '偏头痛', '头晕'],
+  ['咳', '咳嗽', '止咳', '清咽'],
+  ['鼻', '鼻炎', '鼻塞', '过敏性鼻炎', '打喷嚏'],
+  ['感冒', '发烧', '发热', '流感', '风寒', '风热'],
+  ['胃', '消化', '肠胃', '胃痛', '胃胀', '积食', '便秘'],
+  ['肝', '护肝', '养肝', '肝脏', '排毒'],
+  ['肾', '补肾', '养肾', '肾虚'],
+  ['腰', '腰痛', '腰酸', '腰椎'],
+  ['肩', '肩颈', '颈椎', '肩周'],
+  ['关节', '骨骼', '骨质', '风湿', '类风湿'],
+  ['肌肉', '酸痛', '疼痛', '拉伤'],
+  ['月经', '痛经', '经期', '姨妈', '生理期', '调经'],
+  ['子宫', '卵巢', '生殖', '备孕', '怀孕', '孕'],
+  ['前列腺', '男性', '阳'],
+  ['湿', '祛湿', '排湿', '湿气', '化湿'],
+  ['免疫', '免疫力', '抵抗力'],
+  ['脱发', '掉发', '生发', '头发', '发际线', '秃'],
+  ['过敏', '敏感', '荨麻疹', '湿疹', '皮炎'],
+  ['血压', '高血压', '低血压', '血管', '循环'],
+  ['血糖', '糖尿病', '降糖'],
+  ['淋巴', '排毒', '水肿', '浮肿'],
+  ['呼吸', '肺', '支气管', '哮喘', '气管'],
+  ['眼', '眼睛', '视力', '近视', '干眼'],
+  ['耳', '耳鸣', '中耳炎', '耳朵'],
+  ['口', '口腔', '口臭', '牙', '牙龈', '牙疼'],
+  ['皮肤', '护肤', '保湿', '修复', '焕肤'],
+  ['疤', '疤痕', '伤疤', '妊娠纹'],
+  ['心', '心脏', '心悸', '养心'],
+  ['甲状腺', '甲亢', '甲减'],
+  ['高', '长高', '增高', '个子'],
+  ['静脉', '静脉曲张'],
+  ['痔', '痔疮'],
+]
+
+function expandQuery(q) {
+  const terms = [q]
+  for (const group of synonymGroups) {
+    if (group.some(t => q.includes(t) || t.includes(q))) {
+      for (const t of group) {
+        if (!terms.includes(t)) terms.push(t)
+      }
+    }
+  }
+  return terms
+}
+
+// Search results: exact matches (query in recipe name or tags, NOT oil names to avoid noise like 西班牙牛至)
+const exactResults = computed(() => {
   if (!searchQuery.value.trim()) return []
   const q = searchQuery.value.trim().toLowerCase()
   return recipeStore.recipes.filter(r => {
     const nameMatch = r.name.toLowerCase().includes(q)
-    const oilMatch = r.ingredients.some(ing => ing.oil.toLowerCase().includes(q))
-    const tagMatch = r.tags && r.tags.some(t => t.toLowerCase().includes(q))
-    return nameMatch || oilMatch || tagMatch
-  })
+    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'))
 })
 
+// Similar results: synonym expansion, only match against recipe NAME (not ingredients/tags)
+// Filter out single-char expanded terms to avoid overly broad matches
+const similarResults = computed(() => {
+  if (!searchQuery.value.trim()) return []
+  const q = searchQuery.value.trim()
+  const exactIds = new Set(exactResults.value.map(r => r._id))
+  const terms = expandQuery(q).filter(t => t.length >= 2 || t === q)
+
+  return recipeStore.recipes.filter(r => {
+    if (exactIds.has(r._id)) return false
+    const name = r.name
+    // Match by expanded synonyms (name only, not ingredients)
+    if (terms.some(t => name.includes(t))) return true
+    return false
+  }).sort((a, b) => a.name.localeCompare(b.name, 'zh')).slice(0, 30)
+})
+
+const reportedMissing = ref(false)
+
+async function reportMissing() {
+  try {
+    await api('/api/symptom-search', {
+      method: 'POST',
+      body: JSON.stringify({ query: searchQuery.value.trim(), report_missing: true }),
+    })
+    reportedMissing.value = true
+    ui.showToast('已通知编辑，感谢反馈！')
+  } catch {
+    ui.showToast('通知失败')
+  }
+}
+
 // Personal recipes from diary (separate from public recipes)
 const myDiaryRecipes = computed(() => {
   if (!auth.isLoggedIn) return []
@@ -237,9 +369,17 @@ const myDiaryRecipes = computed(() => {
 
 const favoritesPreview = computed(() => {
   if (!auth.isLoggedIn) return []
-  return recipeStore.recipes
-    .filter(r => recipeStore.isFavorite(r))
-    .slice(0, 6)
+  let list = recipeStore.recipes.filter(r => recipeStore.isFavorite(r))
+  if (searchQuery.value.trim()) {
+    const q = searchQuery.value.trim().toLowerCase()
+    list = list.filter(r => {
+      const nameMatch = r.name.toLowerCase().includes(q)
+      const oilMatch = r.ingredients.some(ing => ing.oil.toLowerCase().includes(q))
+      const tagMatch = r.tags && r.tags.some(t => t.toLowerCase().includes(q))
+      return nameMatch || oilMatch || tagMatch
+    })
+  }
+  return list.slice(0, 6)
 })
 
 function findGlobalIndex(recipe) {
@@ -252,27 +392,24 @@ function openDetail(index) {
   }
 }
 
-function openDiaryDetail(diary) {
-  // Create a temporary recipe-like object from diary and open it
-  const tmpRecipe = {
-    _id: null,
-    _diary_id: diary.id,
-    name: diary.name,
-    note: diary.note || '',
-    tags: diary.tags || [],
-    ingredients: diary.ingredients || [],
-    _owner_id: auth.user.id,
+function getDiaryShareStatus(d) {
+  const pub = recipeStore.recipes.find(r => r.name === d.name && r._owner_id === auth.user?.id)
+  if (pub) return 'shared'
+  return null
+}
+
+function diaryAsRecipe(d) {
+  return {
+    _id: 'diary-' + d.id,
+    name: d.name,
+    note: d.note || '',
+    tags: d.tags || [],
+    ingredients: d.ingredients || [],
   }
-  recipeStore.recipes.push(tmpRecipe)
-  const tmpIdx = recipeStore.recipes.length - 1
-  selectedRecipeIndex.value = tmpIdx
-  // Clean up temp recipe when detail closes
-  const unwatch = watch(selectedRecipeIndex, (val) => {
-    if (val === null) {
-      recipeStore.recipes.splice(tmpIdx, 1)
-      unwatch()
-    }
-  })
+}
+
+function openDiaryDetail(diary) {
+  selectedDiaryRecipe.value = diaryAsRecipe(diary)
 }
 
 async function handleToggleFav(recipe) {
@@ -309,12 +446,25 @@ async function shareDiaryToPublic(diary) {
 }
 
 function onSearch() {
-  // fuzzyResults computed handles the filtering reactively
+  reportedMissing.value = false
 }
 
 function clearSearch() {
   searchQuery.value = ''
   selectedCategory.value = null
+  reportedMissing.value = false
+}
+
+// Carousel swipe
+const carouselTouchStartX = ref(0)
+function onCarouselTouchStart(e) {
+  carouselTouchStartX.value = e.touches[0].clientX
+}
+function onCarouselTouchEnd(e) {
+  const dx = e.changedTouches[0].clientX - carouselTouchStartX.value
+  if (Math.abs(dx) > 50) {
+    slideCat(dx < 0 ? 1 : -1)
+  }
 }
 </script>
 
@@ -515,11 +665,62 @@ function clearSearch() {
   color: #999;
 }
 
+.diary-card-wrap {
+  position: relative;
+}
+
+.share-status {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  font-size: 10px;
+  padding: 2px 8px;
+  border-radius: 8px;
+  font-weight: 600;
+}
+
+.share-status.shared {
+  background: #e8f5e9;
+  color: #2e7d32;
+}
+
+.share-status.pending {
+  background: #fff3e0;
+  color: #e65100;
+}
+
+.share-btn {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  background: rgba(255,255,255,0.9);
+  border: 1px solid #d4cfc7;
+  border-radius: 8px;
+  padding: 2px 8px;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.share-btn:hover {
+  background: #e8f5e9;
+  border-color: #7ec6a4;
+}
+
+.contrib-badge {
+  font-size: 11px;
+  color: #4a9d7e;
+  background: #e8f5e9;
+  padding: 2px 8px;
+  border-radius: 8px;
+  font-weight: 500;
+  margin-left: auto;
+}
+
 .section-label {
   font-size: 14px;
   font-weight: 600;
   color: #3e3a44;
-  padding: 8px 4px;
+  padding: 10px 12px;
   margin-bottom: 8px;
 }
 
@@ -542,6 +743,40 @@ function clearSearch() {
   padding: 24px 0;
 }
 
+.similar-label {
+  color: #e65100;
+  background: #fff8e1;
+  padding: 8px 14px;
+  border-radius: 10px;
+}
+
+.no-match-box {
+  text-align: center;
+  padding: 12px 0;
+}
+
+.btn-report-missing {
+  background: linear-gradient(135deg, #ffb74d, #e65100);
+  color: #fff;
+  border: none;
+  border-radius: 10px;
+  padding: 10px 20px;
+  font-size: 14px;
+  cursor: pointer;
+  font-family: inherit;
+  margin-top: 8px;
+}
+
+.btn-report-missing:hover {
+  opacity: 0.9;
+}
+
+.reported-hint {
+  color: #4a9d7e;
+  font-size: 13px;
+  font-weight: 500;
+}
+
 .diary-card {
   background: white;
   border-radius: 14px;

frontend/src/views/UserManagement.vue

@@ -22,43 +22,39 @@
     </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.user_name || app.display_name }}</span>
-            <span class="review-reason">{{ app.reason }}</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.effectiveStatus">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.effectiveStatus] }}</span>
+            </div>
+            <div class="review-actions">
+              <template v-if="group.effectiveStatus === '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>
     </div>
 
-    <!-- New User Creation -->
-    <div class="create-section">
-      <h4 class="section-title">➕ 创建新用户</h4>
-      <div class="create-form">
-        <input v-model="newUser.username" class="form-input" placeholder="用户名" />
-        <input v-model="newUser.display_name" class="form-input" placeholder="显示名称" />
-        <input v-model="newUser.password" class="form-input" type="password" placeholder="密码 (留空自动生成)" />
-        <select v-model="newUser.role" class="form-select">
-          <option value="viewer">查看者</option>
-          <option value="editor">编辑</option>
-          <option value="senior_editor">高级编辑</option>
-          <option value="admin">管理员</option>
-        </select>
-        <button class="btn-primary" @click="createUser" :disabled="!newUser.username.trim()">创建</button>
-      </div>
-      <div v-if="createdLink" class="created-link">
-        <span>登录链接:</span>
-        <code>{{ createdLink }}</code>
-        <button class="btn-sm btn-outline" @click="copyLink(createdLink)">复制</button>
-      </div>
-    </div>
+    <!-- User self-registers, admin assigns roles below -->
 
     <!-- Search & Filter -->
     <div class="filter-toolbar">
@@ -100,13 +96,14 @@
             :value="u.role"
             class="role-select"
             @change="changeRole(u, $event.target.value)"
+            :disabled="u.role === 'admin'"
           >
             <option value="viewer">查看者</option>
             <option value="editor">编辑</option>
             <option value="senior_editor">高级编辑</option>
-            <option value="admin">管理员</option>
           </select>
-          <button class="btn-sm btn-outline" @click="copyUserLink(u)" title="复制登录链接">🔗</button>
+          <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>
@@ -118,11 +115,11 @@
 </template>
 
 <script setup>
-import { ref, computed, reactive, onMounted } from 'vue'
+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'
+import { showConfirm, showPrompt } from '../composables/useDialog'
 
 const auth = useAuthStore()
 const ui = useUiStore()
@@ -132,15 +129,34 @@ const searchQuery = ref('')
 const filterRole = ref('')
 const translations = ref([])
 const businessApps = ref([])
-const createdLink = ref('')
+import { reactive } from 'vue'
 
-const newUser = reactive({
-  username: '',
-  display_name: '',
-  password: '',
-  role: 'viewer',
+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]
+    // Check if user is already verified (from users list)
+    const user = users.value.find(u => (u._id || u.id) === g.user_id)
+    if (user && user.business_verified) {
+      g.effectiveStatus = 'approved'
+    } else {
+      g.effectiveStatus = g.latest.status
+    }
+    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: '高级编辑' },
@@ -168,10 +184,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 {
@@ -206,43 +218,10 @@ async function loadBusinessApps() {
   }
 }
 
-async function createUser() {
-  if (!newUser.username.trim()) return
-  try {
-    const res = await api('/api/users', {
-      method: 'POST',
-      body: JSON.stringify({
-        username: newUser.username.trim(),
-        display_name: newUser.display_name.trim() || newUser.username.trim(),
-        password: newUser.password || undefined,
-        role: newUser.role,
-      }),
-    })
-    if (res.ok) {
-      const data = await res.json()
-      if (data.token) {
-        const baseUrl = window.location.origin
-        createdLink.value = `${baseUrl}/?token=${data.token}`
-      }
-      newUser.username = ''
-      newUser.display_name = ''
-      newUser.password = ''
-      newUser.role = 'viewer'
-      await loadUsers()
-      ui.showToast('用户已创建')
-    } else {
-      const err = await res.json().catch(() => ({}))
-      ui.showToast('创建失败: ' + (err.error || err.message || ''))
-    }
-  } catch {
-    ui.showToast('创建失败')
-  }
-}
-
 async function changeRole(user, newRole) {
   const id = user._id || user.id
   try {
-    const res = await api(`/api/users/${id}/role`, {
+    const res = await api(`/api/users/${id}`, {
       method: 'PUT',
       body: JSON.stringify({ role: newRole }),
     })
@@ -270,27 +249,33 @@ async function removeUser(user) {
   }
 }
 
-async function copyUserLink(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 id = user._id || user.id
-    const res = await api(`/api/users/${id}/token`)
+    const res = await api(`/api/business-grant/${id}`, { method: 'POST' })
     if (res.ok) {
-      const data = await res.json()
-      const link = `${window.location.origin}/?token=${data.token}`
-      await navigator.clipboard.writeText(link)
-      ui.showToast('链接已复制')
+      user.business_verified = 1
+      ui.showToast('已开通商业认证')
     }
   } catch {
-    ui.showToast('获取链接失败')
+    ui.showToast('操作失败')
   }
 }
 
-async function copyLink(link) {
+async function revokeBusiness(user) {
+  const ok = await showConfirm(`撤销「${user.display_name || user.username}」的商业认证？`)
+  if (!ok) return
+  const id = user._id || user.id
   try {
-    await navigator.clipboard.writeText(link)
-    ui.showToast('已复制')
+    const res = await api(`/api/business-revoke/${id}`, { method: 'POST' })
+    if (res.ok) {
+      user.business_verified = 0
+      ui.showToast('已撤销商业认证')
+    }
   } catch {
-    ui.showToast('复制失败')
+    ui.showToast('操作失败')
   }
 }
 
@@ -335,8 +320,13 @@ async function approveBusiness(app) {
 
 async function rejectBusiness(app) {
   const id = app._id || app.id
+  const reason = await showPrompt('请输入拒绝原因（选填）：')
+  if (reason === null) return
   try {
-    const res = await api(`/api/business-applications/${id}/reject`, { method: 'POST' })
+    const res = await api(`/api/business-applications/${id}/reject`, {
+      method: 'POST',
+      body: JSON.stringify({ reason: reason || '' }),
+    })
     if (res.ok) {
       businessApps.value = businessApps.value.filter(item => (item._id || item.id) !== id)
       ui.showToast('已拒绝')
@@ -434,8 +424,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;

frontend/vite.config.js

@@ -1,12 +1,17 @@
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 
+const buildTime = new Date().toLocaleString('en-GB', { timeZone: 'Europe/London', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })
+
 export default defineConfig({
+  define: {
+    __BUILD_TIME__: JSON.stringify(buildTime),
+  },
   plugins: [vue()],
   server: {
     proxy: {
-      '/api': 'http://localhost:8000',
-      '/uploads': 'http://localhost:8000'
+      '/api': `http://localhost:${process.env.VITE_API_PORT || 8000}`,
+      '/uploads': `http://localhost:${process.env.VITE_API_PORT || 8000}`
     }
   },
   build: {