fix: 保存配方卡片所有英文翻译（含精油名称）

之前保存翻译时只保存了配方名的 en_name，精油的自定义英文名
（customOilNameEn）没有持久化，刷新后丢失。

- backend: recipes 表新增 en_oils（JSON 字符串）列
- RecipeUpdate 模型增加 en_oils 字段，update_recipe 写入 DB
- 所有 SELECT 语句补上 en_oils，_recipe_to_dict 返回该字段
- frontend: applyTranslation() 同时提交 en_oils
- onMounted 优先从 r.en_oils 还原精油译名，再 fallback 静态表
- recipes store 映射 en_oils 字段

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitignore

@@ -8,4 +8,3 @@ backups/
 # Frontend
 frontend/node_modules/
 frontend/dist/
-frontend/.vite/

backend/database.py

@@ -163,8 +163,6 @@ 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()]
@@ -223,8 +221,6 @@ def init_db():
         c.execute("ALTER TABLE oils ADD COLUMN retail_price REAL")
     if "is_active" not in oil_cols:
         c.execute("ALTER TABLE oils ADD COLUMN is_active INTEGER DEFAULT 1")
-    if "en_name" not in oil_cols:
-        c.execute("ALTER TABLE oils ADD COLUMN en_name TEXT DEFAULT ''")
 
     # Migration: add new columns to category_modules if missing
     cat_cols = [row[1] for row in c.execute("PRAGMA table_info(category_modules)").fetchall()]
@@ -244,6 +240,8 @@ def init_db():
         c.execute("ALTER TABLE recipes ADD COLUMN updated_by INTEGER")
     if "en_name" not in cols:
         c.execute("ALTER TABLE recipes ADD COLUMN en_name TEXT DEFAULT ''")
+    if "en_oils" not in cols:
+        c.execute("ALTER TABLE recipes ADD COLUMN en_oils TEXT DEFAULT '{}'")
 
     # Seed admin user if no users exist
     count = c.execute("SELECT COUNT(*) FROM users").fetchone()[0]

backend/main.py

@@ -79,8 +79,6 @@ class OilIn(BaseModel):
     bottle_price: float
     drop_count: int
     retail_price: Optional[float] = None
-    en_name: Optional[str] = None
-    is_active: Optional[int] = None
 
 
 class IngredientIn(BaseModel):
@@ -98,6 +96,7 @@ class RecipeIn(BaseModel):
 class RecipeUpdate(BaseModel):
     name: Optional[str] = None
     en_name: Optional[str] = None
+    en_oils: Optional[str] = None
     note: Optional[str] = None
     ingredients: Optional[list[IngredientIn]] = None
     tags: Optional[list[str]] = None
@@ -311,7 +310,7 @@ def symptom_search(body: dict, user=Depends(get_current_user)):
     conn = get_db()
     # Search in recipe names
     rows = conn.execute(
-        "SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id"
+        "SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes ORDER BY id"
     ).fetchall()
     exact = []
     related = []
@@ -324,7 +323,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"):
+        for role in ("admin", "senior_editor", "editor"):
             conn.execute(
                 "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
                 (role, "🔍 用户需求：" + query,
@@ -477,8 +476,6 @@ 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}
@@ -503,7 +500,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.reject_reason, a.created_at, "
+        "SELECT a.id, a.user_id, a.business_name, a.document, a.status, 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()
@@ -520,15 +517,13 @@ 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"],))
-    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"
+    # Notify user
+    target = conn.execute("SELECT role FROM users WHERE id = ?", (app["user_id"],)).fetchone()
     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}
@@ -543,8 +538,7 @@ 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, display_name, username FROM users WHERE id = ?", (app["user_id"],)).fetchone()
-    target_name = (target["display_name"] or target["username"]) if target else "unknown"
+    target = conn.execute("SELECT role FROM users WHERE id = ?", (app["user_id"],)).fetchone()
     if target:
         msg = "你的商业用户认证申请未通过。"
         if reason:
@@ -554,8 +548,6 @@ 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}
@@ -621,23 +613,6 @@ 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()
@@ -653,9 +628,6 @@ 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}
@@ -678,7 +650,7 @@ def impersonate(body: dict, user=Depends(require_role("admin"))):
 @app.get("/api/oils")
 def list_oils():
     conn = get_db()
-    rows = conn.execute("SELECT name, bottle_price, drop_count, retail_price, is_active, en_name FROM oils ORDER BY name").fetchall()
+    rows = conn.execute("SELECT name, bottle_price, drop_count, retail_price, is_active FROM oils ORDER BY name").fetchall()
     conn.close()
     return [dict(r) for r in rows]
 
@@ -687,11 +659,9 @@ def list_oils():
 def upsert_oil(oil: OilIn, user=Depends(require_role("admin", "senior_editor"))):
     conn = get_db()
     conn.execute(
-        "INSERT INTO oils (name, bottle_price, drop_count, retail_price, en_name, is_active) VALUES (?, ?, ?, ?, ?, ?) "
-        "ON CONFLICT(name) DO UPDATE SET bottle_price=excluded.bottle_price, drop_count=excluded.drop_count, "
-        "retail_price=excluded.retail_price, en_name=COALESCE(excluded.en_name, oils.en_name), "
-        "is_active=COALESCE(excluded.is_active, oils.is_active)",
-        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, oil.en_name, oil.is_active),
+        "INSERT INTO oils (name, bottle_price, drop_count, retail_price) VALUES (?, ?, ?, ?) "
+        "ON CONFLICT(name) DO UPDATE SET bottle_price=excluded.bottle_price, drop_count=excluded.drop_count, retail_price=excluded.retail_price",
+        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price),
     )
     log_audit(conn, user["id"], "upsert_oil", "oil", oil.name, oil.name,
               json.dumps({"bottle_price": oil.bottle_price, "drop_count": oil.drop_count}))
@@ -729,6 +699,7 @@ def _recipe_to_dict(conn, row):
         "id": rid,
         "name": row["name"],
         "en_name": row["en_name"] if "en_name" in row.keys() else "",
+        "en_oils": row["en_oils"] if "en_oils" in row.keys() else "{}",
         "note": row["note"],
         "owner_id": row["owner_id"],
         "owner_name": (owner["display_name"] or owner["username"]) if owner else None,
@@ -743,19 +714,19 @@ def list_recipes(user=Depends(get_current_user)):
     conn = get_db()
     # Admin sees all; others see admin-owned (adopted) + their own
     if user["role"] == "admin":
-        rows = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id").fetchall()
+        rows = conn.execute("SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes ORDER BY id").fetchall()
     else:
         admin = conn.execute("SELECT id FROM users WHERE role = 'admin' LIMIT 1").fetchone()
         admin_id = admin["id"] if admin else 1
         user_id = user.get("id")
         if user_id:
             rows = conn.execute(
-                "SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE owner_id = ? OR owner_id = ? ORDER BY id",
+                "SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes WHERE owner_id = ? OR owner_id = ? ORDER BY id",
                 (admin_id, user_id)
             ).fetchall()
         else:
             rows = conn.execute(
-                "SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE owner_id = ? ORDER BY id",
+                "SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes WHERE owner_id = ? ORDER BY id",
                 (admin_id,)
             ).fetchall()
     result = [_recipe_to_dict(conn, r) for r in rows]
@@ -766,7 +737,7 @@ def list_recipes(user=Depends(get_current_user)):
 @app.get("/api/recipes/{recipe_id}")
 def get_recipe(recipe_id: int):
     conn = get_db()
-    row = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    row = conn.execute("SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     if not row:
         conn.close()
         raise HTTPException(404, "Recipe not found")
@@ -781,14 +752,8 @@ 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, owner_id))
+              (recipe.name, recipe.note, user["id"]))
     rid = c.lastrowid
     for ing in recipe.ingredients:
         c.execute(
@@ -799,20 +764,13 @@ 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)
-    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
+    # Notify admin when non-admin creates a recipe
+    if user["role"] != "admin":
+        who = user.get("display_name") or user["username"]
         conn.execute(
             "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
             ("admin", "📝 新配方待审核",
-             f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
+             f"{who} 新增了配方「{recipe.name}」，请到管理配方查看并采纳。")
         )
     conn.commit()
     conn.close()
@@ -820,13 +778,15 @@ 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. Requires editor+ role."""
+    """Check if user can modify this recipe."""
     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", "editor"):
+    if user["role"] in ("admin", "senior_editor"):
         return row
-    raise HTTPException(403, "权限不足")
+    if row["owner_id"] == user.get("id"):
+        return row
+    raise HTTPException(403, "只能修改自己创建的配方")
 
 
 @app.put("/api/recipes/{recipe_id}")
@@ -850,6 +810,8 @@ def update_recipe(recipe_id: int, update: RecipeUpdate, user=Depends(get_current
         c.execute("UPDATE recipes SET note = ? WHERE id = ?", (update.note, recipe_id))
     if update.en_name is not None:
         c.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (update.en_name, recipe_id))
+    if update.en_oils is not None:
+        c.execute("UPDATE recipes SET en_oils = ? WHERE id = ?", (update.en_oils, recipe_id))
     if update.ingredients is not None:
         c.execute("DELETE FROM recipe_ingredients WHERE recipe_id = ?", (recipe_id,))
         for ing in update.ingredients:
@@ -879,7 +841,7 @@ def delete_recipe(recipe_id: int, user=Depends(get_current_user)):
     conn = get_db()
     row = _check_recipe_permission(conn, recipe_id, user)
     # Save full snapshot for undo
-    full = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    full = conn.execute("SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     snapshot = _recipe_to_dict(conn, full)
     log_audit(conn, user["id"], "delete_recipe", "recipe", recipe_id, row["name"],
               json.dumps(snapshot, ensure_ascii=False))
@@ -900,95 +862,11 @@ 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 id, role, display_name, username FROM users WHERE id = ?", (row["owner_id"],)).fetchone()
+    old_owner = conn.execute("SELECT 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}
@@ -1094,25 +972,12 @@ def delete_user(user_id: int, user=Depends(require_role("admin"))):
 @app.put("/api/users/{user_id}")
 def update_user(user_id: int, body: UserUpdate, user=Depends(require_role("admin"))):
     conn = get_db()
-    target = conn.execute("SELECT role, display_name, username FROM users WHERE id = ?", (user_id,)).fetchone()
-    old_role = target["role"] if target else "unknown"
-    target_name = (target["display_name"] or target["username"]) if target else "unknown"
     if body.role is not None:
-        if body.role == "admin":
-            conn.close()
-            raise HTTPException(403, "不能将用户设为管理员")
-        conn.execute("UPDATE users SET role = ?, role_changed_at = datetime('now') WHERE id = ?", (body.role, user_id))
+        conn.execute("UPDATE users SET role = ? 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))
-    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))
+    log_audit(conn, user["id"], "update_user", "user", user_id, None,
+              json.dumps({"role": body.role, "display_name": body.display_name}))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1317,15 +1182,14 @@ 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, tags) VALUES (?, ?, ?, ?, ?, ?)",
-        (user["id"], source_id, name, json.dumps(ingredients, ensure_ascii=False), note, json.dumps(tags, ensure_ascii=False))
+        "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)
     )
     conn.commit()
     did = c.lastrowid
@@ -1480,7 +1344,7 @@ def recipes_by_inventory(user=Depends(get_current_user)):
     if not inv:
         conn.close()
         return []
-    rows = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id").fetchall()
+    rows = conn.execute("SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes ORDER BY id").fetchall()
     result = []
     for r in rows:
         recipe = _recipe_to_dict(conn, r)
@@ -1533,75 +1397,17 @@ 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"], cutoff)
+        (user["id"], user["role"])
     ).fetchall()
     conn.close()
     return [dict(r) for r in rows]
@@ -1622,50 +1428,6 @@ 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(300) // sanity check: some premium oils can cost >100 per drop
+        expect(ppd).to.be.lte(100) // sanity check: no oil costs >100 per drop
       })
     })
   })

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

@@ -1,57 +1,45 @@
-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()
-    dismissModals()
-    cy.get('.detail-overlay').should('exist')
+    cy.get('[class*="detail"]').should('be.visible')
   })
 
   it('shows recipe name in detail view', () => {
-    cy.get('.recipe-card').first().click()
-    dismissModals()
-    cy.get('.detail-overlay').should('exist')
+    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')
+    })
   })
 
   it('shows ingredient info with drops', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.wait(500)
     cy.contains('滴').should('exist')
   })
 
   it('shows cost with ¥ symbol', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.wait(500)
     cy.contains('¥').should('exist')
   })
 
   it('closes detail panel when clicking close button', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
-    cy.get('.detail-overlay').should('exist')
-    cy.get('.detail-close-btn').first().click({ force: true })
+    cy.get('[class*="detail"]').should('be.visible')
+    cy.get('button').contains(/✕|关闭/).first().click()
     cy.get('.recipe-card').should('be.visible')
   })
 
   it('shows action buttons in detail', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
-    cy.get('.detail-overlay button').should('have.length.gte', 1)
+    cy.wait(500)
+    cy.get('[class*="detail"] button').should('have.length.gte', 1)
   })
 
   it('shows favorite star on recipe cards', () => {
@@ -59,22 +47,35 @@ describe('Recipe Detail', () => {
   })
 })
 
-describe('Recipe Detail - Card View', () => {
+describe('Recipe Detail - Editor (Admin)', () => {
+  const ADMIN_TOKEN = 'c86ae7afbe10fabe3c1d5e1a7fee74feaadfd5dc7be2ab62'
+
   beforeEach(() => {
-    cy.visit('/')
+    cy.visit('/', {
+      onBeforeLoad(win) {
+        win.localStorage.setItem('oil_auth_token', ADMIN_TOKEN)
+      }
+    })
     cy.get('.recipe-card', { timeout: 10000 }).should('have.length.gte', 1)
-    dismissModals()
+  })
+
+  it('shows editable ingredients table in editor tab', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.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 language toggle', () => {
-    cy.contains('中文').should('exist')
-    cy.contains('English').should('exist')
+  it('shows export image button', () => {
+    cy.get('.recipe-card').first().click()
+    cy.wait(500)
+    cy.contains('导出图片').should('exist')
   })
 })

frontend/package-lock.json

@@ -9,12 +9,10 @@
       "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",
-        "xlsx": "^0.18.5"
+        "vue-router": "^4.6.4"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^6.0.5",
@@ -1181,15 +1179,6 @@
         "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",
@@ -1648,19 +1637,6 @@
       "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",
@@ -1785,15 +1761,6 @@
         "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",
@@ -2604,15 +2571,6 @@
         "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",
@@ -2872,12 +2830,6 @@
         "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",
@@ -4732,18 +4684,6 @@
         "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",
@@ -5550,24 +5490,6 @@
         "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",
@@ -5611,27 +5533,6 @@
       "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,12 +15,10 @@
   },
   "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",
-    "xlsx": "^0.18.5"
+    "vue-router": "^4.6.4"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^6.0.5",

frontend/src/App.vue

@@ -2,43 +2,59 @@
   <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 }} · 数据为生产副本，修改不影响正式环境
   </div>
-  <div class="app-header">
-    <div class="header-inner">
-      <div class="header-left">
-        <div class="header-icon">🌿</div>
-        <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>
-        </template>
+  <div class="app-header" style="position:relative">
+    <div class="header-inner" style="padding-right:80px">
+      <div class="header-icon">🌿</div>
+      <div class="header-title" style="text-align:left;flex:1">
+        <h1 style="display:flex;justify-content:space-between;align-items:center;gap:8px;white-space:nowrap">
+          <span style="flex-shrink:0">doTERRA 配方计算器
+            <span v-if="auth.isAdmin" style="font-size:10px;font-weight:400;opacity:0.5;vertical-align:top">v2.2.0</span>
+          </span>
+          <span
+            style="cursor:pointer;color:white;font-size:13px;font-weight:500;flex-shrink:0;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','PingFang SC','Hiragino Sans GB',sans-serif;letter-spacing:0.3px;opacity:0.95"
+            @click="toggleUserMenu"
+          >
+            <template v-if="auth.isLoggedIn">
+              👤 {{ auth.user.display_name || auth.user.username }}
+              ▾
+            </template>
+            <template v-else>
+              <span style="background:rgba(255,255,255,0.2);padding:4px 12px;border-radius:12px">登录</span>
+            </template>
+          </span>
+        </h1>
+        <p style="display:flex;flex-wrap:wrap;gap:4px 8px;margin:0">
+          <span style="white-space:nowrap">查询配方</span>
+          <span style="opacity:0.5">·</span>
+          <span style="white-space:nowrap">计算成本</span>
+          <span style="opacity:0.5">·</span>
+          <span style="white-space:nowrap">自制配方</span>
+          <span style="opacity:0.5">·</span>
+          <span style="white-space:nowrap">导出卡片</span>
+          <span style="opacity:0.5">·</span>
+          <span style="white-space:nowrap">精油知识</span>
+        </p>
       </div>
     </div>
   </div>
 
   <!-- User Menu Popup -->
-  <UserMenu v-if="showUserMenu" @close="showUserMenu = false; loadUnreadCount()" />
+  <UserMenu v-if="showUserMenu" @close="showUserMenu = false" />
 
   <!-- Nav tabs -->
-  <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 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>
 
   <!-- Main content -->
-  <div class="main" @touchstart="onSwipeStart" @touchend="onSwipeEnd">
+  <div class="main">
     <router-view />
   </div>
 
@@ -53,7 +69,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, watch, nextTick } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useAuthStore } from './stores/auth'
 import { useOilsStore } from './stores/oils'
@@ -62,7 +78,6 @@ 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,44 +86,12 @@ 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
@@ -117,35 +100,9 @@ const prMatch = hostname.match(/^pr-(\d+)\./)
 const isPreview = !!prMatch
 const prId = prMatch ? prMatch[1] : ''
 
-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) {
@@ -164,38 +121,6 @@ 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([
@@ -205,7 +130,6 @@ onMounted(async () => {
   ])
   if (auth.isLoggedIn) {
     await recipeStore.loadFavorites()
-    await loadUnreadCount()
   }
 
   // Periodic refresh
@@ -213,89 +137,7 @@ onMounted(async () => {
     if (document.visibilityState !== 'visible') return
     try {
       await auth.loadMe()
-      await loadUnreadCount()
     } catch {}
   }, 15000)
 })
 </script>
-
-<style scoped>
-.header-inner {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 12px;
-  position: relative;
-  z-index: 1;
-}
-.header-left {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  flex: 1;
-  min-width: 0;
-}
-.header-icon { font-size: 36px; flex-shrink: 0; }
-.header-title { color: white; min-width: 0; }
-.header-title h1 {
-  font-family: 'Noto Serif SC', serif;
-  font-size: 22px;
-  font-weight: 600;
-  letter-spacing: 2px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.header-title p {
-  font-size: 12px;
-  opacity: 0.8;
-  margin-top: 3px;
-  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;
-  display: flex;
-  align-items: center;
-  gap: 6px;
-}
-.user-name {
-  color: white;
-  font-size: 13px;
-  font-weight: 500;
-  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);
-  padding: 5px 14px;
-  border-radius: 12px;
-  font-size: 13px;
-}
-.biz-badge { font-size: 14px; }
-@media (max-width: 480px) {
-  .header-icon { font-size: 28px; }
-  .header-title h1 { font-size: 18px; }
-  .header-title p { font-size: 10px; }
-}
-</style>

frontend/src/__tests__/newFeatures.test.js

@@ -1,87 +0,0 @@
-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/assets/styles.css

@@ -69,24 +69,6 @@ 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/CustomDialog.vue

@@ -8,8 +8,6 @@
         type="text"
         style="width:100%;padding:10px 14px;border:1.5px solid #d4cfc7;border-radius:10px;font-size:14px;margin-bottom:16px;outline:none;font-family:inherit;box-sizing:border-box"
         @keydown.enter="submitPrompt"
-        @compositionstart="isComposing = true"
-        @compositionend="onCompositionEnd"
         ref="promptInput"
       />
       <div class="dialog-btn-row">
@@ -21,12 +19,11 @@
 </template>
 
 <script setup>
-import { ref, watch, nextTick, shallowRef } from 'vue'
+import { ref, watch, nextTick } from 'vue'
 import { dialogState, closeDialog } from '../composables/useDialog'
 
 const inputValue = ref('')
 const promptInput = ref(null)
-const isComposing = shallowRef(false)
 
 watch(() => dialogState.visible, (v) => {
   if (v && dialogState.type === 'prompt') {
@@ -49,15 +46,7 @@ function cancel() {
   else closeDialog(null)
 }
 
-function onCompositionEnd(e) {
-  isComposing.value = false
-  // After compositionend, update the model value with the committed text
-  inputValue.value = e.target.value
-}
-
-function submitPrompt(e) {
-  // Ignore Enter during IME composition (e.g. Chinese input method confirming a character)
-  if (e.isComposing || isComposing.value) return
+function submitPrompt() {
   closeDialog(inputValue.value)
 }
 </script>

frontend/src/components/LoginModal.vue

@@ -51,15 +51,6 @@
         <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>
@@ -69,7 +60,6 @@
 import { ref } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
-import { api } from '../composables/useApi'
 
 const emit = defineEmits(['close'])
 
@@ -83,9 +73,6 @@ 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 = ''
@@ -128,26 +115,6 @@ 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>
@@ -242,31 +209,4 @@ async function submitFeedback() {
   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="visibleTags.length" class="recipe-card-tags">
-      <span v-for="tag in visibleTags" :key="tag" class="tag" :class="{ 'tag-reviewed': tag === '已审核' }">{{ tag }}</span>
+    <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>
     <div class="recipe-card-oils">{{ oilNames }}</div>
     <div class="recipe-card-bottom">
@@ -20,8 +20,7 @@
 <script setup>
 import { computed } from 'vue'
 import { useOilsStore } from '../stores/oils'
-import { useRecipesStore, EDITOR_ONLY_TAGS } from '../stores/recipes'
-import { useAuthStore } from '../stores/auth'
+import { useRecipesStore } from '../stores/recipes'
 
 const props = defineProps({
   recipe: { type: Object, required: true },
@@ -32,13 +31,6 @@ defineEmits(['click', 'toggle-fav'])
 
 const oilsStore = useOilsStore()
 const recipesStore = useRecipesStore()
-const auth = useAuthStore()
-
-const visibleTags = computed(() => {
-  if (!props.recipe.tags) return []
-  if (auth.canEdit) return props.recipe.tags
-  return props.recipe.tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
-})
 
 const oilNames = computed(() =>
   props.recipe.ingredients.map(i => i.oil).join('、')
@@ -87,11 +79,6 @@ 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/UserMenu.vue

@@ -14,11 +14,6 @@
         <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>
@@ -33,17 +28,7 @@
         <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-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 class="notif-title">{{ n.title }}</div>
             <div v-if="n.body" class="notif-body">{{ n.body }}</div>
             <div class="notif-time">{{ formatTime(n.created_at) }}</div>
           </div>
@@ -93,11 +78,6 @@ function goMyDiary() {
   router.push('/mydiary')
 }
 
-function goAdmin(section) {
-  emit('close')
-  router.push('/' + section)
-}
-
 function toggleNotifications() {
   showNotifPanel.value = !showNotifPanel.value
   showBugForm.value = false
@@ -125,52 +105,6 @@ 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: '{}' })
@@ -189,7 +123,7 @@ function handleLogout() {
   auth.logout()
   ui.showToast('已退出登录')
   emit('close')
-  window.location.href = '/'
+  router.push('/')
 }
 
 onMounted(loadNotifications)
@@ -253,24 +187,7 @@ onMounted(loadNotifications)
   padding: 8px 0; border-bottom: 1px solid #f5f5f5; font-size: 13px;
 }
 .notif-item.unread { background: #fafafa; }
-.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-title { font-weight: 500; color: #333; }
 .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/useOilCards.js

@@ -39,11 +39,3 @@ export function getOilCard(name) {
   if (base !== name && OIL_CARDS[base]) return OIL_CARDS[base]
   return null
 }
-
-export function setOilCard(name, card) {
-  if (card && (card.effects || card.usage)) {
-    OIL_CARDS[name] = card
-  } else {
-    delete OIL_CARDS[name]
-  }
-}

frontend/src/composables/useOilTranslation.js

@@ -14,27 +14,14 @@ const OIL_EN = {
   '柠檬草': 'Lemongrass', '杜松浆果': 'Juniper Berry', '甜橙': 'Wild Orange',
   '香茅': 'Citronella', '薄荷': 'Peppermint', '扁柏': 'Arborvitae',
   '古巴香脂': 'Copaiba', '椰子油': 'Coconut Oil',
-  '芳香调理': 'AromaTouch', '保卫复方': 'On Guard', '保卫': 'On Guard',
-  '乐活复方': 'Balance', '乐活': 'DigestZen',
-  '舒缓复方': 'Past Tense', '舒缓': 'Deep Blue',
-  '净化复方': 'Purify', '净化清新': 'Purify',
-  '呼吸复方': 'Breathe', '顺畅呼吸': 'Breathe',
-  '舒压复方': 'Adaptiv', '安定情绪': 'Balance',
-  '安宁神气': 'Serenity', '多特瑞': 'doTERRA',
-  '野橘': 'Wild Orange', '柑橘清新': 'Citrus Bliss',
-  '新瑞活力': 'MetaPWR', '元气': 'Zendocrine',
-  '温柔呵护': 'ClaryCalm', '西洋蓍草': 'Yarrow|Pom',
-  '西班牙牛至': 'Oregano',
+  '芳香调理': 'AromaTouch', '保卫复方': 'On Guard',
+  '乐活复方': 'Balance', '舒缓复方': 'Past Tense',
+  '净化复方': 'Purify', '呼吸复方': 'Breathe',
+  '舒压复方': 'Adaptiv', '多特瑞': 'doTERRA',
 }
 
 export function oilEn(name) {
-  if (OIL_EN[name]) return OIL_EN[name]
-  // Try without common suffixes
-  const base = name.replace(/复方$|呵护$/, '')
-  if (base !== name && OIL_EN[base]) return OIL_EN[base]
-  // Try adding suffixes
-  if (OIL_EN[name + '复方']) return OIL_EN[name + '复方']
-  return ''
+  return OIL_EN[name] || ''
 }
 
 export function recipeNameEn(name) {

frontend/src/composables/usePinyinMatch.js

@@ -1,87 +0,0 @@
-/**
- * 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/useSaveImage.js

@@ -1,38 +0,0 @@
-/**
- * Save image — on mobile use navigator.share (same as recipe card),
- * on desktop trigger download.
- */
-
-const isMobile = () => /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
-
-/**
- * Save from a data URL.
- * Mobile: navigator.share({files}) → system share sheet (save to photos / AirDrop etc)
- * Desktop: download link.
- */
-export async function saveImageFromUrl(dataUrl, filename) {
-  // Try navigator.share with files (works on iOS Safari, Chrome mobile)
-  if (navigator.share && navigator.canShare) {
-    try {
-      const res = await fetch(dataUrl)
-      const blob = await res.blob()
-      const file = new File([blob], filename + '.png', { type: 'image/png' })
-      if (navigator.canShare({ files: [file] })) {
-        await navigator.share({ files: [file] })
-        return 'shared'
-      }
-    } catch (e) {
-      // User cancelled share or share failed, fall through to download
-      if (e.name === 'AbortError') return 'cancelled'
-    }
-  }
-
-  // Fallback: direct download
-  const a = document.createElement('a')
-  a.href = dataUrl
-  a.download = filename + '.png'
-  document.body.appendChild(a)
-  a.click()
-  setTimeout(() => a.remove(), 100)
-  return 'downloaded'
-}

frontend/src/composables/useSmartPaste.js

@@ -260,99 +260,3 @@ 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/router/index.js

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

frontend/src/stores/auth.js

@@ -28,6 +28,16 @@ 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()
     }
@@ -73,8 +83,10 @@ export const useAuthStore = defineStore('auth', () => {
     user.value = { ...DEFAULT_USER }
   }
 
-  function canEditRecipe() {
-    return canEdit.value
+  function canEditRecipe(recipe) {
+    if (isAdmin.value || user.value.role === 'senior_editor') return true
+    if (recipe._owner_id === user.value.id) return true
+    return false
   }
 
   return {

frontend/src/stores/oils.js

@@ -68,21 +68,19 @@ export const useOilsStore = defineStore('oils', () => {
         bottlePrice: oil.bottle_price,
         dropCount: oil.drop_count,
         retailPrice: oil.retail_price ?? null,
-        isActive: oil.is_active !== 0,
-        enName: oil.en_name ?? null,
+        isActive: oil.is_active ?? true,
       }
     }
     oils.value = newOils
     oilsMeta.value = newMeta
   }
 
-  async function saveOil(name, bottlePrice, dropCount, retailPrice, enName = null) {
+  async function saveOil(name, bottlePrice, dropCount, retailPrice) {
     await api.post('/api/oils', {
       name,
       bottle_price: bottlePrice,
       drop_count: dropCount,
       retail_price: retailPrice,
-      en_name: enName,
     })
     await loadOils()
   }

frontend/src/stores/recipes.js

@@ -2,8 +2,6 @@ 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([])
@@ -19,6 +17,7 @@ export const useRecipesStore = defineStore('recipes', () => {
       _version: r._version ?? r.version ?? 1,
       name: r.name,
       en_name: r.en_name ?? '',
+      en_oils: r.en_oils ?? '{}',
       note: r.note ?? '',
       tags: r.tags ?? [],
       ingredients: (r.ingredients ?? []).map((ing) => ({
@@ -55,12 +54,7 @@ export const useRecipesStore = defineStore('recipes', () => {
       return data
     } else {
       const data = await api.post('/api/recipes', recipe)
-      // Refresh list; if refresh fails, still return success (recipe was saved)
-      try {
-        await loadRecipes()
-      } catch (e) {
-        console.warn('[saveRecipe] loadRecipes failed after save:', e)
-      }
+      await loadRecipes()
       return data
     }
   }

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 > 1">
+    <div class="filter-row" v-if="uniqueUsers.length > 0">
       <span class="filter-label">用户:</span>
       <button
         v-for="u in uniqueUsers"
@@ -26,30 +26,26 @@
       >{{ 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" class="log-item">
+      <div v-for="log in filteredLogs" :key="log._id || log.id" class="log-item">
         <div class="log-header">
-          <span class="log-action" :class="actionColorClass(log.action)">{{ actionLabel(log.action) }}</span>
+          <span class="log-action" :class="actionClass(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_name" class="log-target-name">{{ log.target_name }}</span>
-          <span v-if="parsedDetail(log)" class="log-extra">{{ parsedDetail(log) }}</span>
+          <span v-if="log.target_type" class="log-target">{{ log.target_type }}: </span>
+          <span class="log-desc">{{ log.description || log.detail || formatDetail(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>
@@ -65,52 +61,29 @@
 
 <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 = 100
+const pageSize = 50
 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: '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: '用户' },
+  { value: 'create', label: '创建' },
+  { value: 'update', label: '更新' },
+  { value: 'delete', label: '删除' },
+  { value: 'login', label: '登录' },
+  { value: 'approve', label: '审核' },
+  { value: 'export', label: '导出' },
 ]
 
 const uniqueUsers = computed(() => {
@@ -125,56 +98,59 @@ const uniqueUsers = computed(() => {
 const filteredLogs = computed(() => {
   let result = logs.value
   if (selectedAction.value) {
-    result = result.filter(l => l.action.includes(selectedAction.value))
+    result = result.filter(l => l.action === selectedAction.value)
   }
   if (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)
+    result = result.filter(l =>
+      (l.user_name || l.username) === selectedUser.value
+    )
   }
   return result
 })
 
 function actionLabel(action) {
-  return ACTION_MAP[action] || action
+  const map = {
+    create: '创建',
+    update: '更新',
+    delete: '删除',
+    login: '登录',
+    approve: '审核',
+    reject: '拒绝',
+    export: '导出',
+    undo: '撤销',
+  }
+  return map[action] || action
 }
 
-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 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 formatTime(t) {
   if (!t) return ''
-  return new Date(t + 'Z').toLocaleString('zh-CN', {
-    month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit',
+  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',
   })
 }
 
+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 {
@@ -182,7 +158,9 @@ 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 {
@@ -196,52 +174,207 @@ function loadMore() {
   fetchLogs()
 }
 
-onMounted(() => 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()
+})
 </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: 8px; flex-wrap: wrap;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-bottom: 10px;
+  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: 4px 12px; border-radius: 16px; border: 1.5px solid #e5e4e7;
-  background: #fff; font-size: 12px; cursor: pointer; font-family: inherit; color: #6b6375;
+  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;
 }
-.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: 10px 14px; background: #fff; border: 1.5px solid #e5e4e7; border-radius: 10px;
+  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;
 }
-.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; white-space: nowrap;
+  padding: 2px 10px;
+  border-radius: 10px;
+  font-size: 11px;
+  font-weight: 600;
+  background: #f0eeeb;
+  color: #6b6375;
 }
-.color-create { background: #e8f5e9; color: #2e7d5a; }
-.color-update { background: #e3f2fd; color: #1565c0; }
-.color-delete { background: #ffebee; color: #c62828; }
-.color-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; 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; }
+.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;
+}
 
-.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;
+  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;
 }
-.btn-outline:hover { background: #f8f7f5; }
-.btn-outline:disabled { opacity: 0.5; cursor: default; }
-.empty-hint { text-align: center; color: #b0aab5; font-size: 13px; padding: 32px 0; }
 </style>

frontend/src/views/MyDiary.vue

@@ -2,8 +2,8 @@
   <div class="my-diary">
     <!-- Sub Tabs -->
     <div class="sub-tabs">
-      <button class="sub-tab" :class="{ active: activeTab === 'brand' }" @click="activeTab = 'brand'">🏷 我的品牌</button>
-      <button class="sub-tab" :class="{ active: activeTab === 'account' }" @click="activeTab = 'account'">👤 我的账户</button>
+      <button class="sub-tab" :class="{ active: activeTab === 'brand' }" @click="activeTab = 'brand'">🏷️ Brand</button>
+      <button class="sub-tab" :class="{ active: activeTab === 'account' }" @click="activeTab = 'account'">👤 Account</button>
     </div>
 
     <!-- Diary Tab -->
@@ -113,95 +113,47 @@
         <button class="btn-return" @click="goBackToRecipe">← 返回配方卡片</button>
       </div>
       <div class="section-card">
-        <p style="font-size:13px;color:var(--text-light);margin-bottom:16px">分享配方卡片时，二维码、背景图、Logo 会自动展示在卡片上</p>
+        <h4>🏷️ 品牌设置</h4>
 
-        <!-- Three upload areas side by side -->
-        <div style="display:flex;gap:20px;flex-wrap:wrap;margin-bottom:16px">
-          <!-- QR Code -->
-          <div>
-            <label class="form-label">📱 二维码</label>
-            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">卡片右上角展示</p>
-            <div class="upload-box" @click="triggerUpload('qr')">
-              <img v-if="brandQrImage" :src="brandQrImage" class="upload-box-img" />
-              <span v-else class="upload-box-hint">点击上传</span>
-            </div>
-            <input ref="qrInput" type="file" accept="image/*" style="display:none" @change="handleUpload('qr', $event)" />
-            <button v-if="brandQrImage" class="btn-clear" @click="clearBrandImage('qr')">清除</button>
-          </div>
-
-          <!-- Background -->
-          <div>
-            <label class="form-label">🖼 背景图</label>
-            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">铺满整张卡片，半透明</p>
-            <div class="upload-box" @click="triggerUpload('bg')">
-              <img v-if="brandBg" :src="brandBg" class="upload-box-img" />
-              <span v-else class="upload-box-hint">点击上传</span>
-            </div>
-            <input ref="bgInput" type="file" accept="image/*" style="display:none" @change="handleUpload('bg', $event)" />
-            <button v-if="brandBg" class="btn-clear" @click="clearBrandImage('bg')">清除</button>
-          </div>
-
-          <!-- Logo -->
-          <div>
-            <label class="form-label">🏷 Logo</label>
-            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">卡片左下角水印</p>
-            <div class="upload-box" @click="triggerUpload('logo')">
-              <img v-if="brandLogo" :src="brandLogo" class="upload-box-img" />
-              <span v-else class="upload-box-hint">点击上传</span>
-            </div>
-            <input ref="logoInput" type="file" accept="image/*" style="display:none" @change="handleUpload('logo', $event)" />
-            <button v-if="brandLogo" class="btn-clear" @click="clearBrandImage('logo')">清除</button>
-          </div>
-        </div>
-
-        <!-- Brand name -->
         <div class="form-group">
-          <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>
-            <button class="btn-align" :class="{ active: brandAlign === 'center' }" @click="brandAlign='center'; saveBrandSettings()">居中</button>
-            <button class="btn-align" :class="{ active: brandAlign === 'right' }" @click="brandAlign='right'; saveBrandSettings()">靠右</button>
+          <label>品牌名称</label>
+          <input v-model="brandName" class="form-input" placeholder="您的品牌名称" @blur="saveBrandSettings" />
+        </div>
+
+        <div class="form-group">
+          <label>二维码链接</label>
+          <input v-model="brandQrUrl" class="form-input" placeholder="https://..." @blur="saveBrandSettings" />
+          <div v-if="brandQrUrl" class="qr-preview">
+            <img :src="'https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=' + encodeURIComponent(brandQrUrl)" alt="QR" class="qr-img" />
           </div>
         </div>
 
-        <!-- Card Preview -->
-        <div style="margin-bottom:16px">
-          <label class="form-label">📋 配方卡片预览</label>
-          <div class="card-preview-mini">
-            <!-- Background overlay -->
-            <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;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>
-            <!-- Content -->
-            <div style="position:relative;z-index:1">
-              <div style="font-size:7px;letter-spacing:1.5px;color:var(--sage);margin-bottom:3px">doTERRA · 来自大地的礼物</div>
-              <div style="font-size:13px;font-weight:700;color:var(--text-dark);margin-bottom:3px;line-height:1.3">配方名称</div>
-              <div style="width:30px;height:1px;background:linear-gradient(90deg,var(--sage),var(--gold));margin:6px 0"></div>
-              <div style="font-size:9px;color:var(--text-light);margin-bottom:6px">薰衣草 · 乳香 · 茶树</div>
-              <!-- Total cost bar -->
-              <div style="background:linear-gradient(135deg,var(--sage),#5a7d5e);border-radius:6px;padding:6px 10px;display:flex;justify-content:space-between;align-items:center">
-                <span style="color:rgba(255,255,255,0.85);font-size:8px;letter-spacing:0.5px">配方总成本</span>
-                <span style="color:white;font-size:12px;font-weight:700">¥12.50</span>
-              </div>
-              <!-- Logo left + Date right -->
-              <div style="display:flex;justify-content:space-between;align-items:flex-end;margin-top:8px">
-                <img v-if="brandLogo" :src="brandLogo" style="height:18px;object-fit:contain" />
-                <span v-else></span>
-                <span style="font-size:7px;color:var(--text-light);letter-spacing:0.5px">制作日期：{{ new Date().toLocaleDateString('zh-CN') }}</span>
-              </div>
-            </div>
+        <div class="form-group">
+          <label>我的二维码图片</label>
+          <div class="upload-area" @click="triggerUpload('qr')">
+            <img v-if="brandQrImage" :src="brandQrImage" class="upload-preview qr-upload-preview" />
+            <span v-else class="upload-hint">📲 点击上传二维码图片</span>
           </div>
+          <input ref="qrInput" type="file" accept="image/*" style="display:none" @change="handleUpload('qr', $event)" />
+          <div class="field-hint">上传后将显示在配方卡片右下角</div>
         </div>
 
-        <div style="display:flex;gap:8px;align-items:center">
-          <span class="auto-save-hint">所有修改自动保存</span>
-          <button v-if="returnRecipeId" class="btn btn-outline" @click="goBackToRecipe">← 返回配方卡片</button>
+        <div class="form-group">
+          <label>品牌Logo</label>
+          <div class="upload-area" @click="triggerUpload('logo')">
+            <img v-if="brandLogo" :src="brandLogo" class="upload-preview" />
+            <span v-else class="upload-hint">点击上传Logo</span>
+          </div>
+          <input ref="logoInput" type="file" accept="image/*" style="display:none" @change="handleUpload('logo', $event)" />
+        </div>
+
+        <div class="form-group">
+          <label>卡片背景</label>
+          <div class="upload-area" @click="triggerUpload('bg')">
+            <img v-if="brandBg" :src="brandBg" class="upload-preview wide" />
+            <span v-else class="upload-hint">点击上传背景图</span>
+          </div>
+          <input ref="bgInput" type="file" accept="image/*" style="display:none" @change="handleUpload('bg', $event)" />
         </div>
       </div>
     </div>
@@ -242,67 +194,26 @@
       </div>
 
       <!-- Business Verification -->
-      <div ref="bizCertRef" class="section-card biz-card">
-        <h4>🏢 商业用户认证</h4>
-
-        <!-- 已认证 -->
-        <div v-if="auth.isBusiness" class="biz-status-bar biz-approved">
-          <span>✅ 已认证商业用户</span>
+      <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>
-
-        <!-- 审核中 -->
-        <div v-else-if="bizApp.status === 'pending'" class="biz-status-bar biz-pending">
-          <span>⏳ 认证申请审核中</span>
-          <div class="biz-status-detail">商户名：{{ bizApp.business_name }} · 提交时间：{{ formatDate(bizApp.created_at) }}</div>
-        </div>
-
-        <!-- 被拒绝 -->
-        <template v-else-if="bizApp.status === 'rejected'">
-          <div class="biz-status-bar biz-rejected">
-            <span>❌ 认证申请未通过</span>
-            <div v-if="bizApp.reject_reason" class="biz-status-detail">原因：{{ bizApp.reject_reason }}</div>
-          </div>
-          <p class="hint-text">你可以修改信息后重新申请。</p>
-        </template>
-
-        <!-- 申请表单（首次或被拒后重新申请） -->
-        <template v-if="!auth.isBusiness && bizApp.status !== 'pending'">
-          <div class="biz-form">
-            <div class="form-group">
-              <label class="form-label">认证类型 *</label>
-              <select v-model="bizType" class="form-select">
-                <option value="">请选择</option>
-                <option value="individual">个体经营户</option>
-                <option value="company">公司</option>
-                <option value="studio">工作室/美容院</option>
-                <option value="distributor">代理商</option>
-              </select>
-            </div>
-            <div class="form-group">
-              <label class="form-label">企业/商户名称 *</label>
-              <input v-model="businessName" class="form-input" placeholder="你的企业或品牌名称" />
-            </div>
-            <div class="form-group">
-              <label class="form-label">联系电话 *</label>
-              <input v-model="bizPhone" class="form-input" type="tel" placeholder="联系电话" />
-            </div>
-            <div class="form-group">
-              <label class="form-label">业务描述</label>
-              <textarea v-model="businessReason" class="form-textarea" rows="3" placeholder="描述你的业务范围和计划..."></textarea>
-            </div>
-            <div style="display:flex;gap:10px;margin-top:12px">
-              <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim() || !bizType">💾 提交申请</button>
-            </div>
-          </div>
-        </template>
+        <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, nextTick, onMounted, watch } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
+import { ref, onMounted, watch } from 'vue'
+import { useRouter } from 'vue-router'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useDiaryStore } from '../stores/diary'
@@ -316,10 +227,8 @@ const oils = useOilsStore()
 const diaryStore = useDiaryStore()
 const ui = useUiStore()
 const router = useRouter()
-const route = useRoute()
-const bizCertRef = ref(null)
 
-const activeTab = ref(route.query.tab || 'brand')
+const activeTab = ref('brand')
 const pasteText = ref('')
 const selectedDiaryId = ref(null)
 const returnRecipeId = ref(null)
@@ -332,7 +241,6 @@ const brandQrUrl = ref('')
 const brandQrImage = ref('')
 const brandLogo = ref('')
 const brandBg = ref('')
-const brandAlign = ref('center')
 const logoInput = ref(null)
 const bgInput = ref(null)
 const qrInput = ref(null)
@@ -342,27 +250,13 @@ 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 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()
-  } catch {}
-  // 从商业核算跳转过来，滚到商业认证区域
-  if (route.query.section === 'biz-cert') {
-    await nextTick()
-    bizCertRef.value?.scrollIntoView({ behavior: 'smooth', block: 'center' })
-  }
 })
 
 function goBackToRecipe() {
@@ -468,7 +362,6 @@ async function loadBrandSettings() {
       brandQrImage.value = data.qr_code || ''
       brandLogo.value = data.brand_logo || ''
       brandBg.value = data.brand_bg || ''
-      brandAlign.value = data.brand_align || 'center'
     }
   } catch {
     // no brand settings yet
@@ -477,16 +370,15 @@ async function loadBrandSettings() {
 
 async function saveBrandSettings() {
   try {
-    const res = await api('/api/brand', {
+    await api('/api/brand', {
       method: 'PUT',
       body: JSON.stringify({
         brand_name: brandName.value,
-        brand_align: brandAlign.value,
+        qr_url: brandQrUrl.value,
       }),
     })
-    if (res.ok) ui.showToast('已保存')
   } catch {
-    ui.showToast('保存失败')
+    // silent
   }
 }
 
@@ -505,125 +397,14 @@ function readFileAsBase64(file) {
   })
 }
 
-// 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
-      // Shrink progressively until it fits
-      let scale = 1
-      if (w > maxDim || h > maxDim) {
-        scale = Math.min(maxDim / w, maxDim / h)
-      }
-      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) { resolve(result); return }
-        scale *= 0.7 // shrink more
-      }
-      // Last resort
-      resolve(canvas.toDataURL('image/jpeg', 0.3))
-    }
-    img.onerror = () => resolve(base64)
-    img.src = base64
-  })
-}
-
-// Crop image to square from center
-function cropToSquare(base64) {
-  return new Promise((resolve) => {
-    const img = new Image()
-    img.onload = () => {
-      const size = Math.min(img.width, img.height)
-      const x = (img.width - size) / 2
-      const y = (img.height - size) / 2
-      const canvas = document.createElement('canvas')
-      canvas.width = size
-      canvas.height = size
-      canvas.getContext('2d').drawImage(img, x, y, size, size, 0, 0, size, size)
-      resolve(canvas.toDataURL('image/png'))
-    }
-    img.onerror = () => resolve(base64)
-    img.src = base64
-  })
-}
-
-// Check if image is roughly square
-function checkSquare(base64) {
-  return new Promise((resolve) => {
-    const img = new Image()
-    img.onload = () => {
-      const ratio = img.width / img.height
-      resolve(ratio > 0.85 && ratio < 1.15) // within 15% of square
-    }
-    img.onerror = () => resolve(true)
-    img.src = base64
-  })
-}
-
 async function handleUpload(type, event) {
-  let file = event.target.files[0]
+  const 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
-    if (type === 'qr') {
-      const isSquare = await checkSquare(base64)
-      if (!isSquare) {
-        const { showConfirm: confirm } = await import('../composables/useDialog')
-        const ok = await confirm('图片非正方形，自动裁剪？')
-        if (ok) {
-          base64 = await cropToSquare(base64)
-        }
-      }
-    }
-
-    const maxSize = type === 'bg' ? 600000 : 300000
-    const maxDim = type === 'bg' ? 1000 : 600
-    base64 = await compressImage(base64, maxSize, maxDim)
+    const base64 = await readFileAsBase64(file)
     const fieldMap = { logo: 'brand_logo', bg: 'brand_bg', qr: 'qr_code' }
     const field = fieldMap[type]
     if (!field) return
-    ui.showToast('正在上传...')
     const res = await api('/api/brand', {
       method: 'PUT',
       body: JSON.stringify({ [field]: base64 }),
@@ -632,32 +413,10 @@ async function handleUpload(type, event) {
       if (type === 'logo') brandLogo.value = base64
       else if (type === 'bg') brandBg.value = base64
       else if (type === 'qr') brandQrImage.value = base64
-      ui.showToast('上传成功 ✓')
-    } else {
-      const err = await res.json().catch(() => ({}))
-      ui.showToast('上传失败: ' + (err.detail || res.status))
+      ui.showToast('上传成功')
     }
-  } catch (e) {
-    ui.showToast('上传出错: ' + (e.message || '网络错误'))
-  }
-  // Reset input so same file can be re-selected
-  event.target.value = ''
-}
-
-async function clearBrandImage(type) {
-  const fieldMap = { logo: 'brand_logo', bg: 'brand_bg', qr: 'qr_code' }
-  const field = fieldMap[type]
-  try {
-    await api('/api/brand', {
-      method: 'PUT',
-      body: JSON.stringify({ [field]: null }),
-    })
-    if (type === 'logo') brandLogo.value = ''
-    else if (type === 'bg') brandBg.value = ''
-    else if (type === 'qr') brandQrImage.value = ''
-    ui.showToast('已清除')
   } catch {
-    ui.showToast('清除失败')
+    ui.showToast('上传失败')
   }
 }
 
@@ -703,36 +462,13 @@ async function changePassword() {
 }
 
 async function applyBusiness() {
-  if (!businessName.value.trim() || !bizType.value) {
-    ui.showToast('请填写必填项')
-    return
-  }
-  const typeLabels = { individual: '个体经营户', company: '公司', studio: '工作室/美容院', distributor: '代理商' }
-  const info = [
-    `认证类型：${typeLabels[bizType.value] || bizType.value}`,
-    bizPhone.value ? `联系电话：${bizPhone.value}` : '',
-    businessReason.value ? `业务描述：${businessReason.value}` : '',
-  ].filter(Boolean).join('\n')
   try {
-    const res = await api('/api/business-apply', {
+    await api('/api/business-apply', {
       method: 'POST',
-      body: JSON.stringify({
-        business_name: businessName.value.trim(),
-        document: info,
-      }),
+      body: JSON.stringify({ reason: businessReason.value }),
     })
-    if (res.ok) {
-      businessName.value = ''
-      businessReason.value = ''
-      bizType.value = ''
-      bizPhone.value = ''
-      ui.showToast('申请已提交，请等待管理员审核')
-      const bizRes = await api('/api/my-business-application')
-      if (bizRes.ok) bizApp.value = await bizRes.json()
-    } else {
-      const err = await res.json().catch(() => ({}))
-      ui.showToast(err.detail || '提交失败')
-    }
+    businessReason.value = ''
+    ui.showToast('申请已提交，请等待审核')
   } catch {
     ui.showToast('提交失败')
   }
@@ -1117,69 +853,12 @@ async function applyBusiness() {
   color: #b0aab5;
 }
 
-/* Upload box (matching initial commit style) */
-.upload-box {
-  width: 100px;
-  height: 100px;
-  border: 2px dashed var(--border, #e0d4c0);
-  border-radius: 12px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  overflow: hidden;
-  background: white;
-  transition: border-color 0.15s;
-}
-.upload-box:hover { border-color: var(--sage, #7a9e7e); }
-.upload-box-img { width: 100%; height: 100%; object-fit: contain; }
-.upload-box-hint { font-size: 12px; color: var(--text-light, #9a8570); }
-.btn-clear {
-  margin-top: 6px;
-  font-size: 11px;
-  background: none;
-  border: 1px solid var(--border);
-  border-radius: 6px;
-  padding: 2px 8px;
-  cursor: pointer;
-  color: var(--text-light);
-}
-.btn-clear:hover { border-color: #c0392b; color: #c0392b; }
-.btn-align {
-  font-size: 11px;
-  padding: 3px 10px;
-  border: 1.5px solid var(--border);
-  border-radius: 6px;
-  background: white;
-  cursor: pointer;
-  color: var(--text-mid);
-}
-.btn-align.active {
-  background: var(--sage-mist);
-  border-color: var(--sage);
-  color: var(--sage-dark);
-}
-
-/* Card preview mini */
-.card-preview-mini {
-  position: relative;
-  width: 280px;
-  background: linear-gradient(145deg, #faf7f0, #f5ede0);
-  border-radius: 14px;
-  border: 1px solid #e0ccaa;
-  overflow: hidden;
-  font-family: 'Noto Serif SC', serif;
-  padding: 18px;
-}
-
 .hint-text {
   font-size: 13px;
   color: #6b6375;
   margin-bottom: 12px;
 }
 
-.auto-save-hint { font-size: 12px; color: #999; font-style: italic; }
-
 .verified-badge {
   padding: 12px;
   background: #e8f5e9;
@@ -1189,28 +868,6 @@ 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/Projects.vue

@@ -3,7 +3,7 @@
     <!-- Project List -->
     <div class="toolbar">
       <h3 class="page-title">💼 商业核算</h3>
-      <button v-if="auth.isBusiness" class="btn-primary" @click="createProject">+ 新建项目</button>
+      <button class="btn-primary" @click="createProject">+ 新建项目</button>
     </div>
 
     <div v-if="!selectedProject" class="project-list">
@@ -23,7 +23,7 @@
             成本 {{ oils.fmtPrice(oils.calcCost(p.ingredients)) }}
           </span>
         </div>
-        <div v-if="auth.isAdmin" class="proj-actions" @click.stop>
+        <div class="proj-actions" @click.stop>
           <button class="btn-icon-sm" @click="deleteProject(p)" title="删除">🗑️</button>
         </div>
       </div>
@@ -42,53 +42,26 @@
         <button class="btn-outline btn-sm" @click="importFromRecipe">📋 从配方导入</button>
       </div>
 
-      <!-- Ingredients Table -->
+      <!-- Ingredients Editor -->
       <div class="ingredients-section">
-        <div class="section-header-row">
-          <h4>🧴 配方成分</h4>
-          <div class="section-actions">
-            <button class="btn-outline btn-sm" @click="addIngredient">＋ 添加精油</button>
-          </div>
-        </div>
-        <table class="ingredients-table">
-          <thead>
-            <tr>
-              <th>精油</th>
-              <th>单次用量(滴)</th>
-              <th>单价/滴</th>
-              <th>小计</th>
-              <th></th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr v-for="(ing, i) in selectedProject.ingredients" :key="i">
-              <td>
-                <select v-model="ing.oil" class="form-select" @change="saveProject">
-                  <option value="">— 选择精油 —</option>
-                  <option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
-                </select>
-              </td>
-              <td>
-                <input v-model.number="ing.drops" type="number" min="0" step="0.5" class="drops-input" @change="saveProject" />
-              </td>
-              <td class="cell-ppd">{{ ing.oil ? oils.fmtPrice(oils.pricePerDrop(ing.oil)) : '—' }}</td>
-              <td class="cell-subtotal">{{ ing.oil && ing.drops ? oils.fmtPrice(oils.pricePerDrop(ing.oil) * ing.drops) : '—' }}</td>
-              <td><button class="remove-btn" @click="removeIngredient(i)">×</button></td>
-            </tr>
-          </tbody>
-        </table>
-        <div class="total-row">
-          <span class="total-label">配方总成本</span>
-          <span class="total-price">{{ oils.fmtPrice(materialCost) }}</span>
-        </div>
-
-        <!-- Pricing -->
-        <div class="pricing-inline">
-          <div class="price-field">
-            <label>定价 ¥</label>
-            <input v-model.number="selectedProject.selling_price" type="number" class="price-input" placeholder="/次" @change="saveProject" />
-          </div>
+        <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 -->
@@ -204,7 +177,6 @@
 
 <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'
@@ -216,14 +188,6 @@ 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)
@@ -273,10 +237,6 @@ async function createProject() {
 }
 
 function selectProject(p) {
-  if (!auth.isBusiness) {
-    showCertPrompt()
-    return
-  }
   selectedProject.value = {
     ...p,
     ingredients: (p.ingredients || []).map(i => ({ ...i })),
@@ -519,38 +479,12 @@ function formatDate(d) {
   color: #3e3a44;
 }
 
-.section-header-row {
-  display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px;
+.ing-row {
+  display: flex;
+  gap: 6px;
+  align-items: center;
+  margin-bottom: 6px;
 }
-.section-header-row h4 { margin: 0; }
-.section-actions { display: flex; gap: 6px; }
-
-.ingredients-table { width: 100%; border-collapse: collapse; margin-bottom: 12px; }
-.ingredients-table th {
-  text-align: center; padding: 10px 8px; font-size: 12px; font-weight: 600;
-  color: var(--text-light, #999); border-bottom: 2px solid #e5e4e7;
-}
-.ingredients-table td { padding: 10px 8px; border-bottom: 1px solid #f0f0f0; text-align: center; }
-.ingredients-table .form-select { width: 100%; padding: 6px 8px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; font-family: inherit; background: #fff; }
-.drops-input { width: 65px; padding: 6px 8px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; text-align: center; outline: none; font-family: inherit; }
-.drops-input:focus { border-color: #7ec6a4; }
-.cell-ppd { color: #999; font-size: 12px; }
-.cell-subtotal { color: #4a9d7e; font-weight: 600; }
-.remove-btn { border: none; background: none; color: #ccc; cursor: pointer; font-size: 18px; }
-.remove-btn:hover { color: #c0392b; }
-
-.total-row {
-  background: #e8f5e9; border-radius: 12px; padding: 14px 18px;
-  display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px;
-}
-.total-label { font-size: 14px; color: #3e3a44; font-weight: 500; }
-.total-price { font-size: 20px; font-weight: 700; color: #2e7d5a; }
-
-.pricing-inline { margin-top: 12px; }
-.price-field { display: flex; align-items: center; gap: 8px; }
-.price-field label { font-size: 13px; font-weight: 600; color: #3e3a44; white-space: nowrap; }
-.price-input { width: 100px; padding: 8px 10px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 14px; font-family: inherit; outline: none; }
-.price-input:focus { border-color: #7ec6a4; }
 
 .form-select {
   flex: 1;
@@ -573,6 +507,14 @@ function formatDate(d) {
   text-align: center;
 }
 
+.ing-cost {
+  font-size: 13px;
+  color: #4a9d7e;
+  font-weight: 500;
+  min-width: 60px;
+  text-align: right;
+}
+
 .price-row {
   display: flex;
   justify-content: space-between;

frontend/src/views/RecipeSearch.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="recipe-search">
     <!-- Category Carousel (full-width image slides) -->
-    <div class="cat-wrap" v-if="categories.length && !selectedCategory" data-no-tab-swipe @touchstart="onCarouselTouchStart" @touchend="onCarouselTouchEnd">
+    <div class="cat-wrap" v-if="categories.length && !selectedCategory">
       <div class="cat-track" :style="{ transform: `translateX(-${catIdx * 100}%)` }">
         <div
           v-for="cat in categories"
@@ -49,96 +49,56 @@
 
     <!-- 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>📖 我的配方</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="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>
+        <RecipeCard
+          v-for="(r, i) in myRecipesPreview"
+          :key="r._id"
+          :recipe="r"
+          :index="findGlobalIndex(r)"
+          @click="openDetail(findGlobalIndex(r))"
+          @toggle-fav="handleToggleFav(r)"
+        />
+        <div v-if="myRecipesPreview.length === 0" class="empty-hint">暂无个人配方</div>
       </div>
-      </template>
 
-      <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 class="section-header" @click="showFavorites = !showFavorites">
+        <span>⭐ 收藏配方</span>
+        <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
+      </div>
+      <div v-if="showFavorites" class="recipe-grid">
+        <RecipeCard
+          v-for="(r, i) 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>
     </div>
 
-    <!-- Search Results (public recipes) -->
-    <div v-if="searchQuery" class="search-results-section">
-      <!-- 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>
+    <!-- Fuzzy Search Results -->
+    <div v-if="searchQuery && fuzzyResults.length" 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>
     </div>
 
     <!-- Public Recipe Grid -->
-    <div v-if="!searchQuery">
+    <div v-if="!searchQuery || fuzzyResults.length === 0">
       <div class="section-label">🌿 公共配方库 ({{ filteredRecipes.length }})</div>
       <div class="recipe-grid">
         <RecipeCard
@@ -155,11 +115,9 @@
 
     <!-- Recipe Detail Overlay -->
     <RecipeDetailOverlay
-      v-if="selectedRecipeIndex !== null || selectedDiaryRecipe !== null"
+      v-if="selectedRecipeIndex !== null"
       :recipeIndex="selectedRecipeIndex"
-      :recipeData="selectedDiaryRecipe"
-      :isDiary="selectedDiaryRecipe !== null"
-      @close="selectedRecipeIndex = null; selectedDiaryRecipe = null"
+      @close="selectedRecipeIndex = null"
     />
   </div>
 </template>
@@ -169,8 +127,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, EDITOR_ONLY_TAGS } from '../stores/recipes'
-import { useDiaryStore } from '../stores/diary'
+import { useRecipesStore } from '../stores/recipes'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
 import RecipeCard from '../components/RecipeCard.vue'
@@ -179,7 +136,6 @@ import RecipeDetailOverlay from '../components/RecipeDetailOverlay.vue'
 const auth = useAuthStore()
 const oils = useOilsStore()
 const recipeStore = useRecipesStore()
-const diaryStore = useDiaryStore()
 const ui = useUiStore()
 const route = useRoute()
 const router = useRouter()
@@ -188,11 +144,9 @@ const searchQuery = ref('')
 const selectedCategory = ref(null)
 const categories = ref([])
 const selectedRecipeIndex = ref(null)
-const selectedDiaryRecipe = ref(null)
-const showMyRecipes = ref(false)
-const showFavorites = ref(false)
+const showMyRecipes = ref(true)
+const showFavorites = ref(true)
 const catIdx = ref(0)
-const sharedCount = ref({ adopted: 0, total: 0 })
 
 onMounted(async () => {
   try {
@@ -200,18 +154,8 @@ onMounted(async () => {
     if (res.ok) {
       categories.value = await res.json()
     }
-  } catch {}
-
-  // 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 {}
+  } catch {
+    // category modules are optional
   }
 
   // Return to a recipe card after QR upload redirect
@@ -219,7 +163,7 @@ onMounted(async () => {
   if (openRecipeId) {
     router.replace({ path: '/', query: {} })
     const tryOpen = () => {
-      const idx = recipeStore.recipes.findIndex(r => String(r._id) === String(openRecipeId))
+      const idx = recipeStore.recipes.findIndex(r => r._id === openRecipeId)
       if (idx >= 0) {
         openDetail(idx)
         return true
@@ -245,141 +189,37 @@ function slideCat(dir) {
   catIdx.value = (catIdx.value + dir + len) % len
 }
 
-// Public recipes (all recipes in the public library)
 const filteredRecipes = computed(() => {
   let list = recipeStore.recipes
   if (selectedCategory.value) {
     list = list.filter(r => r.tags && r.tags.includes(selectedCategory.value))
   }
-  return list.slice().sort((a, b) => a.name.localeCompare(b.name, 'zh'))
+  return list
 })
 
-// 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(() => {
+const fuzzyResults = 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 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'))
+    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
+  })
 })
 
-// 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(() => {
+const myRecipesPreview = computed(() => {
   if (!auth.isLoggedIn) return []
-  let list = diaryStore.userDiary
-  if (searchQuery.value.trim()) {
-    const q = searchQuery.value.trim().toLowerCase()
-    list = list.filter(d => {
-      return d.name.toLowerCase().includes(q) ||
-        (d.ingredients || []).some(ing => ing.oil?.toLowerCase().includes(q))
-    })
-  }
-  return list
+  return recipeStore.recipes
+    .filter(r => r._owner_id === auth.user.id)
+    .slice(0, 6)
 })
 
 const favoritesPreview = computed(() => {
   if (!auth.isLoggedIn) return []
-  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)
+  return recipeStore.recipes
+    .filter(r => recipeStore.isFavorite(r))
+    .slice(0, 6)
 })
 
 function findGlobalIndex(recipe) {
@@ -392,26 +232,6 @@ function openDetail(index) {
   }
 }
 
-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 || [],
-  }
-}
-
-function openDiaryDetail(diary) {
-  selectedDiaryRecipe.value = diaryAsRecipe(diary)
-}
-
 async function handleToggleFav(recipe) {
   if (!auth.isLoggedIn) {
     ui.openLogin()
@@ -420,51 +240,13 @@ async function handleToggleFav(recipe) {
   await recipeStore.toggleFavorite(recipe._id)
 }
 
-async function shareDiaryToPublic(diary) {
-  const { showConfirm } = await import('../composables/useDialog')
-  const ok = await showConfirm(`将「${diary.name}」共享到公共配方库？\n共享后所有用户都能看到。`)
-  if (!ok) return
-  try {
-    await api('/api/recipes', {
-      method: 'POST',
-      body: JSON.stringify({
-        name: diary.name,
-        note: diary.note || '',
-        ingredients: (diary.ingredients || []).map(i => ({ oil_name: i.oil, drops: i.drops })),
-        tags: diary.tags || [],
-      }),
-    })
-    if (auth.isAdmin) {
-      ui.showToast('已共享到公共配方库')
-    } else {
-      ui.showToast('已提交，等待管理员审核')
-    }
-    await recipeStore.loadRecipes()
-  } catch {
-    ui.showToast('共享失败')
-  }
-}
-
 function onSearch() {
-  reportedMissing.value = false
+  // fuzzyResults computed handles the filtering reactively
 }
 
 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>
 
@@ -665,62 +447,11 @@ function onCarouselTouchEnd(e) {
   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: 10px 12px;
+  padding: 8px 4px;
   margin-bottom: 8px;
 }
 
@@ -743,89 +474,6 @@ function onCarouselTouchEnd(e) {
   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;
-  padding: 16px;
-  cursor: pointer;
-  box-shadow: 0 2px 10px rgba(0,0,0,0.06);
-  border: 2px solid transparent;
-  border-left: 3px solid var(--sage, #7a9e7e);
-  transition: all 0.2s;
-}
-.diary-card:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 4px 16px rgba(0,0,0,0.1);
-}
-.diary-card .card-name {
-  font-family: 'Noto Serif SC', serif;
-  font-size: 15px;
-  font-weight: 600;
-  color: #2c2416;
-  margin-bottom: 6px;
-}
-.diary-card .card-oils {
-  font-size: 12px;
-  color: #9a8570;
-  line-height: 1.6;
-}
-.diary-card .card-bottom {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 8px;
-}
-.diary-card .card-price {
-  font-size: 13px;
-  font-weight: 600;
-  color: var(--sage-dark, #5a7d5e);
-}
-
-.share-btn {
-  background: none;
-  border: none;
-  cursor: pointer;
-  font-size: 16px;
-  padding: 2px 4px;
-  border-radius: 6px;
-  opacity: 0.5;
-  transition: opacity 0.2s;
-}
-.share-btn:hover { opacity: 1; }
-
 @media (max-width: 600px) {
   .recipe-grid {
     grid-template-columns: 1fr;

frontend/src/views/UserManagement.vue

@@ -22,39 +22,43 @@
     </div>
 
     <!-- Business Application Approval -->
-    <div v-if="groupedBizApps.length > 0" class="review-section">
+    <div v-if="businessApps.length > 0" class="review-section">
       <h4 class="section-title">💼 商业认证申请</h4>
       <div class="review-list">
-        <div v-for="group in groupedBizApps" :key="group.user_id" class="biz-app-group">
-          <div class="review-item">
-            <div class="review-info">
-              <span class="review-name">{{ group.latest.display_name || group.latest.username }}</span>
-              <span class="review-reason">商户名：{{ group.latest.business_name }}</span>
-              <span class="biz-status-tag" :class="'biz-' + group.latest.status">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.latest.status] }}</span>
-            </div>
-            <div class="review-actions">
-              <template v-if="group.latest.status === 'pending'">
-                <button class="btn-sm btn-approve" @click="approveBusiness(group.latest)">通过</button>
-                <button class="btn-sm btn-reject" @click="rejectBusiness(group.latest)">拒绝</button>
-              </template>
-              <button v-if="group.history.length > 1" class="btn-sm btn-outline" @click="group.expanded = !group.expanded">
-                {{ group.expanded ? '收起' : `历史 (${group.history.length})` }}
-              </button>
-            </div>
+        <div 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>
-          <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 class="review-actions">
+            <button class="btn-sm btn-approve" @click="approveBusiness(app)">通过</button>
+            <button class="btn-sm btn-reject" @click="rejectBusiness(app)">拒绝</button>
           </div>
         </div>
       </div>
     </div>
 
-    <!-- User self-registers, admin assigns roles below -->
+    <!-- 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>
 
     <!-- Search & Filter -->
     <div class="filter-toolbar">
@@ -96,14 +100,13 @@
             :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 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-outline" @click="copyUserLink(u)" title="复制登录链接">🔗</button>
           <button class="btn-sm btn-delete" @click="removeUser(u)" title="删除用户">🗑️</button>
         </div>
       </div>
@@ -115,11 +118,11 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted } from 'vue'
+import { ref, computed, reactive, onMounted } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
-import { showConfirm, showPrompt } from '../composables/useDialog'
+import { showConfirm } from '../composables/useDialog'
 
 const auth = useAuthStore()
 const ui = useUiStore()
@@ -129,27 +132,15 @@ const searchQuery = ref('')
 const filterRole = ref('')
 const translations = ref([])
 const businessApps = ref([])
-import { reactive } from 'vue'
+const createdLink = ref('')
 
-const groupedBizApps = computed(() => {
-  const map = {}
-  for (const app of businessApps.value) {
-    const uid = app.user_id
-    if (!map[uid]) map[uid] = { user_id: uid, history: [], latest: null, expanded: false }
-    map[uid].history.push(app)
-  }
-  return Object.values(map).map(g => {
-    g.history.sort((a, b) => b.id - a.id)
-    g.latest = g.history[0]
-    return reactive(g)
-  }).filter(g => g.latest)
+const newUser = reactive({
+  username: '',
+  display_name: '',
+  password: '',
+  role: 'viewer',
 })
 
-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: '高级编辑' },
@@ -177,6 +168,10 @@ function roleLabel(role) {
   return map[role] || role
 }
 
+function formatDate(d) {
+  if (!d) return '--'
+  return new Date(d).toLocaleDateString('zh-CN')
+}
 
 async function loadUsers() {
   try {
@@ -211,10 +206,43 @@ 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}`, {
+    const res = await api(`/api/users/${id}/role`, {
       method: 'PUT',
       body: JSON.stringify({ role: newRole }),
     })
@@ -242,33 +270,27 @@ async function removeUser(user) {
   }
 }
 
-async function grantBusiness(user) {
-  const ok = await showConfirm(`直接为「${user.display_name || user.username}」开通商业认证？`)
-  if (!ok) return
-  const id = user._id || user.id
+async function copyUserLink(user) {
   try {
-    const res = await api(`/api/business-grant/${id}`, { method: 'POST' })
+    const id = user._id || user.id
+    const res = await api(`/api/users/${id}/token`)
     if (res.ok) {
-      user.business_verified = 1
-      ui.showToast('已开通商业认证')
+      const data = await res.json()
+      const link = `${window.location.origin}/?token=${data.token}`
+      await navigator.clipboard.writeText(link)
+      ui.showToast('链接已复制')
     }
   } catch {
-    ui.showToast('操作失败')
+    ui.showToast('获取链接失败')
   }
 }
 
-async function revokeBusiness(user) {
-  const ok = await showConfirm(`撤销「${user.display_name || user.username}」的商业认证？`)
-  if (!ok) return
-  const id = user._id || user.id
+async function copyLink(link) {
   try {
-    const res = await api(`/api/business-revoke/${id}`, { method: 'POST' })
-    if (res.ok) {
-      user.business_verified = 0
-      ui.showToast('已撤销商业认证')
-    }
+    await navigator.clipboard.writeText(link)
+    ui.showToast('已复制')
   } catch {
-    ui.showToast('操作失败')
+    ui.showToast('复制失败')
   }
 }
 
@@ -313,13 +335,8 @@ 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',
-      body: JSON.stringify({ reason: reason || '' }),
-    })
+    const res = await api(`/api/business-applications/${id}/reject`, { method: 'POST' })
     if (res.ok) {
       businessApps.value = businessApps.value.filter(item => (item._id || item.id) !== id)
       ui.showToast('已拒绝')
@@ -417,26 +434,8 @@ 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;