UI: 批量操作改为展开菜单，各区域独立全选

- 批量操作改为按钮点击展开菜单（打标签/导出卡片/共享/删除）
- 共享到公共库仅在全选我的配方且未选公共配方时显示
- 我的配方和公共配方库各有独立的✓全选按钮
- 两个区域都全选后，顶部全选按钮激活

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

.gitea/workflows/test.yml

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

.gitignore

@@ -9,6 +9,3 @@ backups/
 frontend/node_modules/
 frontend/dist/
 frontend/.vite/
-.vite/
-data/
-test-results/

backend/database.py

@@ -165,8 +165,6 @@ def init_db():
         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")
-    if "username_changed" not in user_cols:
-        c.execute("ALTER TABLE users ADD COLUMN username_changed INTEGER DEFAULT 0")
 
     # Migration: add tags to user_diary
     diary_cols = [row[1] for row in c.execute("PRAGMA table_info(user_diary)").fetchall()]
@@ -227,8 +225,6 @@ def init_db():
         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 ''")
-    if "unit" not in oil_cols:
-        c.execute("ALTER TABLE oils ADD COLUMN unit TEXT DEFAULT 'drop'")
 
     # Migration: add new columns to category_modules if missing
     cat_cols = [row[1] for row in c.execute("PRAGMA table_info(category_modules)").fetchall()]
@@ -248,8 +244,6 @@ 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 "volume" not in cols:
-        c.execute("ALTER TABLE recipes ADD COLUMN volume TEXT DEFAULT ''")
 
     # Seed admin user if no users exist
     count = c.execute("SELECT COUNT(*) FROM users").fetchone()[0]

backend/main.py

@@ -6,18 +6,12 @@ import json
 import os
 
 from backend.database import get_db, init_db, seed_defaults, log_audit
-from backend.translate import auto_translate
 import hashlib
 import secrets as _secrets
 
 app = FastAPI(title="Essential Oil Formula Calculator API")
 
 
-def title_case(s: str) -> str:
-    """Convert to title case: 'pain relief' → 'Pain Relief'"""
-    return s.strip().title() if s else s
-
-
 # ── Password hashing (PBKDF2-SHA256, stdlib) ─────────
 def hash_password(password: str) -> str:
     salt = _secrets.token_hex(16)
@@ -63,7 +57,7 @@ def get_current_user(request: Request):
     if not token:
         return ANON_USER
     conn = get_db()
-    user = conn.execute("SELECT id, username, role, display_name, password, business_verified, username_changed FROM users WHERE token = ?", (token,)).fetchone()
+    user = conn.execute("SELECT id, username, role, display_name, password, business_verified FROM users WHERE token = ?", (token,)).fetchone()
     conn.close()
     if not user:
         return ANON_USER
@@ -87,7 +81,6 @@ class OilIn(BaseModel):
     retail_price: Optional[float] = None
     en_name: Optional[str] = None
     is_active: Optional[int] = None
-    unit: Optional[str] = None
 
 
 class IngredientIn(BaseModel):
@@ -100,7 +93,6 @@ class RecipeIn(BaseModel):
     note: str = ""
     ingredients: list[IngredientIn]
     tags: list[str] = []
-    en_name: Optional[str] = None
 
 
 class RecipeUpdate(BaseModel):
@@ -110,7 +102,6 @@ class RecipeUpdate(BaseModel):
     ingredients: Optional[list[IngredientIn]] = None
     tags: Optional[list[str]] = None
     version: Optional[int] = None
-    volume: Optional[str] = None
 
 
 class UserIn(BaseModel):
@@ -134,7 +125,7 @@ def get_version():
 
 @app.get("/api/me")
 def get_me(user=Depends(get_current_user)):
-    return {"username": user["username"], "role": user["role"], "display_name": user["username"], "id": user.get("id"), "has_password": bool(user.get("password")), "business_verified": bool(user.get("business_verified")), "username_changed": bool(user.get("username_changed"))}
+    return {"username": user["username"], "role": user["role"], "display_name": user.get("display_name", ""), "id": user.get("id"), "has_password": bool(user.get("password")), "business_verified": bool(user.get("business_verified"))}
 
 
 # ── Bug Reports ─────────────────────────────────────────
@@ -320,7 +311,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, volume FROM recipes ORDER BY id"
+        "SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id"
     ).fetchall()
     exact = []
     related = []
@@ -352,24 +343,18 @@ def symptom_search(body: dict, user=Depends(get_current_user)):
 def register(body: dict):
     username = body.get("username", "").strip()
     password = body.get("password", "").strip()
+    display_name = body.get("display_name", "").strip()
     if not username or len(username) < 2:
         raise HTTPException(400, "用户名至少2个字符")
     if not password or len(password) < 4:
         raise HTTPException(400, "密码至少4位")
-    # Case-insensitive uniqueness check
-    conn = get_db()
-    existing = conn.execute("SELECT id FROM users WHERE LOWER(username) = LOWER(?)", (username,)).fetchone()
-    if existing:
-        conn.close()
-        raise HTTPException(400, "用户名已被占用")
     token = _secrets.token_hex(24)
+    conn = get_db()
     try:
         conn.execute(
             "INSERT INTO users (username, token, role, display_name, password) VALUES (?, ?, ?, ?, ?)",
-            (username, token, "viewer", username, hash_password(password))
+            (username, token, "viewer", display_name or username, hash_password(password))
         )
-        uid = conn.execute("SELECT id FROM users WHERE username = ?", (username,)).fetchone()
-        log_audit(conn, uid["id"] if uid else None, "register", "user", username, username, None)
         conn.commit()
     except Exception:
         conn.close()
@@ -386,7 +371,7 @@ def login(body: dict):
     if not username or not password:
         raise HTTPException(400, "请输入用户名和密码")
     conn = get_db()
-    user = conn.execute("SELECT id, token, password, display_name, role, username FROM users WHERE LOWER(username) = LOWER(?)", (username,)).fetchone()
+    user = conn.execute("SELECT id, token, password, display_name, role FROM users WHERE username = ?", (username,)).fetchone()
     if not user:
         conn.close()
         raise HTTPException(401, "用户名不存在")
@@ -458,30 +443,6 @@ def set_password(body: dict, user=Depends(get_current_user)):
     return {"ok": True}
 
 
-@app.put("/api/me/username")
-def change_username(body: dict, user=Depends(get_current_user)):
-    if not user["id"]:
-        raise HTTPException(403, "请先登录")
-    conn = get_db()
-    u = conn.execute("SELECT username_changed FROM users WHERE id = ?", (user["id"],)).fetchone()
-    if u and u["username_changed"]:
-        conn.close()
-        raise HTTPException(400, "用户名只能修改一次")
-    new_name = body.get("username", "").strip()
-    if not new_name or len(new_name) < 2:
-        conn.close()
-        raise HTTPException(400, "用户名至少2个字符")
-    existing = conn.execute("SELECT id FROM users WHERE LOWER(username) = LOWER(?) AND id != ?", (new_name, user["id"])).fetchone()
-    if existing:
-        conn.close()
-        raise HTTPException(400, "用户名已被占用")
-    conn.execute("UPDATE users SET username = ?, display_name = ?, username_changed = 1 WHERE id = ?",
-                 (new_name, new_name, user["id"]))
-    conn.commit()
-    conn.close()
-    return {"ok": True, "username": new_name}
-
-
 # ── Business Verification ──────────────────────────────
 @app.post("/api/business-apply", status_code=201)
 def business_apply(body: dict, user=Depends(get_current_user)):
@@ -516,8 +477,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}
@@ -559,15 +518,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()
+    # Notify user
-    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:
         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}
@@ -582,8 +539,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 = conn.execute("SELECT role FROM users WHERE id = ?", (app["user_id"],)).fetchone()
-    target_name = (target["display_name"] or target["username"]) if target else "unknown"
     if target:
         msg = "你的商业用户认证申请未通过。"
         if reason:
@@ -593,8 +549,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}
@@ -665,13 +619,11 @@ 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}
@@ -692,9 +644,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}
@@ -717,7 +666,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, unit FROM oils ORDER BY name").fetchall()
+    rows = conn.execute("SELECT name, bottle_price, drop_count, retail_price, is_active, en_name FROM oils ORDER BY name").fetchall()
     conn.close()
     return [dict(r) for r in rows]
 
@@ -726,11 +675,11 @@ 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, unit) VALUES (?, ?, ?, ?, ?, ?, ?) "
+        "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), unit=COALESCE(excluded.unit, oils.unit)",
+        "is_active=COALESCE(excluded.is_active, oils.is_active)",
-        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, title_case(oil.en_name) if oil.en_name else oil.en_name, oil.is_active, oil.unit),
+        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, oil.en_name, oil.is_active),
     )
     log_audit(conn, user["id"], "upsert_oil", "oil", oil.name, oil.name,
               json.dumps({"bottle_price": oil.bottle_price, "drop_count": oil.drop_count}))
@@ -774,7 +723,6 @@ def _recipe_to_dict(conn, row):
         "version": row["version"] if "version" in row.keys() else 1,
         "ingredients": [{"oil_name": i["oil_name"], "drops": i["drops"]} for i in ings],
         "tags": [t["tag_name"] for t in tags],
-        "volume": row["volume"] if "volume" in row.keys() else "",
     }
 
 
@@ -783,19 +731,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, volume FROM recipes ORDER BY id").fetchall()
+        rows = conn.execute("SELECT id, name, note, owner_id, version, en_name 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, volume FROM recipes WHERE owner_id = ? OR owner_id = ? ORDER BY id",
+                "SELECT id, name, note, owner_id, version, en_name 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, volume FROM recipes WHERE owner_id = ? ORDER BY id",
+                "SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE owner_id = ? ORDER BY id",
                 (admin_id,)
             ).fetchall()
     result = [_recipe_to_dict(conn, r) for r in rows]
@@ -806,7 +754,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, volume FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    row = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     if not row:
         conn.close()
         raise HTTPException(404, "Recipe not found")
@@ -821,15 +769,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
+    c.execute("INSERT INTO recipes (name, note, owner_id) VALUES (?, ?, ?)",
-    owner_id = user["id"]
+              (recipe.name, recipe.note, 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"]
-    en_name = title_case(recipe.en_name) if recipe.en_name else auto_translate(recipe.name)
-    c.execute("INSERT INTO recipes (name, note, owner_id, en_name) VALUES (?, ?, ?, ?)",
-              (recipe.name, recipe.note, owner_id, en_name))
     rid = c.lastrowid
     for ing in recipe.ingredients:
         c.execute(
@@ -839,24 +780,16 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
     for tag in recipe.tags:
         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))
-    # Only log for admin/senior_editor direct adds (share); others wait for adopt
+    log_audit(conn, user["id"], "create_recipe", "recipe", rid, recipe.name)
-    if user["role"] in ("admin", "senior_editor"):
+    # Notify admin and senior editors when non-admin creates a recipe
-        log_audit(conn, user["id"], "share_recipe", "recipe", rid, recipe.name)
+    if user["role"] not in ("admin", "senior_editor"):
-    who = user.get("display_name") or user["username"]
+        who = user.get("display_name") or user["username"]
-    if user["role"] == "senior_editor":
+        for role in ("admin", "senior_editor"):
-        # Senior editor adds directly — just inform admin
+            conn.execute(
-        conn.execute(
+                "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
-            "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
+                (role, "📝 新配方待审核",
-            ("admin", "📋 新配方已添加",
+                 f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
-             f"{who} 将配方「{recipe.name}」添加到了公共配方库。\n[recipe_id:{rid}]")
+            )
-        )
-    elif user["role"] not in ("admin",):
-        # Other users need review
-        conn.execute(
-            "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
-            ("admin", "📝 新配方待审核",
-             f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
-        )
     conn.commit()
     conn.close()
     return {"id": rid}
@@ -867,7 +800,9 @@ def _check_recipe_permission(conn, recipe_id, user):
     row = conn.execute("SELECT owner_id, name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     if not row:
         raise HTTPException(404, "Recipe not found")
-    if user["role"] in ("admin", "senior_editor", "editor"):
+    if user["role"] in ("admin", "senior_editor"):
+        return row
+    if user["role"] in ("editor",) and row["owner_id"] == user.get("id"):
         return row
     raise HTTPException(403, "权限不足")
 
@@ -889,15 +824,10 @@ def update_recipe(recipe_id: int, update: RecipeUpdate, user=Depends(get_current
 
     if update.name is not None:
         c.execute("UPDATE recipes SET name = ? WHERE id = ?", (update.name, recipe_id))
-        # Re-translate en_name if name changed and no explicit en_name provided
-        if update.en_name is None:
-            c.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (auto_translate(update.name), recipe_id))
     if update.note is not None:
         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 = ?", (title_case(update.en_name), recipe_id))
+        c.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (update.en_name, recipe_id))
-    if update.volume is not None:
-        c.execute("UPDATE recipes SET volume = ? WHERE id = ?", (update.volume, recipe_id))
     if update.ingredients is not None:
         c.execute("DELETE FROM recipe_ingredients WHERE recipe_id = ?", (recipe_id,))
         for ing in update.ingredients:
@@ -914,17 +844,7 @@ def update_recipe(recipe_id: int, update: RecipeUpdate, user=Depends(get_current
                 (recipe_id, tag),
             )
     c.execute("UPDATE recipes SET updated_by = ?, version = COALESCE(version, 1) + 1 WHERE id = ?", (user["id"], recipe_id))
-    # Get recipe name for log
+    log_audit(conn, user["id"], "update_recipe", "recipe", recipe_id, update.name)
-    rname = c.execute("SELECT name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
-    changed = []
-    if update.name is not None: changed.append("名称")
-    if update.ingredients is not None: changed.append("成分")
-    if update.tags is not None: changed.append("标签")
-    if update.note is not None: changed.append("备注")
-    if update.en_name is not None: changed.append("英文名")
-    log_audit(conn, user["id"], "update_recipe", "recipe", recipe_id,
-              rname["name"] if rname else update.name,
-              json.dumps({"changed": "、".join(changed)}, ensure_ascii=False) if changed else None)
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -937,7 +857,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, volume FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    full = conn.execute("SELECT id, name, note, owner_id, version, en_name 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))
@@ -960,10 +880,6 @@ def adopt_recipe(recipe_id: int, user=Depends(require_role("admin"))):
         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_name = (old_owner["display_name"] or old_owner["username"]) if old_owner else "unknown"
-    # Auto-fill en_name if missing
-    existing_en = conn.execute("SELECT en_name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
-    if not existing_en["en_name"]:
-        conn.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (auto_translate(row["name"]), recipe_id))
     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}))
@@ -980,7 +896,7 @@ def adopt_recipe(recipe_id: int, user=Depends(require_role("admin"))):
 
 
 @app.post("/api/recipes/{recipe_id}/reject")
-def reject_recipe(recipe_id: int, body: dict = None, user=Depends(require_role("admin", "senior_editor"))):
+def reject_recipe(recipe_id: int, body: dict = None, user=Depends(require_role("admin"))):
     conn = get_db()
     row = conn.execute("SELECT id, name, owner_id FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     if not row:
@@ -1002,55 +918,8 @@ def reject_recipe(recipe_id: int, body: dict = None, user=Depends(require_role("
     conn.execute("DELETE FROM recipe_ingredients WHERE recipe_id = ?", (recipe_id,))
     conn.execute("DELETE FROM recipe_tags WHERE recipe_id = ?", (recipe_id,))
     conn.execute("DELETE FROM recipes WHERE id = ?", (recipe_id,))
-    from_name = (old_owner["display_name"] or old_owner["username"]) if old_owner else "unknown"
     log_audit(conn, user["id"], "reject_recipe", "recipe", recipe_id, row["name"],
-              json.dumps({"reason": reason, "from_user": from_name}))
+              json.dumps({"reason": reason}))
-    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}
@@ -1090,7 +959,7 @@ def create_tag(body: dict, user=Depends(require_role("admin", "senior_editor", "
         raise HTTPException(400, "Tag name required")
     conn = get_db()
     conn.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (name,))
-    log_audit(conn, user["id"], "create_tag", "tag", name, name, None)
+    # Don't log tag creation (too frequent/noisy)
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1144,45 +1013,10 @@ def delete_user(user_id: int, user=Depends(require_role("admin"))):
     if not target:
         conn.close()
         raise HTTPException(404, "User not found")
-    # Transfer personal diary recipes to admin before deletion (skip duplicates)
-    target_name = target["display_name"] or target["username"]
-    diaries = conn.execute("SELECT id, name, ingredients FROM user_diary WHERE user_id = ?", (user_id,)).fetchall()
-    transferred = 0
-    if diaries:
-        # Build set of ingredient fingerprints from admin diary + public recipes
-        def _ings_key(ings_json):
-            """Normalize ingredients to a comparable key."""
-            try:
-                ings = json.loads(ings_json) if isinstance(ings_json, str) else []
-                return tuple(sorted((i.get("oil") or i.get("oil_name", ""), i.get("drops", 0)) for i in ings))
-            except Exception:
-                return ()
-        existing_keys = set()
-        admin_diaries = conn.execute("SELECT ingredients FROM user_diary WHERE user_id = ?", (user["id"],)).fetchall()
-        for row in admin_diaries:
-            existing_keys.add(_ings_key(row["ingredients"]))
-        public_recipes = conn.execute("SELECT id FROM recipes").fetchall()
-        for pr in public_recipes:
-            pub_ings = conn.execute("SELECT oil_name, drops FROM recipe_ingredients WHERE recipe_id = ?", (pr["id"],)).fetchall()
-            existing_keys.add(tuple(sorted((r["oil_name"], r["drops"]) for r in pub_ings)))
-        for d in diaries:
-            d_key = _ings_key(d["ingredients"])
-            is_dup = d_key in existing_keys and d_key != ()
-            if is_dup:
-                conn.execute("DELETE FROM user_diary WHERE id = ?", (d["id"],))
-            else:
-                new_name = f"{d['name']}（{target_name}）"
-                conn.execute("UPDATE user_diary SET user_id = ?, name = ? WHERE id = ?",
-                             (user["id"], new_name, d["id"]))
-                transferred += 1
     snapshot = dict(target)
     conn.execute("DELETE FROM users WHERE id = ?", (user_id,))
-    detail = dict(snapshot)
-    if diaries:
-        detail["transferred_diary_count"] = transferred
-        detail["skipped_duplicate_count"] = len(diaries) - transferred
     log_audit(conn, user["id"], "delete_user", "user", user_id, target["username"],
-              json.dumps(detail, ensure_ascii=False))
+              json.dumps(snapshot, ensure_ascii=False))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1191,9 +1025,6 @@ 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()
@@ -1201,15 +1032,8 @@ def update_user(user_id: int, body: UserUpdate, user=Depends(require_role("admin
         conn.execute("UPDATE users SET role = ?, role_changed_at = datetime('now') WHERE id = ?", (body.role, user_id))
     if body.display_name is not None:
         conn.execute("UPDATE users SET display_name = ? WHERE id = ?", (body.display_name, user_id))
-    role_labels = {"admin": "管理员", "senior_editor": "高级编辑", "editor": "编辑", "viewer": "查看者"}
+    log_audit(conn, user["id"], "update_user", "user", user_id, None,
-    detail = {}
+              json.dumps({"role": body.role, "display_name": body.display_name}))
-    if body.role is not None and body.role != old_role:
-        detail["from_role"] = role_labels.get(old_role, old_role)
-        detail["to_role"] = role_labels.get(body.role, body.role)
-    if body.display_name is not None:
-        detail["display_name"] = body.display_name
-    log_audit(conn, user["id"], "update_user", "user", user_id, target_name,
-              json.dumps(detail, ensure_ascii=False))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1339,32 +1163,17 @@ def list_projects():
     conn = get_db()
     rows = conn.execute("SELECT * FROM profit_projects ORDER BY id DESC").fetchall()
     conn.close()
-    result = []
+    return [{ **dict(r), "ingredients": json.loads(r["ingredients"]) } for r in rows]
-    for r in rows:
-        d = dict(r)
-        d["ingredients"] = json.loads(r["ingredients"])
-        try:
-            extra = json.loads(r["pricing"]) if r["pricing"] else {}
-            if isinstance(extra, dict):
-                d.update(extra)
-        except (json.JSONDecodeError, TypeError):
-            pass
-        result.append(d)
-    return result
 
 
 @app.post("/api/projects", status_code=201)
 def create_project(body: dict, user=Depends(require_role("admin", "senior_editor"))):
     conn = get_db()
     c = conn.cursor()
-    extra = {}
-    for k in ("selling_price", "packaging_cost", "labor_cost", "other_cost", "quantity"):
-        if k in body:
-            extra[k] = body[k]
     c.execute(
         "INSERT INTO profit_projects (name, ingredients, pricing, note, created_by) VALUES (?, ?, ?, ?, ?)",
         (body["name"], json.dumps(body.get("ingredients", []), ensure_ascii=False),
-         json.dumps(extra) if extra else '{}', body.get("note", ""), user["id"])
+         body.get("pricing", 0), body.get("note", ""), user["id"])
     )
     conn.commit()
     pid = c.lastrowid
@@ -1384,14 +1193,6 @@ def update_project(pid: int, body: dict, user=Depends(require_role("admin", "sen
         conn.execute("UPDATE profit_projects SET pricing = ? WHERE id = ?", (body["pricing"], pid))
     if "note" in body:
         conn.execute("UPDATE profit_projects SET note = ? WHERE id = ?", (body["note"], pid))
-    # Store extra cost fields in pricing as JSON
-    extra = {}
-    for k in ("selling_price", "packaging_cost", "labor_cost", "other_cost", "quantity"):
-        if k in body:
-            extra[k] = body[k]
-    if extra:
-        conn.execute("UPDATE profit_projects SET pricing = ? WHERE id = ?",
-                     (json.dumps(extra, ensure_ascii=False), pid))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1600,7 +1401,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, volume FROM recipes ORDER BY id").fetchall()
+    rows = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id").fetchall()
     result = []
     for r in rows:
         recipe = _recipe_to_dict(conn, r)
@@ -1616,8 +1417,6 @@ def recipes_by_inventory(user=Depends(get_current_user)):
     return result
 
 
-
-# ── Search Logging ─────────────────────────────────────
 # ── Search Logging ─────────────────────────────────────
 @app.post("/api/search-log")
 def log_search(body: dict, user=Depends(get_current_user)):
@@ -1674,38 +1473,19 @@ def list_recipe_reviews(user=Depends(require_role("admin"))):
 @app.get("/api/me/contribution")
 def my_contribution(user=Depends(get_current_user)):
     if not user.get("id"):
-        return {"adopted_count": 0, "shared_count": 0, "adopted_names": [], "pending_names": []}
+        return {"adopted_count": 0, "shared_count": 0}
     conn = get_db()
-    display = user.get("display_name") or user.get("username")
+    # adopted_count: recipes adopted from this user (owner changed to admin)
-    # adopted: unique recipe names adopted from this user
+    adopted = conn.execute(
-    adopted_rows = conn.execute(
+        "SELECT COUNT(*) FROM audit_log WHERE action = 'adopt_recipe' AND detail LIKE ?",
-        "SELECT DISTINCT target_name FROM audit_log WHERE action = 'adopt_recipe' AND detail LIKE ?",
+        (f'%"from_user": "{user.get("display_name") or user.get("username")}"%',)
-        (f'%"from_user": "{display}"%',)
+    ).fetchone()[0]
-    ).fetchall()
+    # pending: recipes still owned by user in public library (not yet adopted)
-    adopted_names = list(set(r["target_name"] for r in adopted_rows if r["target_name"]))
+    pending = conn.execute(
-    # pending: recipes still owned by user in public library (skip admin — admin owns all public recipes)
+        "SELECT COUNT(*) FROM recipes WHERE owner_id = ?", (user["id"],)
-    if user.get("role") == "admin":
+    ).fetchone()[0]
-        pending_names = []
-    else:
-        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 {
+    return {"adopted_count": adopted, "shared_count": adopted + pending}
-        "adopted_count": len(adopted_names),
-        "shared_count": len(all_names),
-        "adopted_names": adopted_names,
-        "pending_names": pending_names,
-    }
 
 
 # ── Notifications ──────────────────────────────────────
@@ -1747,50 +1527,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()
@@ -1899,36 +1635,6 @@ def startup():
             data = json.load(f)
         seed_defaults(data["oils_meta"], data["recipes"])
 
-    # One-time migration: sync display_name = username, notify about username change
-    conn = get_db()
-    needs_sync = conn.execute("SELECT id, username, display_name FROM users WHERE display_name != username AND display_name IS NOT NULL").fetchall()
-    if needs_sync:
-        for row in needs_sync:
-            conn.execute("UPDATE users SET display_name = ? WHERE id = ?", (row["username"], row["id"]))
-        # Send notification once (check if already sent)
-        already_notified = conn.execute("SELECT id FROM notifications WHERE title = '📢 用户名变更通知'").fetchone()
-        if not already_notified:
-            all_users = conn.execute("SELECT id FROM users").fetchall()
-            for u in all_users:
-                conn.execute(
-                    "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
-                    ("viewer", "📢 用户名更新提醒",
-                     "为了统一体验，系统已将显示名称合并为用户名。你有一次修改用户名的机会，修改后将不可更改，请慎重选择。", u["id"])
-                )
-        conn.commit()
-        print(f"[INIT] Synced display_name for {len(needs_sync)} users")
-    conn.close()
-
-    # Auto-fill missing en_name for existing recipes
-    conn = get_db()
-    missing = conn.execute("SELECT id, name FROM recipes WHERE en_name IS NULL OR en_name = ''").fetchall()
-    for row in missing:
-        conn.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (auto_translate(row["name"]), row["id"]))
-    if missing:
-        conn.commit()
-        print(f"[INIT] Auto-translated {len(missing)} recipe names to English")
-    conn.close()
-
     if os.path.isdir(FRONTEND_DIR):
         # Serve static assets (js/css/images) directly
         app.mount("/assets", StaticFiles(directory=os.path.join(FRONTEND_DIR, "assets")), name="assets")

backend/test_translate.py

@@ -1,108 +0,0 @@
-"""Tests for translate.py auto_translate and main.py title_case."""
-import pytest
-from backend.translate import auto_translate
-
-
-# ---------------------------------------------------------------------------
-# title_case (inlined here since it's a trivial helper in main.py)
-# ---------------------------------------------------------------------------
-def title_case(s: str) -> str:
-    return s.strip().title() if s else s
-
-
-class TestTitleCase:
-    def test_basic(self):
-        assert title_case("pain relief") == "Pain Relief"
-
-    def test_single_word(self):
-        assert title_case("sleep") == "Sleep"
-
-    def test_preserves_already_cased(self):
-        assert title_case("Pain Relief") == "Pain Relief"
-
-    def test_empty_string(self):
-        assert title_case("") == ""
-
-    def test_none(self):
-        assert title_case(None) is None
-
-    def test_strips_whitespace(self):
-        assert title_case("  hello world  ") == "Hello World"
-
-
-# ---------------------------------------------------------------------------
-# auto_translate
-# ---------------------------------------------------------------------------
-class TestAutoTranslate:
-    def test_empty_string(self):
-        assert auto_translate("") == ""
-
-    def test_single_keyword(self):
-        assert auto_translate("失眠") == "Insomnia"
-
-    def test_compound_name(self):
-        result = auto_translate("助眠配方")
-        assert "Sleep" in result
-        assert "Blend" in result
-
-    def test_head_pain(self):
-        result = auto_translate("头痛")
-        # 头痛 is a single keyword → Headache
-        assert "Headache" in result
-
-    def test_shoulder_neck_massage(self):
-        result = auto_translate("肩颈按摩")
-        assert "Neck" in result or "Shoulder" in result
-        assert "Massage" in result
-
-    def test_no_duplicate_words(self):
-        # 肩颈 → "Neck & Shoulder", but should not duplicate if sub-keys match
-        result = auto_translate("肩颈护理")
-        words = result.split()
-        # No exact duplicate consecutive words
-        for i in range(len(words) - 1):
-            if words[i] == words[i + 1]:
-                pytest.fail(f"Duplicate word '{words[i]}' in '{result}'")
-
-    def test_skincare_blend(self):
-        result = auto_translate("皮肤修复")
-        assert "Skin" in result
-        assert "Repair" in result
-
-    def test_foot_soak(self):
-        result = auto_translate("泡脚配方")
-        assert "Foot Soak" in result or "Foot" in result
-
-    def test_ascii_passthrough(self):
-        # Embedded ASCII letters are preserved
-        result = auto_translate("DIY面膜")
-        assert "DIY" in result or "Diy" in result
-        assert "Face Mask" in result or "Mask" in result
-
-    def test_pure_chinese_returns_english(self):
-        result = auto_translate("薰衣草精华")
-        # Should not return original Chinese; should have English words
-        assert any(c.isascii() and c.isalpha() for c in result)
-
-    def test_fallback_for_unknown(self):
-        # Completely unknown chars get skipped; if nothing matches, returns original
-        result = auto_translate("㊗㊗㊗")
-        assert result == "㊗㊗㊗"
-
-    def test_children_sleep(self):
-        result = auto_translate("儿童助眠")
-        assert "Children" in result
-        assert "Sleep" in result
-
-    def test_menstrual_pain(self):
-        result = auto_translate("痛经调理")
-        assert "Menstrual Pain" in result or "Menstrual" in result
-        assert "Therapy" in result
-
-    def test_result_is_title_cased(self):
-        result = auto_translate("排毒按摩")
-        # Each word should start with uppercase
-        for word in result.split():
-            if word == "&":
-                continue
-            assert word[0].isupper(), f"'{word}' in '{result}' is not title-cased"

backend/translate.py

@@ -1,112 +0,0 @@
-"""Auto-translate Chinese recipe names to English using keyword dictionary."""
-
-# Common keywords in essential oil recipe names
-_KEYWORDS = {
-    # Body parts
-    '头': 'Head', '头疗': 'Scalp Therapy', '头皮': 'Scalp', '头发': 'Hair',
-    '脸': 'Face', '面部': 'Face', '眼': 'Eye', '眼部': 'Eye',
-    '鼻': 'Nose', '鼻腔': 'Nasal', '耳': 'Ear',
-    '颈': 'Neck', '颈椎': 'Cervical', '肩': 'Shoulder', '肩颈': 'Neck & Shoulder',
-    '背': 'Back', '腰': 'Lower Back', '腰椎': 'Lumbar',
-    '胸': 'Chest', '腹': 'Abdomen', '腹部': 'Abdominal',
-    '手': 'Hand', '脚': 'Foot', '足': 'Foot', '膝': 'Knee', '关节': 'Joint',
-    '皮肤': 'Skin', '肌肤': 'Skin', '毛孔': 'Pore',
-    '乳腺': 'Breast', '子宫': 'Uterine', '私密': 'Intimate',
-    '淋巴': 'Lymph', '肝': 'Liver', '肾': 'Kidney', '脾': 'Spleen', '胃': 'Stomach',
-    '肺': 'Lung', '心': 'Heart', '肠': 'Intestinal',
-    '带脉': 'Belt Meridian', '经络': 'Meridian',
-
-    # Symptoms & conditions
-    '酸痛': 'Pain Relief', '疼痛': 'Pain Relief', '止痛': 'Pain Relief',
-    '感冒': 'Cold', '发烧': 'Fever', '咳嗽': 'Cough', '咽喉': 'Throat',
-    '过敏': 'Allergy', '鼻炎': 'Rhinitis', '哮喘': 'Asthma',
-    '湿疹': 'Eczema', '痘痘': 'Acne', '粉刺': 'Acne',
-    '炎症': 'Anti-Inflammatory', '消炎': 'Anti-Inflammatory',
-    '便秘': 'Constipation', '腹泻': 'Diarrhea', '消化': 'Digestion',
-    '失眠': 'Insomnia', '助眠': 'Sleep Aid', '好眠': 'Sleep Well', '安眠': 'Sleep',
-    '焦虑': 'Anxiety', '抑郁': 'Depression', '情绪': 'Emotional',
-    '压力': 'Stress', '放松': 'Relaxation', '舒缓': 'Soothing',
-    '头痛': 'Headache', '偏头痛': 'Migraine',
-    '水肿': 'Edema', '浮肿': 'Swelling',
-    '痛经': 'Menstrual Pain', '月经': 'Menstrual', '经期': 'Menstrual',
-    '更年期': 'Menopause', '荷尔蒙': 'Hormone',
-    '结节': 'Nodule', '囊肿': 'Cyst',
-    '灰指甲': 'Nail Fungus', '脚气': 'Athlete\'s Foot',
-    '白发': 'Gray Hair', '脱发': 'Hair Loss', '生发': 'Hair Growth',
-    '瘦身': 'Slimming', '减肥': 'Weight Loss', '纤体': 'Body Sculpting',
-    '紫外线': 'UV', '晒伤': 'Sunburn', '防晒': 'Sun Protection',
-    '抗衰': 'Anti-Aging', '抗皱': 'Anti-Wrinkle', '美白': 'Whitening',
-    '补水': 'Hydrating', '保湿': 'Moisturizing',
-    '排毒': 'Detox', '清洁': 'Cleansing', '净化': 'Purifying',
-    '驱蚊': 'Mosquito Repellent', '驱虫': 'Insect Repellent',
-
-    # Actions & methods
-    '护理': 'Care', '调理': 'Therapy', '修复': 'Repair', '养护': 'Nourish',
-    '按摩': 'Massage', '刮痧': 'Gua Sha', '拔罐': 'Cupping', '艾灸': 'Moxibustion',
-    '泡脚': 'Foot Soak', '泡澡': 'Bath', '精油浴': 'Oil Bath',
-    '热敷': 'Hot Compress', '冷敷': 'Cold Compress', '敷面': 'Face Mask',
-    '喷雾': 'Spray', '滚珠': 'Roll-On', '扩香': 'Diffuser',
-    '涂抹': 'Topical', '吸嗅': 'Inhalation',
-    '疏通': 'Unblock', '提升': 'Boost', '增强': 'Enhance', '促进': 'Promote',
-    '预防': 'Prevention', '改善': 'Improve',
-    '祛湿': 'Dampness Relief', '驱寒': 'Warming',
-    '化痰': 'Phlegm Relief', '健脾': 'Spleen Wellness',
-    '化湿': 'Dampness Clear', '缓解': 'Relief',
-
-    # Beauty
-    '美容': 'Beauty', '美发': 'Hair Care', '美体': 'Body Care',
-    '面膜': 'Face Mask', '发膜': 'Hair Mask', '眼霜': 'Eye Cream',
-    '精华': 'Serum', '乳液': 'Lotion', '洗发': 'Shampoo',
-
-    # General
-    '配方': 'Blend', '方': 'Blend', '包': 'Blend',
-    '增强版': 'Enhanced', '高配版': 'Premium', '基础版': 'Basic',
-    '男士': 'Men\'s', '女士': 'Women\'s', '儿童': 'Children\'s', '宝宝': 'Baby',
-    '日常': 'Daily', '夜间': 'Night', '早晨': 'Morning',
-    '呼吸': 'Respiratory', '呼吸系统': 'Respiratory System',
-    '免疫': 'Immunity', '免疫力': 'Immunity',
-    '细胞': 'Cellular', '律动': 'Rhythm',
-}
-
-# Longer keys first for greedy matching
-_SORTED_KEYS = sorted(_KEYWORDS.keys(), key=len, reverse=True)
-
-
-def auto_translate(name: str) -> str:
-    """Translate a Chinese recipe name to English using keyword matching."""
-    if not name:
-        return ''
-    remaining = name.strip()
-    parts = []
-    i = 0
-    while i < len(remaining):
-        matched = False
-        for key in _SORTED_KEYS:
-            if remaining[i:i+len(key)] == key:
-                en = _KEYWORDS[key]
-                if en not in parts:  # avoid duplicates
-                    parts.append(en)
-                i += len(key)
-                matched = True
-                break
-        if not matched:
-            # Skip numbers, punctuation, and unrecognized chars
-            ch = remaining[i]
-            if ch.isascii() and ch.isalpha():
-                # Collect consecutive ASCII chars
-                j = i
-                while j < len(remaining) and remaining[j].isascii() and remaining[j].isalpha():
-                    j += 1
-                word = remaining[i:j]
-                if word not in parts:
-                    parts.append(word)
-                i = j
-            else:
-                i += 1
-
-    if parts:
-        result = ' '.join(parts)
-        # Title case each word but preserve apostrophes (Men's not Men'S)
-        return ' '.join(w[0].upper() + w[1:] if w else w for w in result.split())
-    # Fallback: return original name
-    return name

frontend/cypress/e2e/audit-log-advanced.cy.js

@@ -41,7 +41,7 @@ describe('Audit Log Advanced', () => {
       const recipeId = createRes.body.id
       // Check audit log
       cy.request({ url: '/api/audit-log?limit=5&offset=0', headers: authHeaders }).then(res => {
-        const entry = res.body.find(e => e.action === 'share_recipe' && e.target_name === 'Cypress审计测试')
+        const entry = res.body.find(e => e.action === 'create_recipe' && e.target_name === 'Cypress审计测试')
         expect(entry).to.exist
       })
       // Cleanup

frontend/cypress/e2e/pr27-features.cy.js

@@ -1,661 +0,0 @@
-describe('PR27 Feature Tests', () => {
-  const ADMIN_TOKEN = 'c86ae7afbe10fabe3c1d5e1a7fee74feaadfd5dc7be2ab62'
-  const authHeaders = { Authorization: `Bearer ${ADMIN_TOKEN}` }
-  const TEST_USERNAME = 'cypress_pr27_user'
-
-  // -------------------------------------------------------------------------
-  // API: en_name auto title case on recipe create
-  // -------------------------------------------------------------------------
-  describe('API: en_name auto title case', () => {
-    let recipeId
-
-    after(() => {
-      // Cleanup
-      if (recipeId) {
-        cy.request({
-          method: 'DELETE',
-          url: `/api/recipes/${recipeId}`,
-          headers: authHeaders,
-          failOnStatusCode: false
-        })
-      }
-    })
-
-    it('auto title-cases en_name when provided', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/recipes',
-        headers: authHeaders,
-        body: {
-          name: 'PR27标题测试',
-          en_name: 'pain relief blend',
-          ingredients: [{ oil_name: '薰衣草', drops: 3 }],
-          tags: []
-        }
-      }).then(res => {
-        expect(res.status).to.be.oneOf([200, 201])
-        recipeId = res.body.id
-      })
-    })
-
-    it('verifies en_name is title-cased', () => {
-      cy.request('/api/recipes').then(res => {
-        const found = res.body.find(r => r.name === 'PR27标题测试')
-        expect(found).to.exist
-        expect(found.en_name).to.eq('Pain Relief Blend')
-        recipeId = found.id
-      })
-    })
-
-    it('auto translates en_name from Chinese when not provided', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/recipes',
-        headers: authHeaders,
-        body: {
-          name: '助眠配方',
-          ingredients: [{ oil_name: '薰衣草', drops: 5 }],
-          tags: []
-        }
-      }).then(res => {
-        expect(res.status).to.be.oneOf([200, 201])
-        const autoId = res.body.id
-
-        cy.request('/api/recipes').then(listRes => {
-          const found = listRes.body.find(r => r.id === autoId)
-          expect(found).to.exist
-          // auto_translate('助眠配方') should produce English with "Sleep" and "Blend"
-          expect(found.en_name).to.be.a('string')
-          expect(found.en_name.length).to.be.greaterThan(0)
-          expect(found.en_name).to.include('Sleep')
-
-          // Cleanup
-          cy.request({
-            method: 'DELETE',
-            url: `/api/recipes/${autoId}`,
-            headers: authHeaders,
-            failOnStatusCode: false
-          })
-        })
-      })
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // API: delete user transfers diary recipes to admin
-  // -------------------------------------------------------------------------
-  describe('API: delete user transfers diary', () => {
-    let testUserId
-    let testUserToken
-
-    // Cleanup leftover test user
-    before(() => {
-      cy.request({
-        url: '/api/users',
-        headers: authHeaders
-      }).then(res => {
-        const leftover = res.body.find(u => u.username === TEST_USERNAME)
-        if (leftover) {
-          cy.request({
-            method: 'DELETE',
-            url: `/api/users/${leftover.id || leftover._id}`,
-            headers: authHeaders,
-            failOnStatusCode: false
-          })
-        }
-      })
-    })
-
-    it('creates a test user', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/users',
-        headers: authHeaders,
-        body: {
-          username: TEST_USERNAME,
-          display_name: 'PR27 Test User',
-          role: 'editor'
-        }
-      }).then(res => {
-        expect(res.status).to.be.oneOf([200, 201])
-        testUserId = res.body.id || res.body._id
-        testUserToken = res.body.token
-        expect(testUserId).to.be.a('number')
-      })
-    })
-
-    it('adds a diary entry for the test user', () => {
-      const userAuth = { Authorization: `Bearer ${testUserToken}` }
-      cy.request({
-        method: 'POST',
-        url: '/api/diary',
-        headers: userAuth,
-        body: {
-          name: 'PR27用户日记',
-          ingredients: [{ oil: '乳香', drops: 4 }, { oil: '薰衣草', drops: 2 }],
-          note: '转移测试'
-        }
-      }).then(res => {
-        expect(res.status).to.be.oneOf([200, 201])
-      })
-    })
-
-    it('deletes the user and transfers diary to admin', () => {
-      cy.request({
-        method: 'DELETE',
-        url: `/api/users/${testUserId}`,
-        headers: authHeaders
-      }).then(res => {
-        expect(res.status).to.eq(200)
-        expect(res.body.ok).to.eq(true)
-      })
-    })
-
-    it('verifies diary was transferred to admin', () => {
-      cy.request({
-        url: '/api/diary',
-        headers: authHeaders
-      }).then(res => {
-        expect(res.body).to.be.an('array')
-        // Transferred diary should have user's name appended
-        const transferred = res.body.find(d => d.name && d.name.includes('PR27用户日记') && d.name.includes('PR27 Test User'))
-        expect(transferred).to.exist
-        expect(transferred.note).to.eq('转移测试')
-
-        // Cleanup: delete the transferred diary
-        if (transferred) {
-          cy.request({
-            method: 'DELETE',
-            url: `/api/diary/${transferred.id}`,
-            headers: authHeaders,
-            failOnStatusCode: false
-          })
-        }
-      })
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // API: rename recipe auto-retranslates en_name
-  // -------------------------------------------------------------------------
-  describe('API: rename recipe retranslates en_name', () => {
-    let recipeId
-
-    after(() => {
-      if (recipeId) {
-        cy.request({ method: 'DELETE', url: `/api/recipes/${recipeId}`, headers: authHeaders, failOnStatusCode: false })
-      }
-    })
-
-    it('creates recipe then renames it, en_name auto-updates', () => {
-      cy.request({
-        method: 'POST', url: '/api/recipes', headers: authHeaders,
-        body: { name: '头痛', ingredients: [{ oil_name: '薰衣草', drops: 3 }], tags: [] }
-      }).then(res => {
-        recipeId = res.body.id
-        // Verify initial en_name
-        cy.request('/api/recipes').then(list => {
-          const r = list.body.find(x => x.id === recipeId)
-          expect(r.en_name).to.include('Headache')
-        })
-        // Rename to 肩颈按摩
-        cy.request({
-          method: 'PUT', url: `/api/recipes/${recipeId}`, headers: authHeaders,
-          body: { name: '肩颈按摩' }
-        }).then(() => {
-          cy.request('/api/recipes').then(list => {
-            const r = list.body.find(x => x.id === recipeId)
-            expect(r.en_name).to.include('Neck')
-            expect(r.en_name).to.include('Massage')
-          })
-        })
-      })
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // API: delete user skips duplicate diary by ingredient content
-  // -------------------------------------------------------------------------
-  describe('API: delete user skips duplicate diary', () => {
-    const DUP_USER = 'cypress_pr27_dup'
-
-    it('creates user with duplicate diary, deletes, verifies skip', () => {
-      // Create user
-      cy.request({
-        method: 'POST', url: '/api/users', headers: authHeaders,
-        body: { username: DUP_USER, display_name: 'Dup Test', role: 'viewer' }
-      }).then(res => {
-        const userId = res.body.id
-        const userToken = res.body.token
-        const userAuth = { Authorization: `Bearer ${userToken}` }
-
-        // Get a public recipe's ingredients to create a duplicate
-        cy.request({ url: '/api/recipes', headers: authHeaders }).then(listRes => {
-          const pub = listRes.body[0]
-          const dupIngs = pub.ingredients.map(i => ({ oil: i.oil_name, drops: i.drops }))
-
-          // Add diary with same ingredients as public recipe (different name)
-          cy.request({
-            method: 'POST', url: '/api/diary', headers: userAuth,
-            body: { name: '我的重复方', ingredients: dupIngs, note: '' }
-          }).then(() => {
-            // Delete user
-            cy.request({ method: 'DELETE', url: `/api/users/${userId}`, headers: authHeaders }).then(delRes => {
-              expect(delRes.body.ok).to.eq(true)
-              // Verify duplicate was NOT transferred
-              cy.request({ url: '/api/diary', headers: authHeaders }).then(diaryRes => {
-                const transferred = diaryRes.body.find(d => d.name && d.name.includes('我的重复方'))
-                expect(transferred).to.not.exist
-              })
-            })
-          })
-        })
-      })
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // UI: 管理配方 login prompt when not logged in
-  // -------------------------------------------------------------------------
-  describe('UI: RecipeManager login prompt', () => {
-    it('shows login prompt when not logged in', () => {
-      // Clear any stored auth
-      cy.clearLocalStorage()
-      cy.visit('/#/manage')
-      cy.contains('登录后可管理配方').should('be.visible')
-      cy.contains('登录 / 注册').should('be.visible')
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // API: Case-insensitive username registration
-  // -------------------------------------------------------------------------
-  describe('API: case-insensitive username registration', () => {
-    const CASE_USER = 'CypressCaseTest'
-    const CASE_PASS = 'test1234'
-
-    // Cleanup before test
-    before(() => {
-      cy.request({ url: '/api/users', headers: authHeaders }).then(res => {
-        const leftover = res.body.find(u =>
-          u.username.toLowerCase() === CASE_USER.toLowerCase()
-        )
-        if (leftover) {
-          cy.request({
-            method: 'DELETE',
-            url: `/api/users/${leftover.id || leftover._id}`,
-            headers: authHeaders,
-            failOnStatusCode: false,
-          })
-        }
-      })
-    })
-
-    after(() => {
-      // Cleanup registered user
-      cy.request({ url: '/api/users', headers: authHeaders }).then(res => {
-        const user = res.body.find(u =>
-          u.username.toLowerCase() === CASE_USER.toLowerCase()
-        )
-        if (user) {
-          cy.request({
-            method: 'DELETE',
-            url: `/api/users/${user.id || user._id}`,
-            headers: authHeaders,
-            failOnStatusCode: false,
-          })
-        }
-      })
-    })
-
-    it('registers a user with mixed case', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/register',
-        body: { username: CASE_USER, password: CASE_PASS },
-        failOnStatusCode: false,
-      }).then(res => {
-        expect(res.status).to.eq(201)
-        expect(res.body.token).to.be.a('string')
-      })
-    })
-
-    it('rejects registration with same username in different case', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/register',
-        body: { username: CASE_USER.toLowerCase(), password: CASE_PASS },
-        failOnStatusCode: false,
-      }).then(res => {
-        expect(res.status).to.eq(400)
-      })
-    })
-
-    it('rejects registration with all-uppercase variant', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/register',
-        body: { username: CASE_USER.toUpperCase(), password: CASE_PASS },
-        failOnStatusCode: false,
-      }).then(res => {
-        expect(res.status).to.eq(400)
-      })
-    })
-
-    it('allows case-insensitive login', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/login',
-        body: { username: CASE_USER.toLowerCase(), password: CASE_PASS },
-        failOnStatusCode: false,
-      }).then(res => {
-        expect(res.status).to.eq(200)
-        expect(res.body.token).to.be.a('string')
-      })
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // API: One-time username change via PUT /api/me/username
-  // -------------------------------------------------------------------------
-  describe('API: one-time username change', () => {
-    const RENAME_USER = 'cypress_rename_test'
-    const RENAME_PASS = 'rename1234'
-    let renameToken
-    let renameUserId
-
-    before(() => {
-      // Cleanup leftovers
-      cy.request({ url: '/api/users', headers: authHeaders }).then(res => {
-        for (const name of [RENAME_USER, 'cypress_renamed']) {
-          const leftover = res.body.find(u => u.username.toLowerCase() === name)
-          if (leftover) {
-            cy.request({
-              method: 'DELETE',
-              url: `/api/users/${leftover.id || leftover._id}`,
-              headers: authHeaders,
-              failOnStatusCode: false,
-            })
-          }
-        }
-      })
-    })
-
-    after(() => {
-      // Cleanup
-      if (renameUserId) {
-        cy.request({
-          method: 'DELETE',
-          url: `/api/users/${renameUserId}`,
-          headers: authHeaders,
-          failOnStatusCode: false,
-        })
-      }
-    })
-
-    it('registers a user for rename test', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/register',
-        body: { username: RENAME_USER, password: RENAME_PASS },
-      }).then(res => {
-        expect(res.status).to.eq(201)
-        renameToken = res.body.token
-
-        // Get user ID
-        cy.request({ url: '/api/users', headers: authHeaders }).then(listRes => {
-          const u = listRes.body.find(x => x.username === RENAME_USER)
-          renameUserId = u.id || u._id
-        })
-      })
-    })
-
-    it('GET /api/me returns username_changed=false initially', () => {
-      cy.request({
-        url: '/api/me',
-        headers: { Authorization: `Bearer ${renameToken}` },
-      }).then(res => {
-        expect(res.status).to.eq(200)
-        expect(res.body.username_changed).to.eq(false)
-      })
-    })
-
-    it('renames username successfully the first time', () => {
-      cy.request({
-        method: 'PUT',
-        url: '/api/me/username',
-        headers: { Authorization: `Bearer ${renameToken}` },
-        body: { username: 'cypress_renamed' },
-      }).then(res => {
-        expect(res.status).to.eq(200)
-        expect(res.body.ok).to.eq(true)
-        expect(res.body.username).to.eq('cypress_renamed')
-      })
-    })
-
-    it('GET /api/me returns username_changed=true after rename', () => {
-      cy.request({
-        url: '/api/me',
-        headers: { Authorization: `Bearer ${renameToken}` },
-      }).then(res => {
-        expect(res.body.username_changed).to.eq(true)
-      })
-    })
-
-    it('rejects second rename attempt', () => {
-      cy.request({
-        method: 'PUT',
-        url: '/api/me/username',
-        headers: { Authorization: `Bearer ${renameToken}` },
-        body: { username: 'cypress_another_name' },
-        failOnStatusCode: false,
-      }).then(res => {
-        expect(res.status).to.eq(400)
-      })
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // API: en_name auto-translation on recipe create (no explicit en_name)
-  // -------------------------------------------------------------------------
-  describe('API: en_name auto-translation on create', () => {
-    let recipeId
-
-    after(() => {
-      if (recipeId) {
-        cy.request({
-          method: 'DELETE',
-          url: `/api/recipes/${recipeId}`,
-          headers: authHeaders,
-          failOnStatusCode: false,
-        })
-      }
-    })
-
-    it('auto-translates en_name when creating recipe without en_name', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/recipes',
-        headers: authHeaders,
-        body: {
-          name: '排毒按摩',
-          ingredients: [{ oil_name: '薰衣草', drops: 3 }],
-          tags: [],
-        },
-      }).then(res => {
-        expect(res.status).to.be.oneOf([200, 201])
-        recipeId = res.body.id
-
-        cy.request('/api/recipes').then(listRes => {
-          const found = listRes.body.find(r => r.id === recipeId)
-          expect(found).to.exist
-          expect(found.en_name).to.be.a('string')
-          expect(found.en_name.length).to.be.greaterThan(0)
-          // auto_translate('排毒按摩') should produce 'Detox Massage'
-          expect(found.en_name).to.include('Detox')
-          expect(found.en_name).to.include('Massage')
-        })
-      })
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // API: Recipe name change auto-retranslates en_name
-  // -------------------------------------------------------------------------
-  describe('API: rename recipe auto-retranslates en_name', () => {
-    let recipeId
-
-    after(() => {
-      if (recipeId) {
-        cy.request({
-          method: 'DELETE',
-          url: `/api/recipes/${recipeId}`,
-          headers: authHeaders,
-          failOnStatusCode: false,
-        })
-      }
-    })
-
-    it('creates recipe with auto en_name, then renames to verify retranslation', () => {
-      cy.request({
-        method: 'POST',
-        url: '/api/recipes',
-        headers: authHeaders,
-        body: {
-          name: '助眠喷雾',
-          ingredients: [{ oil_name: '薰衣草', drops: 5 }],
-          tags: [],
-        },
-      }).then(res => {
-        recipeId = res.body.id
-
-        // Verify initial auto-translation
-        cy.request('/api/recipes').then(listRes => {
-          const r = listRes.body.find(x => x.id === recipeId)
-          expect(r.en_name).to.include('Sleep')
-
-          // Rename to completely different name
-          cy.request({
-            method: 'PUT',
-            url: `/api/recipes/${recipeId}`,
-            headers: authHeaders,
-            body: { name: '肩颈按摩' },
-          }).then(() => {
-            cy.request('/api/recipes').then(list2 => {
-              const r2 = list2.body.find(x => x.id === recipeId)
-              // Should now be retranslated to Neck & Shoulder Massage
-              expect(r2.en_name).to.include('Neck')
-              expect(r2.en_name).to.include('Massage')
-              // Should NOT contain Sleep anymore
-              expect(r2.en_name).to.not.include('Sleep')
-            })
-          })
-        })
-      })
-    })
-
-    it('does not retranslate when explicit en_name provided on update', () => {
-      cy.request({
-        method: 'PUT',
-        url: `/api/recipes/${recipeId}`,
-        headers: authHeaders,
-        body: { name: '免疫配方', en_name: 'my custom name' },
-      }).then(() => {
-        cy.request('/api/recipes').then(listRes => {
-          const r = listRes.body.find(x => x.id === recipeId)
-          expect(r.en_name).to.eq('My Custom Name') // title-cased
-        })
-      })
-    })
-  })
-
-  // -------------------------------------------------------------------------
-  // API: Delete user transfers diary to admin (with username appended)
-  // -------------------------------------------------------------------------
-  describe('API: delete user diary transfer with username', () => {
-    const XFER_USER = 'cypress_xfer_test'
-    const XFER_PASS = 'xfer1234'
-    let xferUserId
-    let xferToken
-
-    before(() => {
-      // Cleanup leftovers
-      cy.request({ url: '/api/users', headers: authHeaders }).then(res => {
-        const leftover = res.body.find(u => u.username === XFER_USER)
-        if (leftover) {
-          cy.request({
-            method: 'DELETE',
-            url: `/api/users/${leftover.id || leftover._id}`,
-            headers: authHeaders,
-            failOnStatusCode: false,
-          })
-        }
-      })
-    })
-
-    it('registers user, adds diary, deletes user, verifies transfer', () => {
-      // Register
-      cy.request({
-        method: 'POST',
-        url: '/api/register',
-        body: { username: XFER_USER, password: XFER_PASS },
-      }).then(regRes => {
-        xferToken = regRes.body.token
-
-        // Get user id
-        cy.request({ url: '/api/users', headers: authHeaders }).then(listRes => {
-          const u = listRes.body.find(x => x.username === XFER_USER)
-          xferUserId = u.id || u._id
-
-          const userAuth = { Authorization: `Bearer ${xferToken}` }
-
-          // Add unique diary entry
-          cy.request({
-            method: 'POST',
-            url: '/api/diary',
-            headers: userAuth,
-            body: {
-              name: 'PR28转移日记',
-              ingredients: [
-                { oil: '檀香', drops: 7 },
-                { oil: '岩兰草', drops: 3 },
-              ],
-              note: '转移测试PR28',
-            },
-          }).then(() => {
-            // Delete user
-            cy.request({
-              method: 'DELETE',
-              url: `/api/users/${xferUserId}`,
-              headers: authHeaders,
-            }).then(delRes => {
-              expect(delRes.body.ok).to.eq(true)
-
-              // Verify diary was transferred to admin with username appended
-              cy.request({
-                url: '/api/diary',
-                headers: authHeaders,
-              }).then(diaryRes => {
-                const transferred = diaryRes.body.find(
-                  d => d.name && d.name.includes('PR28转移日记') && d.name.includes(XFER_USER)
-                )
-                expect(transferred).to.exist
-                expect(transferred.note).to.eq('转移测试PR28')
-
-                // Cleanup
-                if (transferred) {
-                  cy.request({
-                    method: 'DELETE',
-                    url: `/api/diary/${transferred.id}`,
-                    headers: authHeaders,
-                    failOnStatusCode: false,
-                  })
-                }
-              })
-            })
-          })
-        })
-      })
-    })
-  })
-})

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

@@ -1,7 +1,8 @@
+// Helper: dismiss any modal that may cover the detail overlay (login modal, error dialog)
 function dismissModals() {
   cy.get('body').then($body => {
     if ($body.find('.login-overlay').length) {
-      cy.get('.login-overlay').click('topLeft')
+      cy.get('.login-overlay').click('topLeft')  // click backdrop to close
     }
     if ($body.find('.dialog-overlay').length) {
       cy.get('.dialog-btn-primary').click()
@@ -59,22 +60,51 @@ 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.get('.detail-overlay', { timeout: 5000 }).should('exist')
+    cy.get('.detail-overlay').then($el => {
+      if ($el.find(':contains("编辑")').filter('button').length) {
+        cy.contains('编辑').click()
+        cy.get('.editor-select, .editor-drops').should('exist')
+      } else {
+        cy.log('Edit button not available (not admin) — skipping')
+      }
+    })
   })
 
-  it('shows export card with doTERRA branding', () => {
+  it('shows add ingredient button in editor tab', () => {
-    cy.get('.export-card').should('exist')
+    cy.get('.recipe-card').first().click()
-    cy.contains('doTERRA').should('exist')
+    dismissModals()
+    cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
+    cy.get('.detail-overlay').then($el => {
+      if ($el.find(':contains("编辑")').filter('button').length) {
+        cy.contains('编辑').click()
+        cy.contains('添加精油').should('exist')
+      } else {
+        cy.log('Edit button not available (not admin) — skipping')
+      }
+    })
   })
 
-  it('shows language toggle', () => {
+  it('shows save image button', () => {
-    cy.contains('中文').should('exist')
+    cy.get('.recipe-card').first().click()
-    cy.contains('English').should('exist')
+    dismissModals()
+    cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
+    cy.contains('保存图片').should('exist')
   })
 })

frontend/package-lock.json

@@ -9,7 +9,6 @@
       "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",
@@ -2872,12 +2871,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",

frontend/package.json

@@ -15,7 +15,6 @@
   },
   "dependencies": {
     "exceljs": "^4.4.0",
-    "heic2any": "^0.0.4",
     "html2canvas": "^1.4.1",
     "pinia": "^2.3.1",
     "vue": "^3.5.32",

frontend/src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="isPreview" style="background:#e65100;color:white;text-align:center;padding:6px 16px;font-size:13px;font-weight:600;letter-spacing:0.5px;position:sticky;top:0;z-index:100">
-    ⚠️ 预览环境 · PR #{{ prId }} · 数据为生产副本，修改不影响正式环境 · {{ buildInfo }}
+    ⚠️ 预览环境 · PR #{{ prId }} · 数据为生产副本，修改不影响正式环境
   </div>
   <div class="app-header">
     <div class="header-inner">
@@ -15,7 +15,7 @@
       <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.username }} ▾</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>
@@ -88,7 +88,6 @@ const allTabs = [
 const visibleTabs = computed(() => allTabs.filter(t => {
   if (!t.hide) return true
   if (t.hide === 'admin') return auth.isAdmin
-  if (t.hide === 'editor') return auth.canEdit
   return true
 }))
 const unreadNotifCount = ref(0)
@@ -117,7 +116,6 @@ const hostname = window.location.hostname
 const prMatch = hostname.match(/^pr-(\d+)\./)
 const isPreview = !!prMatch
 const prId = prMatch ? prMatch[1] : ''
-const buildInfo = __BUILD_TIME__ || ''
 
 function handleTabClick(tab) {
   if (tab.require === 'login' && !auth.isLoggedIn) {

frontend/src/__tests__/inventoryCommercial.test.js

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

frontend/src/__tests__/newFeatures.test.js

@@ -1,135 +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', () => {
-    expect(matchesPinyinInitials('生姜', 's')).toBe(true)
-    expect(matchesPinyinInitials('生姜', 'sj')).toBe(true)
-    expect(matchesPinyinInitials('茶树', 'cs')).toBe(true)
-  })
-
-  it('matches substring and subsequence', () => {
-    expect(matchesPinyinInitials('茶树', 's')).toBe(true) // substring
-    expect(matchesPinyinInitials('新瑞活力身体紧致霜', 'js')).toBe(true) // subsequence
-  })
-
-  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('已审核')
-  })
-})
-
-// ---------------------------------------------------------------------------
-// English search
-// ---------------------------------------------------------------------------
-describe('English search matching', () => {
-  const { oilEn } = require('../composables/useOilTranslation')
-
-  it('oilEn returns English name for known oils', () => {
-    expect(oilEn('薰衣草')).toBe('Lavender')
-    expect(oilEn('茶树')).toBe('Tea Tree')
-    expect(oilEn('乳香')).toBe('Frankincense')
-  })
-
-  it('oilEn returns empty for unknown oils', () => {
-    expect(oilEn('不存在的油')).toBeFalsy()
-  })
-
-  it('English query detection', () => {
-    const isEn = (q) => /^[a-zA-Z\s]+$/.test(q)
-    expect(isEn('lavender')).toBe(true)
-    expect(isEn('Tea Tree')).toBe(true)
-    expect(isEn('薰衣草')).toBe(false)
-    expect(isEn('lav3')).toBe(false)
-  })
-
-  it('English matches oil name in recipe', () => {
-    const recipe = {
-      name: '助眠配方',
-      en_name: 'Sleep Aid Blend',
-      ingredients: [{ oil: '薰衣草', drops: 3 }],
-      tags: []
-    }
-    const q = 'lavender'
-    const isEn = /^[a-zA-Z\s]+$/.test(q)
-    const enNameMatch = isEn && (recipe.en_name || '').toLowerCase().includes(q)
-    const oilEnMatch = isEn && recipe.ingredients.some(ing => (oilEn(ing.oil) || '').toLowerCase().includes(q))
-    expect(oilEnMatch).toBe(true)
-    expect(enNameMatch).toBe(false)
-  })
-
-  it('English matches recipe en_name', () => {
-    const recipe = { name: '助眠', en_name: 'Sleep Aid Blend', ingredients: [], tags: [] }
-    const q = 'sleep'
-    const isEn = /^[a-zA-Z\s]+$/.test(q)
-    const enNameMatch = isEn && (recipe.en_name || '').toLowerCase().includes(q)
-    expect(enNameMatch).toBe(true)
-  })
-})

frontend/src/__tests__/polishFeatures.test.js

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

frontend/src/__tests__/pr27Features.test.js

@@ -1,446 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { recipeNameEn, oilEn } from '../composables/useOilTranslation'
-import { matchesPinyinInitials, getPinyinInitials, pinyinMatchScore } from '../composables/usePinyinMatch'
-
-// ---------------------------------------------------------------------------
-// EDITOR_ONLY_TAGS includes '已下架'
-// ---------------------------------------------------------------------------
-describe('EDITOR_ONLY_TAGS', () => {
-  it('includes 已审核', async () => {
-    const { EDITOR_ONLY_TAGS } = await import('../stores/recipes')
-    expect(EDITOR_ONLY_TAGS).toContain('已审核')
-  })
-
-  it('includes 已下架', async () => {
-    const { EDITOR_ONLY_TAGS } = await import('../stores/recipes')
-    expect(EDITOR_ONLY_TAGS).toContain('已下架')
-  })
-
-  it('is an array with at least 2 entries', async () => {
-    const { EDITOR_ONLY_TAGS } = await import('../stores/recipes')
-    expect(Array.isArray(EDITOR_ONLY_TAGS)).toBe(true)
-    expect(EDITOR_ONLY_TAGS.length).toBeGreaterThanOrEqual(2)
-  })
-})
-
-// ---------------------------------------------------------------------------
-// English drop/drops pluralization logic
-// ---------------------------------------------------------------------------
-describe('drop/drops pluralization', () => {
-  const pluralize = (n) => (n === 1 ? 'drop' : 'drops')
-
-  it('singular: 1 drop', () => {
-    expect(pluralize(1)).toBe('drop')
-  })
-
-  it('plural: 0 drops', () => {
-    expect(pluralize(0)).toBe('drops')
-  })
-
-  it('plural: 2 drops', () => {
-    expect(pluralize(2)).toBe('drops')
-  })
-
-  it('plural: 5 drops', () => {
-    expect(pluralize(5)).toBe('drops')
-  })
-})
-
-// ---------------------------------------------------------------------------
-// 已下架 tag filtering logic (pure function extraction)
-// ---------------------------------------------------------------------------
-describe('已下架 tag filtering', () => {
-  const recipes = [
-    { name: 'Active Recipe', tags: ['头疗'] },
-    { name: 'Delisted Recipe', tags: ['已下架'] },
-    { name: 'No Tags Recipe', tags: [] },
-    { name: 'Multi Tag', tags: ['热门', '已下架'] },
-    { name: 'Null Tags', tags: null },
-  ]
-
-  const filterDelisted = (list) =>
-    list.filter((r) => !r.tags || !r.tags.includes('已下架'))
-
-  it('removes recipes with 已下架 tag', () => {
-    const result = filterDelisted(recipes)
-    expect(result.map((r) => r.name)).not.toContain('Delisted Recipe')
-    expect(result.map((r) => r.name)).not.toContain('Multi Tag')
-  })
-
-  it('keeps recipes without 已下架 tag', () => {
-    const result = filterDelisted(recipes)
-    expect(result.map((r) => r.name)).toContain('Active Recipe')
-    expect(result.map((r) => r.name)).toContain('No Tags Recipe')
-  })
-
-  it('handles null tags gracefully', () => {
-    const result = filterDelisted(recipes)
-    expect(result.map((r) => r.name)).toContain('Null Tags')
-  })
-
-  it('returns empty array for all-delisted list', () => {
-    const all = [
-      { name: 'A', tags: ['已下架'] },
-      { name: 'B', tags: ['已下架', '其他'] },
-    ]
-    expect(filterDelisted(all)).toHaveLength(0)
-  })
-})
-
-// ---------------------------------------------------------------------------
-// recipeNameEn — front-end keyword translation
-// ---------------------------------------------------------------------------
-describe('recipeNameEn', () => {
-  it('translates 酸痛包 → Pain Relief Blend', () => {
-    expect(recipeNameEn('酸痛包')).toBe('Pain Relief Blend')
-  })
-
-  it('translates 助眠配方 → Sleep Aid Blend', () => {
-    expect(recipeNameEn('助眠配方')).toBe('Sleep Aid Blend')
-  })
-
-  it('translates 头痛 → Headache', () => {
-    expect(recipeNameEn('头痛')).toBe('Headache')
-  })
-
-  it('translates 肩颈按摩 → Neck & Shoulder Massage', () => {
-    expect(recipeNameEn('肩颈按摩')).toBe('Neck & Shoulder Massage')
-  })
-
-  it('translates 湿疹舒缓 → Eczema Soothing', () => {
-    expect(recipeNameEn('湿疹舒缓')).toBe('Eczema Soothing')
-  })
-
-  it('translates 淋巴排毒 → Lymph Detox', () => {
-    expect(recipeNameEn('淋巴排毒')).toBe('Lymph Detox')
-  })
-
-  it('translates 灰指甲 → Nail Fungus', () => {
-    expect(recipeNameEn('灰指甲')).toBe('Nail Fungus')
-  })
-
-  it('translates 缓解焦虑 → Relief Anxiety', () => {
-    expect(recipeNameEn('缓解焦虑')).toBe('Relief Anxiety')
-  })
-
-  it('returns original name for unknown text', () => {
-    expect(recipeNameEn('XYZXYZ')).toBe('XYZXYZ')
-  })
-
-  it('returns empty/null for empty/null input', () => {
-    expect(recipeNameEn('')).toBe('')
-    expect(recipeNameEn(null)).toBeNull()
-  })
-
-  it('does not duplicate keywords', () => {
-    // 酸痛 maps to Pain Relief; should not appear twice
-    const result = recipeNameEn('酸痛酸痛')
-    expect(result).toBe('Pain Relief')
-  })
-})
-
-// ---------------------------------------------------------------------------
-// Duplicate oil prevention logic
-// ---------------------------------------------------------------------------
-describe('duplicate oil prevention', () => {
-  it('detects duplicate oil in ingredient list', () => {
-    const ings = [
-      { oil: '薰衣草', drops: 3 },
-      { oil: '茶树', drops: 2 },
-    ]
-    const newOil = '薰衣草'
-    const isDup = ings.some(i => i.oil === newOil)
-    expect(isDup).toBe(true)
-  })
-
-  it('allows non-duplicate oil', () => {
-    const ings = [
-      { oil: '薰衣草', drops: 3 },
-      { oil: '茶树', drops: 2 },
-    ]
-    const newOil = '乳香'
-    const isDup = ings.some(i => i.oil === newOil)
-    expect(isDup).toBe(false)
-  })
-
-  it('allows same oil for the same row (editing current)', () => {
-    const ing = { oil: '薰衣草', drops: 3 }
-    const ings = [ing, { oil: '茶树', drops: 2 }]
-    // When selecting for the same row, exclude self
-    const isDup = ings.some(i => i !== ing && i.oil === '薰衣草')
-    expect(isDup).toBe(false)
-  })
-
-  it('handles empty ingredient list (no duplicates)', () => {
-    const ings = []
-    const isDup = ings.some(i => i.oil === '薰衣草')
-    expect(isDup).toBe(false)
-  })
-})
-
-// ---------------------------------------------------------------------------
-// recipeNameEn — additional edge cases for PR28
-// ---------------------------------------------------------------------------
-describe('recipeNameEn — PR28 additional cases', () => {
-  it('translates 排毒配方 → Detox Blend', () => {
-    expect(recipeNameEn('排毒配方')).toBe('Detox Blend')
-  })
-
-  it('translates 呼吸系统护理 → Respiratory System Care', () => {
-    expect(recipeNameEn('呼吸系统护理')).toBe('Respiratory System Care')
-  })
-
-  it('translates 儿童助眠 → Children\'s Sleep Aid', () => {
-    expect(recipeNameEn('儿童助眠')).toBe("Children's Sleep Aid")
-  })
-
-  it('translates 美容按摩 → Beauty Massage', () => {
-    expect(recipeNameEn('美容按摩')).toBe('Beauty Massage')
-  })
-
-  it('handles mixed Chinese and ASCII text', () => {
-    // Unknown Chinese chars are skipped; if ASCII appears, it's kept
-    const result = recipeNameEn('testBlend')
-    // No Chinese keyword matches, falls back to original
-    expect(result).toBe('testBlend')
-  })
-
-  it('handles single-keyword name', () => {
-    expect(recipeNameEn('免疫')).toBe('Immunity')
-  })
-
-  it('translates compound: 肩颈按摩配方 → Neck & Shoulder Massage Blend', () => {
-    expect(recipeNameEn('肩颈按摩配方')).toBe('Neck & Shoulder Massage Blend')
-  })
-})
-
-// ---------------------------------------------------------------------------
-// oilEn — English oil name translation
-// ---------------------------------------------------------------------------
-describe('oilEn', () => {
-  it('translates known oils', () => {
-    expect(oilEn('薰衣草')).toBe('Lavender')
-    expect(oilEn('茶树')).toBe('Tea Tree')
-    expect(oilEn('乳香')).toBe('Frankincense')
-  })
-
-  it('handles 复方 suffix removal', () => {
-    expect(oilEn('舒缓复方')).toBe('Past Tense')
-  })
-
-  it('handles 复方 suffix addition', () => {
-    // '呼吸' maps via '呼吸复方' → 'Breathe'
-    expect(oilEn('呼吸')).toBe('Breathe')
-  })
-
-  it('returns empty string for unknown oil', () => {
-    expect(oilEn('不存在的油')).toBe('')
-  })
-})
-
-// ---------------------------------------------------------------------------
-// Case-insensitive username logic (pure function)
-// ---------------------------------------------------------------------------
-describe('case-insensitive username matching', () => {
-  const matchCaseInsensitive = (input, existing) =>
-    existing.some(u => u.toLowerCase() === input.toLowerCase())
-
-  it('detects duplicate usernames case-insensitively', () => {
-    const existing = ['TestUser', 'Alice', 'Bob']
-    expect(matchCaseInsensitive('testuser', existing)).toBe(true)
-    expect(matchCaseInsensitive('TESTUSER', existing)).toBe(true)
-    expect(matchCaseInsensitive('TestUser', existing)).toBe(true)
-  })
-
-  it('allows unique username', () => {
-    const existing = ['TestUser', 'Alice']
-    expect(matchCaseInsensitive('Charlie', existing)).toBe(false)
-  })
-
-  it('is case-insensitive for mixed-case inputs', () => {
-    const existing = ['alice']
-    expect(matchCaseInsensitive('Alice', existing)).toBe(true)
-    expect(matchCaseInsensitive('ALICE', existing)).toBe(true)
-    expect(matchCaseInsensitive('aLiCe', existing)).toBe(true)
-  })
-})
-
-// ---------------------------------------------------------------------------
-// One-time username change logic
-// ---------------------------------------------------------------------------
-describe('one-time username change guard', () => {
-  it('blocks rename when username_changed is truthy', () => {
-    const user = { username_changed: 1 }
-    expect(!!user.username_changed).toBe(true)
-  })
-
-  it('allows rename when username_changed is falsy', () => {
-    const user = { username_changed: 0 }
-    expect(!!user.username_changed).toBe(false)
-  })
-
-  it('allows rename when username_changed is undefined', () => {
-    const user = {}
-    expect(!!user.username_changed).toBe(false)
-  })
-})
-
-// ---------------------------------------------------------------------------
-// Pinyin matching — PR29 extended coverage
-// ---------------------------------------------------------------------------
-describe('pinyin matching — extended oil names', () => {
-  it('matches mlk → 麦卢卡', () => {
-    expect(matchesPinyinInitials('麦卢卡', 'mlk')).toBe(true)
-  })
-
-  it('matches tx → 檀香', () => {
-    expect(matchesPinyinInitials('檀香', 'tx')).toBe(true)
-  })
-
-  it('matches xm → 香茅', () => {
-    expect(matchesPinyinInitials('香茅', 'xm')).toBe(true)
-  })
-
-  it('matches gbxz → 古巴香脂', () => {
-    expect(matchesPinyinInitials('古巴香脂', 'gbxz')).toBe(true)
-  })
-
-  it('matches my → 没药', () => {
-    expect(matchesPinyinInitials('没药', 'my')).toBe(true)
-  })
-
-  it('matches xhx → 小茴香', () => {
-    expect(matchesPinyinInitials('小茴香', 'xhx')).toBe(true)
-  })
-
-  it('matches jybh → 椒样薄荷', () => {
-    expect(matchesPinyinInitials('椒样薄荷', 'jybh')).toBe(true)
-  })
-
-  it('matches xbynz → 西班牙牛至', () => {
-    expect(matchesPinyinInitials('西班牙牛至', 'xbynz')).toBe(true)
-  })
-
-  it('matches sc → 顺畅呼吸 prefix', () => {
-    expect(matchesPinyinInitials('顺畅呼吸', 'sc')).toBe(true)
-  })
-
-  it('does not match wrong initials', () => {
-    expect(matchesPinyinInitials('麦卢卡', 'abc')).toBe(false)
-  })
-
-  it('getPinyinInitials returns correct string', () => {
-    expect(getPinyinInitials('麦卢卡')).toBe('mlk')
-    expect(getPinyinInitials('檀香')).toBe('tx')
-    expect(getPinyinInitials('没药')).toBe('my')
-  })
-})
-
-// ---------------------------------------------------------------------------
-// Viewer tag visibility — PR29
-// ---------------------------------------------------------------------------
-describe('viewer tag visibility logic', () => {
-  const EDITOR_ONLY_TAGS_VAL = ['已审核', '已下架']
-
-  it('editor sees all tags', () => {
-    const allTags = ['美容', '儿童', '已审核', '已下架']
-    const canEdit = true
-    const visible = canEdit ? allTags : []
-    expect(visible).toEqual(allTags)
-  })
-
-  it('viewer sees no public tags', () => {
-    const canEdit = false
-    const myDiary = [
-      { tags: ['我的标签'] },
-      { tags: ['我的标签', '另一个'] },
-    ]
-    // Viewer: collect tags from own diary only
-    const myTags = new Set()
-    for (const d of myDiary) {
-      for (const t of (d.tags || [])) myTags.add(t)
-    }
-    const visible = canEdit ? ['美容', '已审核'] : [...myTags]
-    expect(visible).toContain('我的标签')
-    expect(visible).toContain('另一个')
-    expect(visible).not.toContain('美容')
-    expect(visible).not.toContain('已审核')
-  })
-
-  it('viewer with no diary tags sees empty', () => {
-    const myDiary = []
-    const myTags = new Set()
-    for (const d of myDiary) {
-      for (const t of (d.tags || [])) myTags.add(t)
-    }
-    expect([...myTags]).toHaveLength(0)
-  })
-})
-
-// ---------------------------------------------------------------------------
-// PR30: Pinyin subsequence matching + pinyinMatchScore
-// ---------------------------------------------------------------------------
-describe('pinyin subsequence matching — PR30', () => {
-  it('js matches 紧致霜 via subsequence', () => {
-    expect(matchesPinyinInitials('新瑞活力身体紧致霜', 'js')).toBe(true)
-  })
-
-  it('prefix match scores 0', () => {
-    expect(pinyinMatchScore('麦卢卡', 'mlk')).toBe(0)
-  })
-
-  it('substring match scores 1', () => {
-    expect(pinyinMatchScore('椒样薄荷', 'ybh')).toBe(1)
-  })
-
-  it('subsequence match scores 2', () => {
-    expect(pinyinMatchScore('新瑞活力身体紧致霜', 'js')).toBe(2)
-  })
-
-  it('no match scores -1', () => {
-    expect(pinyinMatchScore('薰衣草', 'zz')).toBe(-1)
-  })
-
-  it('product names have pinyin', () => {
-    expect(getPinyinInitials('身体紧致霜')).toBe('stjzs')
-    expect(getPinyinInitials('深层净肤面膜')).toBe('scjfmm')
-    expect(getPinyinInitials('青春无龄保湿霜')).toBe('qcwlbss')
-  })
-})
-
-// ---------------------------------------------------------------------------
-// PR30: Unit system (drop/ml/g/capsule)
-// ---------------------------------------------------------------------------
-describe('unit system — PR30', () => {
-  const UNIT_LABELS = {
-    drop: { zh: '滴' },
-    ml: { zh: 'ml' },
-    g: { zh: 'g' },
-    capsule: { zh: '颗' },
-  }
-
-  it('maps unit to correct label', () => {
-    expect(UNIT_LABELS['drop'].zh).toBe('滴')
-    expect(UNIT_LABELS['ml'].zh).toBe('ml')
-    expect(UNIT_LABELS['g'].zh).toBe('g')
-    expect(UNIT_LABELS['capsule'].zh).toBe('颗')
-  })
-
-  it('volume display priority: stored > calculated > product sum', () => {
-    // Stored volume takes priority
-    const recipe1 = { volume: 'single', ingredients: [{ oil: '椰子油', drops: 96 }] }
-    const vol1 = recipe1.volume === 'single' ? '单次' : ''
-    expect(vol1).toBe('单次')
-
-    // No stored volume, has coconut oil → calculate
-    const recipe2 = { volume: '', ingredients: [{ oil: '薰衣草', drops: 3 }, { oil: '椰子油', drops: 90 }] }
-    const total = recipe2.ingredients.reduce((s, i) => s + i.drops, 0)
-    const ml = Math.round(total / 18.6)
-    expect(ml).toBe(5)
-
-    // No coconut oil, has product → show product volume
-    const recipe3 = { volume: '', ingredients: [{ oil: '薰衣草', drops: 3 }, { oil: '玫瑰护手霜', drops: 30 }] }
-    const hasProduct = recipe3.ingredients.some(i => i.oil === '玫瑰护手霜')
-    expect(hasProduct).toBe(true)
-  })
-})

frontend/src/__tests__/smartPaste.test.js

@@ -6,7 +6,6 @@ import {
   parseOilChunk,
   parseSingleBlock,
   splitRawIntoBlocks,
-  parseMultiRecipes,
   OIL_HOMOPHONES,
 } from '../composables/useSmartPaste'
 import prodData from './fixtures/production-data.json'
@@ -203,22 +202,22 @@ describe('parseOilChunk', () => {
     expect(result[1]).toEqual({ oil: '永久花', drops: 10 })
   })
 
-  it('parses "薰衣草3ml" → [{薰衣草, drops: 60, _ml: 3}] (3ml * 20)', () => {
+  it('parses "薰衣草3ml" → [{薰衣草, drops: 60}] (3ml * 20)', () => {
     const result = parseOilChunk('薰衣草3ml', oilNames)
     expect(result).toHaveLength(1)
-    expect(result[0]).toMatchObject({ oil: '薰衣草', drops: 60, _ml: 3 })
+    expect(result[0]).toEqual({ oil: '薰衣草', drops: 60 })
   })
 
-  it('parses "薰衣草5毫升" → [{薰衣草, drops: 100, _ml: 5}] (5 * 20)', () => {
+  it('parses "薰衣草5毫升" → [{薰衣草, drops: 100}] (5 * 20)', () => {
     const result = parseOilChunk('薰衣草5毫升', oilNames)
     expect(result).toHaveLength(1)
-    expect(result[0]).toMatchObject({ oil: '薰衣草', drops: 100, _ml: 5 })
+    expect(result[0]).toEqual({ oil: '薰衣草', drops: 100 })
   })
 
   it('parses "薰衣草3ML" → case-insensitive ml', () => {
     const result = parseOilChunk('薰衣草3ML', oilNames)
     expect(result).toHaveLength(1)
-    expect(result[0]).toMatchObject({ oil: '薰衣草', drops: 60, _ml: 3 })
+    expect(result[0]).toEqual({ oil: '薰衣草', drops: 60 })
   })
 
   it('handles decimal drops "乳香1.5"', () => {
@@ -234,52 +233,10 @@ describe('parseOilChunk', () => {
     expect(result[0]).toEqual({ oil: '薰衣草', drops: 5 })
   })
 
-  it('parses oil name without number → default 1 drop', () => {
+  it('returns empty array for text with no numbers', () => {
+    // The regex requires a number, so pure text yields nothing
     const result = parseOilChunk('薰衣草', oilNames)
-    expect(result).toHaveLength(1)
+    expect(result).toHaveLength(0)
-    expect(result[0]).toEqual({ oil: '薰衣草', drops: 1 })
-  })
-
-  it('parses multiple oil names without numbers', () => {
-    const result = parseOilChunk('薰衣草 茶树 乳香', oilNames)
-    expect(result).toHaveLength(3)
-    expect(result.map(r => r.oil)).toEqual(['薰衣草', '茶树', '乳香'])
-    expect(result.every(r => r.drops === 1)).toBe(true)
-  })
-
-  it('parses mixed: some with numbers, some without', () => {
-    const result = parseOilChunk('薰衣草3茶树乳香2', oilNames)
-    expect(result).toHaveLength(3)
-    expect(result[0]).toEqual({ oil: '薰衣草', drops: 3 })
-    expect(result[1]).toEqual({ oil: '茶树', drops: 1 })
-    expect(result[2]).toEqual({ oil: '乳香', drops: 2 })
-  })
-
-  it('parses trailing oil after last number', () => {
-    const result = parseOilChunk('薰衣草3茶树2乳香', oilNames)
-    expect(result).toHaveLength(3)
-    expect(result[2]).toEqual({ oil: '乳香', drops: 1 })
-  })
-
-  it('preserves _ml for ml unit (coconut oil)', () => {
-    const result = parseOilChunk('椰子油15ml', oilNames)
-    expect(result).toHaveLength(1)
-    expect(result[0]._ml).toBe(15)
-    expect(result[0].drops).toBe(300)
-  })
-
-  it('no _ml for drops unit', () => {
-    const result = parseOilChunk('椰子油15滴', oilNames)
-    expect(result).toHaveLength(1)
-    expect(result[0]._ml).toBeUndefined()
-    expect(result[0].drops).toBe(15)
-  })
-
-  it('no _ml for no unit', () => {
-    const result = parseOilChunk('椰子油15', oilNames)
-    expect(result).toHaveLength(1)
-    expect(result[0]._ml).toBeUndefined()
-    expect(result[0].drops).toBe(15)
   })
 })
 
@@ -306,7 +263,7 @@ describe('parseSingleBlock', () => {
 
   it('handles recipe with no name (all parts have oils)', () => {
     const result = parseSingleBlock('薰衣草10，茶树5', oilNames)
-    expect(result.name).toBe('')
+    expect(result.name).toBe('未命名配方')
     expect(result.ingredients).toHaveLength(2)
   })
 
@@ -413,114 +370,3 @@ describe('OIL_HOMOPHONES', () => {
     expect(OIL_HOMOPHONES['薰衣草油']).toBe('薰衣草')
   })
 })
-
-// ---------------------------------------------------------------------------
-// findOil — short string fuzzy match restriction
-// ---------------------------------------------------------------------------
-describe('findOil — short string protection', () => {
-  it('does not fuzzy-match 2-char non-oil text', () => {
-    // 美容 should NOT match any oil via edit distance
-    expect(findOil('美容', oilNames)).toBeNull()
-  })
-
-  it('still matches 2-char exact oil names', () => {
-    expect(findOil('乳香', oilNames)).toBe('乳香')
-    expect(findOil('茶树', oilNames)).toBe('茶树')
-  })
-
-  it('still matches 2-char homophones', () => {
-    expect(findOil('如香', oilNames)).toBe('乳香')
-  })
-
-  it('still matches 2-char substrings', () => {
-    // 薄荷 is a substring of 椒样薄荷 etc.
-    const result = findOil('薄荷', oilNames)
-    expect(result).not.toBeNull()
-  })
-
-  it('fuzzy matches 3+ char inputs via edit distance', () => {
-    // 永久化 → 永久花 (1 edit)
-    expect(findOil('永久化', oilNames)).toBe('永久花')
-  })
-})
-
-// ---------------------------------------------------------------------------
-// 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('splits two recipes by name detection', () => {
-    const results = parseMultiRecipes('助眠 薰衣草3 茶树2 头疗 柠檬5 椒样薄荷3', oilNames)
-    expect(results).toHaveLength(2)
-    expect(results[0].name).toBe('助眠')
-    expect(results[1].name).toBe('头疗')
-  })
-
-  it('splits by blank lines', () => {
-    const results = parseMultiRecipes('助眠\n薰衣草3\n\n头疗\n柠檬5', oilNames)
-    expect(results).toHaveLength(2)
-    expect(results[0].name).toBe('助眠')
-    expect(results[1].name).toBe('头疗')
-  })
-
-  it('splits by semicolons when both sides have oils', () => {
-    const results = parseMultiRecipes('助眠，薰衣草3，茶树2;头疗，柠檬5', oilNames)
-    expect(results).toHaveLength(2)
-  })
-
-  it('does NOT split by semicolons when one side has no oil', () => {
-    const results = parseMultiRecipes('助眠;薰衣草3，茶树2', oilNames)
-    expect(results).toHaveLength(1)
-    expect(results[0].ingredients.length).toBeGreaterThanOrEqual(2)
-  })
-
-  it('handles oils without numbers (default 1 drop)', () => {
-    const results = parseMultiRecipes('头疗，薰衣草，茶树，乳香', oilNames)
-    expect(results).toHaveLength(1)
-    expect(results[0].name).toBe('头疗')
-    expect(results[0].ingredients).toHaveLength(3)
-    expect(results[0].ingredients.every(i => i.drops === 1)).toBe(true)
-  })
-
-  it('recognizes non-oil text with number as recipe name (first part)', () => {
-    // 美容1 is not an oil, should be treated as name "美容"
-    const results = parseMultiRecipes('美容1 牛至2 乳香3', oilNames)
-    expect(results).toHaveLength(1)
-    expect(results[0].name).toBe('美容')
-    expect(results[0].ingredients).toHaveLength(2)
-  })
-
-  it('returns empty name when no name detected', () => {
-    const results = parseMultiRecipes('薰衣草3，茶树2', oilNames)
-    expect(results).toHaveLength(1)
-    expect(results[0].name).toBe('')
-  })
-
-  it('deduplicates ingredients within a recipe', () => {
-    const results = parseMultiRecipes('测试 薰衣草3 薰衣草2', oilNames)
-    expect(results[0].ingredients).toHaveLength(1)
-    expect(results[0].ingredients[0].drops).toBe(5)
-  })
-
-  it('handles coconut oil with ml unit', () => {
-    const results = parseMultiRecipes('测试 薰衣草3 椰子油15ml', oilNames)
-    const coco = results[0].ingredients.find(i => i.oil === '椰子油')
-    expect(coco).toBeTruthy()
-    expect(coco._ml).toBe(15)
-  })
-
-  it('handles complex real-world multi-recipe input', () => {
-    const input = '美容 牛至2 迷迭香3 乳香4 椰子油15 头疗七八九 檀香3 乳香4 薰衣草3'
-    const results = parseMultiRecipes(input, oilNames)
-    expect(results).toHaveLength(2)
-    expect(results[0].name).toBe('美容')
-    expect(results[0].ingredients.find(i => i.oil === '椰子油')).toBeTruthy()
-    expect(results[1].name).toBe('头疗七八九')
-  })
-})

frontend/src/components/LoginModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login-overlay" @mousedown.self="$emit('close')">
+  <div class="login-overlay" @click.self="$emit('close')">
     <div class="login-card">
       <div class="login-header">
         <span
@@ -37,6 +37,14 @@
           class="login-input"
           @keydown.enter="submit"
         />
+        <input
+          v-if="mode === 'register'"
+          v-model="displayName"
+          type="text"
+          placeholder="显示名称（可选）"
+          class="login-input"
+          @keydown.enter="submit"
+        />
 
         <div v-if="errorMsg" class="login-error">{{ errorMsg }}</div>
 
@@ -72,6 +80,7 @@ const mode = ref('login')
 const username = ref('')
 const password = ref('')
 const confirmPassword = ref('')
+const displayName = ref('')
 const errorMsg = ref('')
 const loading = ref(false)
 const showFeedback = ref(false)
@@ -100,7 +109,11 @@ async function submit() {
       await auth.login(username.value.trim(), password.value)
       ui.showToast('登录成功')
     } else {
-      await auth.register(username.value.trim(), password.value)
+      await auth.register(
+        username.value.trim(),
+        password.value,
+        displayName.value.trim() || username.value.trim()
+      )
       ui.showToast('注册成功')
     }
     emit('close')

frontend/src/components/RecipeCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="recipe-card" @click="$emit('click', index)">
-    <div class="recipe-card-name">{{ recipe.name }} <span v-if="volumeLabel" class="recipe-card-volume">{{ volumeLabel }}</span></div>
+    <div class="recipe-card-name" :style="{ fontSize: recipe.name.length > 12 ? (recipe.name.length > 20 ? '12px' : '14px') : '16px' }">{{ 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>
@@ -20,9 +20,11 @@
 <script setup>
 import { computed } from 'vue'
 import { useOilsStore } from '../stores/oils'
-import { useRecipesStore, EDITOR_ONLY_TAGS } from '../stores/recipes'
+import { useRecipesStore } from '../stores/recipes'
 import { useAuthStore } from '../stores/auth'
 
+const EDITOR_ONLY_TAGS = ['已审核']
+
 const props = defineProps({
   recipe: { type: Object, required: true },
   index: { type: Number, required: true },
@@ -36,46 +38,15 @@ const auth = useAuthStore()
 
 const visibleTags = computed(() => {
   if (!props.recipe.tags) return []
-  if (!auth.canEdit) return []
+  if (auth.canEdit) return props.recipe.tags
-  const tags = [...props.recipe.tags]
+  return props.recipe.tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
-  return tags.sort((a, b) => a.localeCompare(b, 'zh'))
 })
 
 const oilNames = computed(() =>
-  [...props.recipe.ingredients].sort((a, b) => a.oil.localeCompare(b.oil, 'zh')).map(i => i.oil).join('、')
+  props.recipe.ingredients.map(i => i.oil).join('、')
 )
 const priceInfo = computed(() => oilsStore.fmtCostWithRetail(props.recipe.ingredients))
 const isFav = computed(() => recipesStore.isFavorite(props.recipe))
-
-const volumeLabel = computed(() => {
-  // Priority 1: stored volume from editor selection
-  const vol = props.recipe.volume
-  if (vol) {
-    if (vol === 'single') return '单次'
-    if (vol === 'custom') return ''
-    if (/^\d+$/.test(vol)) return `${vol}ml`
-    return vol
-  }
-  // Priority 2: calculate from ingredients
-  const ings = props.recipe.ingredients || []
-  const coco = ings.find(i => i.oil === '椰子油')
-  if (coco && coco.drops) {
-    const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
-    const ml = totalDrops / 18.6
-    if (ml <= 2) return '单次'
-    return `${Math.round(ml)}ml`
-  }
-  // Priority 3: sum portion products as ml
-  let totalMl = 0
-  let hasProduct = false
-  for (const ing of ings) {
-    if (!oilsStore.isPortionUnit(ing.oil)) continue
-    hasProduct = true
-    totalMl += ing.drops || 0
-  }
-  if (hasProduct && totalMl > 0) return `${Math.round(totalMl)}ml`
-  return ''
-})
 </script>
 
 <style scoped>
@@ -129,13 +100,6 @@ const volumeLabel = computed(() => {
   line-height: 1.7;
 }
 
-.recipe-card-volume {
-  font-size: 10px;
-  color: #b0aab5;
-  font-weight: 400;
-  margin-left: 4px;
-}
-
 .recipe-card-bottom {
   display: flex;
   justify-content: space-between;

frontend/src/components/RecipeDetailOverlay.vue

@@ -1,21 +1,24 @@
 <template>
-  <div class="detail-overlay" @mousedown.self="$emit('close')">
+  <div class="detail-overlay" @click.self="$emit('close')">
     <div class="detail-panel">
       <!-- ==================== CARD VIEW ==================== -->
       <div v-if="viewMode === 'card'" class="detail-card-view">
         <!-- Top bar with close + edit -->
         <div class="card-header">
           <div class="card-top-actions">
-            <template v-if="!props.isDiary">
+            <button class="action-btn action-btn-fav action-btn-sm" @click="handleToggleFavorite">
-              <button class="action-btn action-btn-fav action-btn-sm" @click="handleToggleFavorite">
+              {{ isFav ? '★ 已收藏' : '☆ 收藏' }}
-                {{ isFav ? '★ 已收藏' : '☆ 收藏' }}
+            </button>
-              </button>
+            <button v-if="!props.isDiary" class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
-              <button class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
+              📔 存为我的
-                📔 存为我的
+            </button>
-              </button>
-            </template>
           </div>
           <div style="flex:1"></div>
+          <button
+            v-if="canEditThisRecipe"
+            class="action-btn action-btn-sm"
+            @click="goEditInManager"
+          >编辑</button>
           <button class="detail-close-btn" @click="handleClose">✕</button>
         </div>
 
@@ -49,7 +52,7 @@
           <!-- Background image overlay -->
           <div v-if="brand.brand_bg" style="position:absolute;inset:0;width:100%;height:100%;background-size:cover;background-position:center;opacity:0.12;pointer-events:none;z-index:0" :style="{ backgroundImage: `url('${brand.brand_bg}')` }"></div>
           <!-- QR: top-right -->
-          <div v-if="brand.qr_code" style="position:absolute;top:36px;right:36px;display:flex;flex-direction:column;gap:3px;z-index:3" :style="{ alignItems: (brand.brand_align === 'left' ? 'flex-start' : brand.brand_align === 'right' ? 'flex-end' : 'center') }">
+          <div v-if="brand.qr_code" style="position:absolute;top:20px;right:16px;display:flex;flex-direction:column;align-items:center;gap:3px;z-index:3">
             <img :src="brand.qr_code" crossorigin="anonymous" style="width:54px;height:54px;object-fit:cover;border-radius:6px;box-shadow:0 2px 6px rgba(0,0,0,0.1)" />
             <div v-if="brand.brand_name" :style="{ textAlign: brand.brand_align || 'center' }" style="font-size:7px;color:var(--text-light);line-height:1.3;max-width:68px;white-space:pre-line">{{ brand.brand_name }}</div>
           </div>
@@ -58,13 +61,13 @@
             <div class="ec-subtitle">
               {{ cardLang === 'en' ? 'doTERRA · Gifts of the Earth' : 'doTERRA · 来自大地的礼物' }}
             </div>
-            <div class="ec-title" :style="{ fontSize: cardTitleSize }">{{ getCardRecipeName() }}</div>
+            <div class="ec-title">{{ getCardRecipeName() }}</div>
             <div style="width:80px;height:2px;background:linear-gradient(90deg,var(--sage),var(--gold));border-radius:2px;margin:14px 0"></div>
 
             <ul style="list-style:none;margin-bottom:20px;padding:0">
               <li v-for="(ing, i) in cardIngredients" :key="i" class="ec-ing">
                 <span class="ec-oil-name">{{ getCardOilName(ing.oil) }}</span>
-                <span class="ec-drops">{{ ing.drops }} {{ oilsStore.unitLabelPlural(ing.oil, ing.drops, cardLang) }}</span>
+                <span class="ec-drops">{{ ing.drops }} {{ cardLang === 'en' ? 'drops' : '滴' }}</span>
                 <span class="ec-cost">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * ing.drops) }}</span>
                 <span v-if="hasRetailForOil(ing.oil) && retailPerDrop(ing.oil) > oilsStore.pricePerDrop(ing.oil)" class="ec-retail">{{ oilsStore.fmtPrice(retailPerDrop(ing.oil) * ing.drops) }}</span>
               </li>
@@ -98,7 +101,7 @@
           <button class="action-btn" @click="saveImage">💾 保存图片</button>
           <button class="action-btn" @click="copyText">📋 复制文字</button>
           <button
-            v-if="cardLang === 'en' && authStore.isAdmin"
+            v-if="cardLang === 'en' && authStore.canManage"
             class="action-btn"
             @click="openTranslationEditor"
           >✏️ 修改翻译</button>
@@ -162,7 +165,7 @@
             <select v-model.number="dilutionRatio" class="editor-select" style="width:60px">
               <option v-for="n in [3,4,5,6,7,8,9,10,12,15,20]" :key="n" :value="n">{{ n }}</option>
             </select>
-            <span class="ratio-hint">时，纯精油总数约为 {{ editorSuggestedEo }} 滴，现在为 {{ editorEoDrops }} 滴</span>
+            <span class="ratio-hint">纯精油总数约为 {{ editorSuggestedEo }} 滴</span>
           </div>
         </div>
 
@@ -170,7 +173,7 @@
         <div class="editor-section">
           <table class="editor-table">
             <thead>
-              <tr><th>成分</th><th>用量</th><th>单价</th><th>小计</th><th></th></tr>
+              <tr><th>精油</th><th>滴数</th><th>单价/滴</th><th>小计</th><th></th></tr>
             </thead>
             <tbody>
               <tr v-for="(ing, i) in editEoIngredients" :key="'eo-'+i">
@@ -180,13 +183,8 @@
                     <option v-for="name in oilsStore.oilNames" :key="name" :value="name">{{ name }}</option>
                   </select>
                 </td>
-                <td>
+                <td><input v-model.number="ing.drops" type="number" min="0.5" step="0.5" class="editor-drops" /></td>
-                  <div class="drops-with-unit">
+                <td class="ing-ppd">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil)) : '-' }}</td>
-                    <input v-model.number="ing.drops" type="number" min="0.5" step="0.5" class="editor-drops" />
-                    <span class="unit-hint">{{ oilsStore.unitLabel(ing.oil) }}</span>
-                  </div>
-                </td>
-                <td class="ing-ppd">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil)) : '-' }}/{{ oilsStore.unitLabel(ing.oil) }}</td>
                 <td class="ing-cost">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * (ing.drops || 0)) : '-' }}</td>
                 <td><button class="remove-row-btn" @click="editIngredients.splice(editIngredients.indexOf(ing), 1)">✕</button></td>
               </tr>
@@ -590,15 +588,6 @@ function getCardRecipeName() {
   return displayRecipe.value.name
 }
 
-const cardTitleSize = computed(() => {
-  const name = getCardRecipeName()
-  const len = name.length
-  if (len <= 6) return '26px'
-  if (len <= 10) return '22px'
-  if (len <= 15) return '18px'
-  return '16px'
-})
-
 // ---- Favorite ----
 async function handleToggleFavorite() {
   if (!authStore.isLoggedIn) {
@@ -632,10 +621,15 @@ async function saveToDiary() {
   }
   const trimmed = name.trim()
   const dupDiary = diaryStore.userDiary.some(d => d.name === trimmed)
+  const dupPublic = recipesStore.recipes.some(r => r.name === trimmed)
   if (dupDiary) {
     ui.showToast('我的配方中已有同名配方「' + trimmed + '」')
     return
   }
+  if (dupPublic) {
+    ui.showToast('公共配方库中已有同名配方「' + trimmed + '」')
+    return
+  }
   try {
     const payload = {
       name: name.trim(),
@@ -1147,18 +1141,19 @@ async function saveRecipe() {
   font-size: 11px;
   letter-spacing: 3px;
   color: var(--sage);
-  margin-bottom: 6px;
+  margin-bottom: 8px;
-  margin-top: -4px;
   white-space: nowrap;
 }
 .ec-title {
+  font-size: 26px;
   font-weight: 700;
   color: var(--text-dark);
   margin-bottom: 6px;
-  line-height: 1.35;
+  line-height: 1.3;
-  max-width: calc(100% - 70px);
+  white-space: nowrap;
-  overflow-wrap: break-word;
+  overflow: hidden;
-  text-wrap: balance;
+  text-overflow: ellipsis;
+  max-width: calc(100% - 80px); /* leave room for QR */
 }
 .ec-ing {
   display: flex;
@@ -1231,7 +1226,7 @@ async function saveRecipe() {
 @media (max-width: 420px) {
   .export-card { padding: 24px; }
   .ec-subtitle { font-size: 9px; letter-spacing: 2px; }
-  .ec-title { max-width: calc(100% - 60px); }
+  .ec-title { font-size: 20px; max-width: calc(100% - 65px); }
   .ec-ing { font-size: 12px; padding: 7px 0; }
   .ec-drops { width: 42px; font-size: 11px; }
   .ec-cost { width: 50px; font-size: 10px; }
@@ -1694,8 +1689,8 @@ async function saveRecipe() {
 }
 
 .editor-drops {
-  width: 42px;
+  width: 70px;
-  padding: 5px 2px;
+  padding: 7px 10px;
   border: 1.5px solid var(--border, #e0d4c0);
   border-radius: 8px;
   font-size: 13px;
@@ -1708,8 +1703,6 @@ async function saveRecipe() {
 .editor-drops:focus {
   border-color: var(--sage, #7a9e7e);
 }
-.drops-with-unit { display: flex; align-items: center; gap: 2px; }
-.unit-hint { font-size: 11px; color: #b0aab5; white-space: nowrap; }
 
 .ing-ppd {
   font-size: 12px;
@@ -1824,8 +1817,8 @@ async function saveRecipe() {
 }
 
 .dilution-label {
-  font-size: 12px;
+  font-size: 13px;
-  color: #4a9d7e;
+  color: var(--text-mid, #5a4a35);
   font-weight: 500;
 }
 

frontend/src/components/TagPicker.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tagpicker-overlay" @mousedown.self="$emit('close')">
+  <div class="tagpicker-overlay" @click.self="$emit('close')">
     <div class="tagpicker-card">
       <div class="tagpicker-title">为「{{ name }}」选择标签</div>
 

frontend/src/components/UserMenu.vue

@@ -1,10 +1,7 @@
 <template>
-  <div class="usermenu-overlay" @mousedown.self="$emit('close')">
+  <div class="usermenu-overlay" @click.self="$emit('close')">
     <div class="usermenu-card">
-      <div class="usermenu-name">
+      <div class="usermenu-name">{{ auth.user.display_name || auth.user.username }}</div>
-        {{ auth.user.username }}
-        <button v-if="!auth.user.username_changed" class="rename-btn" @click="changeUsername">✏️ 改名</button>
-      </div>
 
       <div class="usermenu-actions">
         <button class="usermenu-btn" @click="goMyDiary">
@@ -41,9 +38,6 @@
               <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="isUsernameNotice(n) && !auth.user.username_changed" class="notif-action-btn notif-btn-plan" @click="goRename(n)">去修改</button>
-                <button v-else-if="isUsernameNotice(n) && auth.user.username_changed" class="notif-mark-one" @click="markOneRead(n)">已读</button>
                 <!-- 审核类通知：去审核按钮 -->
                 <button v-else-if="isReviewable(n)" class="notif-action-btn notif-btn-review" @click="goReview(n)">去审核</button>
                 <!-- 默认：已读按钮 -->
@@ -135,65 +129,19 @@ function isSearchMissing(n) {
   return n.title && n.title.includes('用户需求')
 }
 
-async function changeUsername() {
-  const { showPrompt } = await import('../composables/useDialog')
-  const newName = await showPrompt('输入新用户名（只能修改一次）：', auth.user.username)
-  if (!newName || !newName.trim() || newName.trim() === auth.user.username) return
-  try {
-    const res = await api('/api/me/username', {
-      method: 'PUT',
-      body: JSON.stringify({ username: newName.trim() }),
-    })
-    if (res.ok) {
-      await auth.loadMe()
-      ui.showToast('用户名已修改')
-    } else {
-      const err = await res.json().catch(() => ({}))
-      ui.showToast(err.detail || '修改失败')
-    }
-  } catch {
-    ui.showToast('修改失败')
-  }
-}
-
-function isUsernameNotice(n) {
-  return n.title && n.title.includes('用户名更新')
-}
-
-function goRename(n) {
-  markOneRead(n)
-  changeUsername()
-}
-
 function isReviewable(n) {
   if (!n.title) return false
-  // Admin: review recipe/business/applications
+  return n.title.includes('待审核') || n.title.includes('商业认证') || n.title.includes('申请')
-  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')
+  await markOneRead(n)
-  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('推荐')) {
+  if (n.title.includes('配方')) {
-    localStorage.setItem('oil_open_pending', '1')
     router.push('/manage')
   } else if (n.title.includes('商业认证') || n.title.includes('申请')) {
     router.push('/users')
@@ -251,9 +199,7 @@ onMounted(loadNotifications)
   z-index: 4001;
 }
 
-.usermenu-name { font-size: 16px; font-weight: 600; color: #3e3a44; margin-bottom: 14px; display: flex; align-items: center; gap: 8px; }
+.usermenu-name { font-size: 16px; font-weight: 600; color: #3e3a44; margin-bottom: 14px; }
-.rename-btn { background: none; border: none; font-size: 12px; color: #b0aab5; cursor: pointer; padding: 0; }
-.rename-btn:hover { color: #4a9d7e; }
 
 .usermenu-actions { display: flex; flex-direction: column; gap: 4px; }
 .usermenu-btn {

frontend/src/composables/useOilTranslation.js

@@ -37,58 +37,10 @@ export function oilEn(name) {
   return ''
 }
 
-const RECIPE_KEYWORDS = {
-  '头疗':'Scalp Therapy','头痛':'Headache','偏头痛':'Migraine','头皮':'Scalp','头发':'Hair',
-  '肩颈':'Neck & Shoulder','颈椎':'Cervical','肩':'Shoulder','腰椎':'Lumbar','腰':'Lower Back',
-  '关节':'Joint','膝':'Knee','背':'Back','胸':'Chest','腹部':'Abdominal',
-  '乳腺':'Breast','子宫':'Uterine','私密':'Intimate','卵巢':'Ovarian',
-  '淋巴':'Lymph','肝':'Liver','肾':'Kidney','脾':'Spleen','胃':'Stomach','肺':'Lung','肠':'Intestinal',
-  '酸痛':'Pain Relief','疼痛':'Pain Relief','止痛':'Pain Relief',
-  '感冒':'Cold','发烧':'Fever','咳嗽':'Cough','咽喉':'Throat',
-  '过敏':'Allergy','鼻炎':'Rhinitis','哮喘':'Asthma',
-  '湿疹':'Eczema','痘痘':'Acne','粉刺':'Acne',
-  '消炎':'Anti-Inflammatory','便秘':'Constipation','消化':'Digestion',
-  '失眠':'Insomnia','助眠':'Sleep Aid','好眠':'Sleep Well','安眠':'Sleep',
-  '焦虑':'Anxiety','抑郁':'Depression','情绪':'Emotional',
-  '压力':'Stress','放松':'Relaxation','舒缓':'Soothing',
-  '水肿':'Edema','痛经':'Menstrual Pain','月经':'Menstrual','更年期':'Menopause','荷尔蒙':'Hormone',
-  '结节':'Nodule','囊肿':'Cyst','灰指甲':'Nail Fungus','脚气':'Athlete\'s Foot',
-  '白发':'Gray Hair','脱发':'Hair Loss','生发':'Hair Growth',
-  '瘦身':'Slimming','紫外线':'UV','抗衰':'Anti-Aging','美白':'Whitening','补水':'Hydrating',
-  '排毒':'Detox','净化':'Purifying','驱蚊':'Mosquito Repellent',
-  '护理':'Care','调理':'Therapy','修复':'Repair','养护':'Nourish',
-  '按摩':'Massage','刮痧':'Gua Sha','泡脚':'Foot Soak','精油浴':'Oil Bath',
-  '喷雾':'Spray','扩香':'Diffuser',
-  '疏通':'Unblock','祛湿':'Dampness Relief','驱寒':'Warming','健脾':'Spleen Wellness',
-  '美容':'Beauty','面膜':'Face Mask','发膜':'Hair Mask',
-  '配方':'Blend','方':'Blend','包':'Blend',
-  '增强版':'Enhanced','高配版':'Premium','男士':'Men\'s','儿童':'Children\'s',
-  '呼吸系统':'Respiratory System','呼吸':'Respiratory','免疫':'Immunity',
-  '缓解':'Relief','改善':'Improve','预防':'Prevention',
-  '带脉':'Belt Meridian','经络':'Meridian','静脉曲张':'Varicose Veins',
-  '口腔溃疡':'Mouth Ulcer','口唇疱疹':'Cold Sore','蚊虫叮咬':'Insect Bite',
-  '暖宫':'Uterus Warming','调经':'Menstrual Regulation',
-}
-const _SORTED = Object.keys(RECIPE_KEYWORDS).sort((a, b) => b.length - a.length)
-
 export function recipeNameEn(name) {
-  if (!name) return name
+  // Try to translate known keywords
-  const parts = []
+  // Simple approach: return original name for now, user can customize
-  let i = 0
+  return name
-  while (i < name.length) {
-    let matched = false
-    for (const key of _SORTED) {
-      if (name.substring(i, i + key.length) === key) {
-        const en = RECIPE_KEYWORDS[key]
-        if (!parts.includes(en)) parts.push(en)
-        i += key.length
-        matched = true
-        break
-      }
-    }
-    if (!matched) i++
-  }
-  return parts.length ? parts.join(' ') : name
 }
 
 // Custom translations (can be set by admin)

frontend/src/composables/usePinyinMatch.js

@@ -57,31 +57,6 @@ const PINYIN_MAP = {
   '触': 'c', '修': 'x', '养': 'y', '滋': 'z', '润': 'r',
   '呼': 'h', '吸': 'x', '消': 'x', '化': 'h', '排': 'p',
   '毒': 'd', '净': 'j', '纤': 'x', '体': 't', '塑': 's',
-  // Extended: all oil name chars
-  '麦': 'm', '卢': 'l', '卡': 'k', '檀': 't', '橘': 'j',
-  '茅': 'm', '茴': 'h', '芹': 'q', '菜': 'c', '蕾': 'l',
-  '蜂': 'f', '蓍': 's', '莱': 'l', '姆': 'm', '莎': 's',
-  '穗': 's', '醇': 'c', '郁': 'y', '没': 'm', '脂': 'z',
-  '巴': 'b', '样': 'y', '班': 'b', '牙': 'y', '鸡': 'j',
-  '苍': 'c', '卫': 'w', '畅': 'c', '顺': 's', '释': 's',
-  '悦': 'y', '柔': 'r', '压': 'y', '定': 'd', '情': 'q',
-  '绪': 'x', '神': 's', '气': 'q', '宽': 'k', '容': 'r',
-  '恬': 't', '家': 'j', '欢': 'h', '欣': 'x', '舞': 'w',
-  '鼓': 'g', '赋': 'f', '谧': 'm', '睡': 's', '烂': 'l',
-  '绚': 'x', '焕': 'h', '肤': 'f', '年': 'n', '华': 'h',
-  '完': 'w', '理': 'l', '注': 'z', '贯': 'g', '全': 'q',
-  '仕': 's', '女': 'nv', '伯': 'b', '斯': 's', '道': 'd',
-  '格': 'g', '拉': 'l', '元': 'y', '肌': 'j', '栀': 'z',
-  '鹅': 'e', '掌': 'z', '柴': 'c', '胶': 'j', '囊': 'n',
-  '空': 'k', '风': 'f', '文': 'w', '月': 'y', '云': 'y',
-  '五': 'w', '味': 'w', '愈': 'y', '创': 'c', '慰': 'w',
-  '扁': 'b', '广': 'g', '州': 'z', '热': 'r',
-  // Product name chars
-  '身': 's', '紧': 'j', '致': 'z', '霜': 's', '膏': 'g',
-  '膜': 'm', '乳': 'r', '液': 'y', '瓶': 'p', '盒': 'h',
-  '深': 's', '层': 'c', '肤': 'f', '磨': 'm', '砂': 's',
-  '龄': 'l', '无': 'w', '年': 'n', '华': 'h', '娇': 'j',
-  '颜': 'y', '喷': 'p', '雾': 'w', '面': 'm', '湿': 's',
 }
 
 /**
@@ -101,42 +76,12 @@ export function getPinyinInitials(name) {
 
 /**
  * Check if a query matches a name by pinyin initials.
- * Supports: prefix match, substring match, and subsequence match.
+ * 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()
-  // Prefix or substring (consecutive)
+  return initials.startsWith(q)
-  if (initials.includes(q)) return true
-  // Subsequence: each char of q appears in order in initials
-  let pos = 0
-  for (const ch of q) {
-    pos = initials.indexOf(ch, pos)
-    if (pos === -1) return false
-    pos++
-  }
-  return true
-}
-
-/**
- * Score how well a query matches pinyin initials.
- * 0 = prefix, 1 = substring, 2 = subsequence, -1 = no match
- */
-export function pinyinMatchScore(name, query) {
-  if (!query || !name) return -1
-  const initials = getPinyinInitials(name)
-  if (!initials) return -1
-  const q = query.toLowerCase()
-  if (initials.startsWith(q)) return 0
-  if (initials.includes(q)) return 1
-  // Subsequence check
-  let pos = 0
-  for (const ch of q) {
-    pos = initials.indexOf(ch, pos)
-    if (pos === -1) return -1
-    pos++
-  }
-  return 2
 }

frontend/src/composables/useSmartPaste.js

@@ -86,8 +86,7 @@ export function findOil(input, oilNames) {
     }
   }
 
-  // 5. Edit distance fuzzy match (only for 3+ char inputs to avoid false positives)
+  // 5. Edit distance fuzzy match
-  if (trimmed.length < 3) return null
   let bestMatch = null
   let bestDist = Infinity
   for (const name of oilNames) {
@@ -145,25 +144,19 @@ export function greedyMatchOils(text, oilNames) {
 /**
  * Parse text chunk into [{oil, drops}] pairs.
  * Handles formats like "芳香调理8永久花10" or "薰衣草 3滴 茶树 2ml"
- * Also handles oil names without numbers, defaulting to 1 drop.
  */
 export function parseOilChunk(text, oilNames) {
   const results = []
-  // Match: name + optional number+unit
   const regex = /([^\d]+?)(\d+\.?\d*)\s*(ml|毫升|ML|mL|滴)?/g
   let match
-  let lastIndex = 0
   while ((match = regex.exec(text)) !== null) {
-    lastIndex = regex.lastIndex
     const namePart = match[1].trim()
     let amount = parseFloat(match[2])
     const unit = match[3] || ''
 
-    const isMl = unit && (unit.toLowerCase() === 'ml' || unit === '毫升')
-    let drops = amount
     // Convert ml to drops
-    if (isMl) {
+    if (unit && (unit.toLowerCase() === 'ml' || unit === '毫升')) {
-      drops = Math.round(amount * 20)
+      amount = Math.round(amount * 20)
     }
 
     // Try greedy match on the name part
@@ -171,58 +164,22 @@ export function parseOilChunk(text, oilNames) {
     if (matched.length > 0) {
       // Last matched oil gets the drops
       for (let i = 0; i < matched.length - 1; i++) {
-        results.push({ oil: matched[i], drops: 1 })
+        results.push({ oil: matched[i], drops: 0 })
       }
-      const item = { oil: matched[matched.length - 1], drops }
+      results.push({ oil: matched[matched.length - 1], drops: amount })
-      if (isMl) { item._ml = amount }
-      results.push(item)
     } else {
       // Try findOil as fallback
       const found = findOil(namePart, oilNames)
       if (found) {
-        const item = { oil: found, drops }
+        results.push({ oil: found, drops: amount })
-        if (isMl) { item._ml = amount }
-        results.push(item)
       } else if (namePart) {
-        results.push({ oil: namePart, drops, notFound: true })
+        results.push({ oil: namePart, drops: amount, notFound: true })
       }
     }
   }
-
-  if (lastIndex === 0) {
-    // Regex matched nothing — try the whole text as oil names without numbers
-    _parseNamesOnly(text.trim(), oilNames, results)
-  } else {
-    // Handle trailing text after last number match
-    const trailing = text.substring(lastIndex).trim()
-    if (trailing) {
-      _parseNamesOnly(trailing, oilNames, results)
-    }
-  }
-
   return results
 }
 
-/** Parse text that contains only oil names (no numbers), default 1 drop each. */
-function _parseNamesOnly(text, oilNames, results) {
-  // Try greedy match first
-  const matched = greedyMatchOils(text, oilNames)
-  if (matched.length > 0) {
-    for (const oil of matched) {
-      results.push({ oil, drops: 1 })
-    }
-    return
-  }
-  // Fallback: try splitting by common delimiters and fuzzy match
-  const parts = text.split(/[\s+、,，]+/).filter(s => s)
-  for (const part of parts) {
-    const found = findOil(part, oilNames)
-    if (found) {
-      results.push({ oil: found, drops: 1 })
-    }
-  }
-}
-
 /**
  * Split multi-recipe input by blank lines or semicolons.
  * Detects recipe boundaries (non-oil text after seeing oils = new recipe).
@@ -298,7 +255,7 @@ export function parseSingleBlock(raw, oilNames) {
   }
 
   return {
-    name: name || '',
+    name: name || '未命名配方',
     ingredients: deduped,
     notFound
   }
@@ -309,23 +266,8 @@ export function parseSingleBlock(raw, oilNames) {
  * appears after some oils have been found, it starts a new recipe.
  */
 export function parseMultiRecipes(raw, oilNames) {
-  // Split by blank lines into major blocks
-  const blankLineSplit = raw.split(/\n\s*\n/).map(s => s.trim()).filter(s => s)
-  if (blankLineSplit.length > 1) {
-    return blankLineSplit.flatMap(block => parseMultiRecipes(block, oilNames))
-  }
-  // Split by semicolons only if both sides contain oil names
-  const semiParts = raw.split(/[;；]/).map(s => s.trim()).filter(s => s)
-  if (semiParts.length > 1) {
-    const hasOilInPart = p => oilNames.some(oil => p.includes(oil)) ||
-      Object.keys(OIL_HOMOPHONES).some(a => p.includes(a))
-    if (semiParts.every(hasOilInPart)) {
-      return semiParts.flatMap(block => parseMultiRecipes(block, 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 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
@@ -365,23 +307,19 @@ export function parseMultiRecipes(raw, oilNames) {
 
   for (const part of parts) {
     const hasNumber = /\d/.test(part)
-    const textPart = part.replace(/\d+\.?\d*/g, '').trim()
     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 && textPart.length >= 2 &&
+    const fuzzyOil = !hasOil && part.replace(/\d+\.?\d*/g, '').length >= 2 &&
-                     findOil(textPart, oilNames)
+                     findOil(part.replace(/\d+\.?\d*/g, '').trim(), oilNames)
-    // First part only: has number but text is not any oil → likely a name like "美容1"
-    const isFirstNameWithNumber = !current.foundOil && current.nameParts.length === 0 &&
-      current.ingredientParts.length === 0 && hasNumber && !hasOil && !fuzzyOil && textPart.length >= 2
 
     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) || isFirstNameWithNumber) {
+    } else if (!current.foundOil && !hasOil && !fuzzyOil && !hasNumber) {
-      current.nameParts.push(isFirstNameWithNumber ? textPart : part)
+      current.nameParts.push(part)
     } else {
       current.foundOil = true
       current.ingredientParts.push(part)
@@ -412,7 +350,7 @@ export function parseMultiRecipes(raw, oilNames) {
       }
     }
     return {
-      name: r.nameParts.join(' ') || '',
+      name: r.nameParts.join(' ') || '未命名配方',
       ingredients: deduped,
       notFound,
     }

frontend/src/stores/auth.js

@@ -40,10 +40,9 @@ export const useAuthStore = defineStore('auth', () => {
         id: data.id,
         role: data.role,
         username: data.username,
-        display_name: data.username,
+        display_name: data.display_name,
         has_password: data.has_password ?? false,
         business_verified: data.business_verified ?? false,
-        username_changed: data.username_changed ?? false,
       }
     } catch {
       logout()
@@ -57,10 +56,11 @@ export const useAuthStore = defineStore('auth', () => {
     await loadMe()
   }
 
-  async function register(username, password) {
+  async function register(username, password, displayName) {
     const data = await api.post('/api/register', {
       username,
       password,
+      display_name: displayName,
     })
     token.value = data.token
     localStorage.setItem('oil_auth_token', data.token)
@@ -73,8 +73,10 @@ export const useAuthStore = defineStore('auth', () => {
     user.value = { ...DEFAULT_USER }
   }
 
-  function canEditRecipe() {
+  function canEditRecipe(recipe) {
-    return canEdit.value
+    if (isAdmin.value || user.value.role === 'senior_editor') return true
+    if (canEdit.value && recipe._owner_id === user.value.id) return true
+    return false
   }
 
   return {

frontend/src/stores/oils.js

@@ -70,23 +70,20 @@ export const useOilsStore = defineStore('oils', () => {
         retailPrice: oil.retail_price ?? null,
         isActive: oil.is_active !== 0,
         enName: oil.en_name ?? null,
-        unit: oil.unit || 'drop',
       }
     }
     oils.value = newOils
     oilsMeta.value = newMeta
   }
 
-  async function saveOil(name, bottlePrice, dropCount, retailPrice, enName = null, unit = null) {
+  async function saveOil(name, bottlePrice, dropCount, retailPrice, enName = null) {
-    const payload = {
+    await api.post('/api/oils', {
       name,
       bottle_price: bottlePrice,
       drop_count: dropCount,
       retail_price: retailPrice,
       en_name: enName,
-    }
+    })
-    if (unit) payload.unit = unit
-    await api.post('/api/oils', payload)
     await loadOils()
   }
 
@@ -96,41 +93,6 @@ export const useOilsStore = defineStore('oils', () => {
     delete oilsMeta.value[name]
   }
 
-  const UNIT_LABELS = {
-    drop: { zh: '滴', en: 'drop', enPlural: 'drops' },
-    ml: { zh: 'ml', en: 'ml', enPlural: 'ml' },
-    g: { zh: 'g', en: 'g', enPlural: 'g' },
-    capsule: { zh: '颗', en: 'capsule', enPlural: 'capsules' },
-  }
-
-  function getUnit(name) {
-    const meta = oilsMeta.value[name]
-    return (meta && meta.unit) || 'drop'
-  }
-
-  function isDropUnit(name) {
-    return getUnit(name) === 'drop'
-  }
-
-  function isMlUnit(name) {
-    return getUnit(name) === 'ml'
-  }
-
-  function isPortionUnit(name) {
-    return !isDropUnit(name)
-  }
-
-  function unitLabel(name, lang = 'zh') {
-    const u = UNIT_LABELS[getUnit(name)] || UNIT_LABELS.drop
-    return lang === 'en' ? u.en : u.zh
-  }
-
-  function unitLabelPlural(name, count, lang = 'zh') {
-    const u = UNIT_LABELS[getUnit(name)] || UNIT_LABELS.drop
-    if (lang === 'en') return count === 1 ? u.en : u.enPlural
-    return u.zh
-  }
-
   return {
     oils,
     oilsMeta,
@@ -143,11 +105,5 @@ export const useOilsStore = defineStore('oils', () => {
     loadOils,
     saveOil,
     deleteOil,
-    getUnit,
-    isDropUnit,
-    isMlUnit,
-    isPortionUnit,
-    unitLabel,
-    unitLabelPlural,
   }
 })

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([])
@@ -20,7 +18,6 @@ export const useRecipesStore = defineStore('recipes', () => {
       name: r.name,
       en_name: r.en_name ?? '',
       note: r.note ?? '',
-      volume: r.volume ?? '',
       tags: r.tags ?? [],
       ingredients: (r.ingredients ?? []).map((ing) => ({
         oil: ing.oil_name ?? ing.oil ?? ing.name,
@@ -49,8 +46,10 @@ export const useRecipesStore = defineStore('recipes', () => {
   async function saveRecipe(recipe) {
     if (recipe._id) {
       const data = await api.put(`/api/recipes/${recipe._id}`, recipe)
-      // Reload from server to get properly formatted data (oil_name → oil mapping)
+      const idx = recipes.value.findIndex((r) => r._id === recipe._id)
-      await loadRecipes()
+      if (idx !== -1) {
+        recipes.value[idx] = { ...recipes.value[idx], ...recipe, _version: data._version ?? data.version ?? recipe._version }
+      }
       return data
     } else {
       const data = await api.post('/api/recipes', recipe)

frontend/src/views/AuditLog.vue

@@ -49,7 +49,6 @@
         <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>
-          <button v-if="canUndo(log)" class="undo-btn" @click="undoAction(log)">↩ 撤销</button>
         </div>
       </div>
       <div v-if="filteredLogs.length === 0" class="empty-hint">暂无日志记录</div>
@@ -67,10 +66,6 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue'
 import { api } from '../composables/useApi'
-import { showConfirm } from '../composables/useDialog'
-import { useUiStore } from '../stores/ui'
-
-const ui = useUiStore()
 
 const logs = ref([])
 const loading = ref(false)
@@ -82,10 +77,10 @@ const selectedUser = ref('')
 const selectedTarget = ref('')
 
 const ACTION_MAP = {
-  share_recipe: '共享配方',
+  create_recipe: '新增配方',
-  adopt_recipe: '共享配方',
   update_recipe: '编辑配方',
   delete_recipe: '删除配方',
+  adopt_recipe: '采纳配方',
   reject_recipe: '拒绝配方',
   undo_delete_recipe: '恢复配方',
   upsert_oil: '编辑精油',
@@ -96,24 +91,15 @@ const ACTION_MAP = {
   update_user: '修改用户',
   delete_user: '删除用户',
   undo_delete_user: '恢复用户',
-  business_apply: '申请商业认证',
-  approve_business: '通过商业认证',
-  reject_business: '拒绝商业认证',
-  grant_business: '开通商业认证',
-  revoke_business: '撤销商业认证',
-  register: '用户注册',
 }
 
-const actionGroups = {
+const actionTypes = [
-  '配方': ['share_recipe', 'adopt_recipe', 'update_recipe', 'delete_recipe', 'undo_delete_recipe'],
+  { value: 'recipe', label: '配方' },
-  '审核': ['reject_recipe'],
+  { value: 'oil', label: '精油' },
-  '精油': ['upsert_oil', 'delete_oil', 'undo_delete_oil'],
+  { value: 'user', label: '用户' },
-  '标签': ['create_tag', 'delete_tag'],
+  { value: 'tag', label: '标签' },
-  '用户': ['create_user', 'update_user', 'delete_user', 'undo_delete_user', 'register'],
+  { value: 'adopt', label: '审核' },
-  '商业认证': ['business_apply', 'approve_business', 'reject_business', 'grant_business', 'revoke_business'],
+]
-}
-
-const actionTypes = Object.keys(actionGroups).map(label => ({ value: label, label }))
 
 const targetTypes = [
   { value: 'recipe', label: '配方' },
@@ -133,8 +119,7 @@ const uniqueUsers = computed(() => {
 const filteredLogs = computed(() => {
   let result = logs.value
   if (selectedAction.value) {
-    const group = actionGroups[selectedAction.value]
+    result = result.filter(l => l.action.includes(selectedAction.value))
-    if (group) result = result.filter(l => group.includes(l.action))
   }
   if (selectedUser.value) {
     result = result.filter(l => (l.user_name || l.username) === selectedUser.value)
@@ -153,7 +138,7 @@ 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') || action.includes('share')) return 'color-approve'
+  if (action.includes('adopt') || action.includes('undo')) return 'color-approve'
   return ''
 }
 
@@ -162,11 +147,9 @@ function parsedDetail(log) {
   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.role) parts.push(`角色: ${d.role}`)
-    if (d.changed) parts.push(`修改: ${d.changed}`)
     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(' · ')
@@ -178,30 +161,6 @@ function parsedDetail(log) {
   }
 }
 
-function canUndo(log) {
-  return ['delete_recipe', 'delete_oil'].includes(log.action)
-}
-
-async function undoAction(log) {
-  const ok = await showConfirm(`确定撤销此操作？将恢复「${log.target_name}」`)
-  if (!ok) return
-  try {
-    const res = await api(`/api/audit-log/${log.id}/undo`, { method: 'POST' })
-    if (res.ok) {
-      ui.showToast('已撤销')
-      logs.value = []
-      page.value = 0
-      hasMore.value = true
-      await fetchLogs()
-    } else {
-      const err = await res.json().catch(() => ({}))
-      ui.showToast('撤销失败: ' + (err.detail || err.message || ''))
-    }
-  } catch {
-    ui.showToast('撤销失败')
-  }
-}
-
 function formatTime(t) {
   if (!t) return ''
   return new Date(t + 'Z').toLocaleString('zh-CN', {
@@ -269,11 +228,6 @@ onMounted(() => fetchLogs())
 .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; }
-.undo-btn {
-  margin-left: 8px; padding: 2px 8px; border: 1px solid #d4cfc7; border-radius: 6px;
-  background: #fff; font-size: 11px; cursor: pointer; color: #6b6375; font-family: inherit;
-}
-.undo-btn:hover { border-color: #7ec6a4; color: #4a9d7e; }
 
 .load-more { text-align: center; margin-top: 16px; }
 .btn-outline {

frontend/src/views/BugTracker.vue

@@ -85,7 +85,7 @@
     </div>
 
     <!-- Add Bug Modal -->
-    <div v-if="showAddBug" class="overlay" @mousedown.self="showAddBug = false">
+    <div v-if="showAddBug" class="overlay" @click.self="showAddBug = false">
       <div class="overlay-panel">
         <div class="overlay-header">
           <h3>新增Bug</h3>

frontend/src/views/Inventory.vue

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

frontend/src/views/MyDiary.vue

@@ -31,7 +31,7 @@
           <div class="diary-name">{{ d.name || '未命名' }}</div>
           <div class="diary-ings">
             <span v-for="ing in (d.ingredients || []).slice(0, 3)" :key="ing.oil" class="diary-ing">
-              {{ ing.oil }} {{ ing.drops }}{{ oils.unitLabel(ing.oil) }}
+              {{ ing.oil }} {{ ing.drops }}滴
             </span>
             <span v-if="(d.ingredients || []).length > 3" class="diary-more">+{{ (d.ingredients || []).length - 3 }}</span>
           </div>
@@ -156,8 +156,7 @@
 
         <!-- Brand name -->
         <div class="form-group">
-          <label class="form-label">✍ 品牌名称或标语</label>
+          <label class="form-label">品牌名称或标语（显示在二维码下方）</label>
-          <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">显示在二维码下方</p>
           <textarea v-model="brandName" class="form-control" rows="2" placeholder="扫码申请成为优惠顾客&#10;我的精油小屋" style="max-width:350px;font-size:13px" @blur="saveBrandSettings"></textarea>
           <div style="display:flex;gap:6px;margin-top:6px">
             <button class="btn-align" :class="{ active: brandAlign === 'left' }" @click="brandAlign='left'; saveBrandSettings()">靠左</button>
@@ -174,7 +173,7 @@
             <div v-if="brandBg" style="position:absolute;inset:0;background-size:cover;background-position:center;opacity:0.12;pointer-events:none" :style="{ backgroundImage: 'url(' + brandBg + ')' }"></div>
             <!-- Logo: shown in bottom row, not as watermark -->
             <!-- QR: top-right -->
-            <div v-if="brandQrImage" style="position:absolute;top:16px;right:12px;display:flex;flex-direction:column;gap:2px;z-index:2" :style="{ alignItems: brandAlign === 'left' ? 'flex-start' : brandAlign === 'right' ? 'flex-end' : 'center' }">
+            <div v-if="brandQrImage" style="position:absolute;top:16px;right:12px;display:flex;flex-direction:column;align-items:center;gap:2px;z-index:2">
               <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>
@@ -200,7 +199,7 @@
         </div>
 
         <div style="display:flex;gap:8px;align-items:center">
-          <span class="auto-save-hint">所有修改自动保存</span>
+          <button class="btn btn-primary" @click="saveBrandSettings">💾 保存品牌设置</button>
           <button v-if="returnRecipeId" class="btn btn-outline" @click="goBackToRecipe">← 返回配方卡片</button>
         </div>
       </div>
@@ -208,6 +207,22 @@
 
     <!-- Account Tab -->
     <div v-if="activeTab === 'account'" class="tab-content">
+      <div class="section-card">
+        <h4>👤 账号设置</h4>
+
+        <div class="form-group">
+          <label>显示名称</label>
+          <input v-model="displayName" class="form-input" />
+          <button class="btn-primary btn-sm" style="margin-top:6px" @click="updateDisplayName">保存</button>
+        </div>
+
+        <div class="form-group">
+          <label>用户名</label>
+          <div class="form-static">{{ auth.user.username }}</div>
+        </div>
+
+      </div>
+
       <div class="section-card">
         <h4>🔑 修改密码</h4>
         <div class="form-group">
@@ -229,41 +244,56 @@
       <div ref="bizCertRef" class="section-card biz-card">
         <h4>🏢 商业用户认证</h4>
 
-        <!-- Status bar -->
+        <!-- 已认证 -->
         <div v-if="auth.isBusiness" class="biz-status-bar biz-approved">
           <span>✅ 已认证商业用户</span>
         </div>
+
+        <!-- 审核中 -->
         <div v-else-if="bizApp.status === 'pending'" class="biz-status-bar biz-pending">
           <span>⏳ 认证申请审核中</span>
-        </div>
+          <div class="biz-status-detail">商户名：{{ bizApp.business_name }} · 提交时间：{{ formatDate(bizApp.created_at) }}</div>
-        <div v-else-if="bizApp.status === 'rejected'" class="biz-status-bar biz-rejected">
-          <span>❌ 认证申请未通过</span>
-          <div v-if="bizApp.reject_reason" class="biz-status-detail">原因：{{ bizApp.reject_reason }}</div>
-          <p style="font-size:12px;margin-top:4px">你可以修改后重新申请</p>
         </div>
 
-        <!-- Always show filled info (like QR page) -->
+        <!-- 被拒绝 -->
-        <div class="biz-form">
+        <template v-else-if="bizApp.status === 'rejected'">
-          <div class="form-group">
+          <div class="biz-status-bar biz-rejected">
-            <label class="form-label">商户名称 *</label>
+            <span>❌ 认证申请未通过</span>
-            <input v-model="businessName" class="form-input" placeholder="你的商户或品牌名称" :disabled="bizApp.status === 'pending'" />
+            <div v-if="bizApp.reject_reason" class="biz-status-detail">原因：{{ bizApp.reject_reason }}</div>
           </div>
-          <div class="form-group">
+          <p class="hint-text">你可以修改信息后重新申请。</p>
-            <label class="form-label">证明图片 *</label>
+        </template>
-            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">营业执照或相关证明材料</p>
+
-            <div class="upload-box" @click="$refs.bizDocInput?.click()">
+        <!-- 申请表单（首次或被拒后重新申请） -->
-              <img v-if="bizDocImage" :src="bizDocImage" class="upload-box-img" />
+        <template v-if="!auth.isBusiness && bizApp.status !== 'pending'">
-              <span v-else class="upload-box-hint">点击上传</span>
+          <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>
-            <input ref="bizDocInput" type="file" accept="image/*" style="display:none" @change="handleBizDocUpload" />
-            <button v-if="bizDocImage" class="btn-clear" @click="bizDocImage = ''">清除</button>
           </div>
-          <template v-if="!auth.isBusiness && bizApp.status !== 'pending'">
+        </template>
-            <div style="margin-top:12px">
-              <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim() || !bizDocImage">💾 提交申请</button>
-            </div>
-          </template>
-        </div>
       </div>
     </div>
   </div>
@@ -315,7 +345,6 @@ const businessName = ref('')
 const businessReason = ref('')
 const bizType = ref('')
 const bizPhone = ref('')
-const bizDocImage = ref('')
 const bizApp = ref({ status: null })
 
 onMounted(async () => {
@@ -326,11 +355,7 @@ onMounted(async () => {
   // Load business application status
   try {
     const bizRes = await api('/api/my-business-application')
-    if (bizRes.ok) {
+    if (bizRes.ok) bizApp.value = await bizRes.json()
-      bizApp.value = await bizRes.json()
-      if (bizApp.value.business_name) businessName.value = bizApp.value.business_name
-      if (bizApp.value.document) bizDocImage.value = bizApp.value.document
-    }
   } catch {}
   // 从商业核算跳转过来，滚到商业认证区域
   if (route.query.section === 'biz-cert') {
@@ -479,38 +504,36 @@ function readFileAsBase64(file) {
   })
 }
 
-// Compress image if too large
+// Compress image if too large (keeps PNG for small images, JPEG for large)
-function compressImage(base64, maxSize = 500000, maxDim = 800) {
+function compressImage(base64, maxSize = 500000) {
   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
+      const maxDim = 600
-      let scale = 1
       if (w > maxDim || h > maxDim) {
-        scale = Math.min(maxDim / w, maxDim / h)
+        const ratio = Math.min(maxDim / w, maxDim / h)
+        w = Math.round(w * ratio)
+        h = Math.round(h * ratio)
       }
-      for (let attempt = 0; attempt < 5; attempt++) {
+      canvas.width = w
-        const cw = Math.round(w * scale)
+      canvas.height = h
-        const ch = Math.round(h * scale)
+      canvas.getContext('2d').drawImage(img, 0, 0, w, h)
-        canvas.width = cw
+      // Try PNG first, then JPEG with decreasing quality
-        canvas.height = ch
+      let result = canvas.toDataURL('image/png')
-        canvas.getContext('2d').drawImage(img, 0, 0, cw, ch)
+      if (result.length > maxSize) {
-        let quality = 0.8
+        let quality = 0.85
-        let result = canvas.toDataURL('image/jpeg', quality)
+        while (quality > 0.2) {
-        while (result.length > maxSize && quality > 0.2) {
-          quality -= 0.15
           result = canvas.toDataURL('image/jpeg', quality)
+          if (result.length <= maxSize) break
+          quality -= 0.1
         }
-        if (result.length <= maxSize) { resolve(result); return }
-        scale *= 0.7 // shrink more
       }
-      // Last resort
+      resolve(result)
-      resolve(canvas.toDataURL('image/jpeg', 0.3))
     }
-    img.onerror = () => resolve(base64)
+    img.onerror = () => resolve(base64) // fallback: return original
     img.src = base64
   })
 }
@@ -548,35 +571,9 @@ function checkSquare(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
@@ -584,16 +581,15 @@ async function handleUpload(type, event) {
       const isSquare = await checkSquare(base64)
       if (!isSquare) {
         const { showConfirm: confirm } = await import('../composables/useDialog')
-        const ok = await confirm('图片非正方形，自动裁剪？')
+        const ok = await confirm('二维码图片不是正方形，是否自动裁剪为正方形？\n（取中心区域）')
         if (ok) {
           base64 = await cropToSquare(base64)
         }
       }
     }
 
-    const maxSize = type === 'bg' ? 600000 : 300000
+    const maxSize = type === 'bg' ? 1000000 : 500000
-    const maxDim = type === 'bg' ? 1000 : 600
+    base64 = await compressImage(base64, maxSize)
-    base64 = await compressImage(base64, maxSize, maxDim)
     const fieldMap = { logo: 'brand_logo', bg: 'brand_bg', qr: 'qr_code' }
     const field = fieldMap[type]
     if (!field) return
@@ -676,36 +672,33 @@ async function changePassword() {
   }
 }
 
-async function handleBizDocUpload(event) {
-  const file = event.target.files[0]
-  if (!file) return
-  let base64 = await readFileAsBase64(file)
-  base64 = await compressImage(base64, 300000, 600)
-  bizDocImage.value = base64
-}
-
 async function applyBusiness() {
-  if (!businessName.value.trim() || !bizDocImage.value) {
+  if (!businessName.value.trim() || !bizType.value) {
-    ui.showToast('请填写商户名称并上传证明图片')
+    ui.showToast('请填写必填项')
     return
   }
+  const typeLabels = { individual: '个体经营户', company: '公司', studio: '工作室/美容院', distributor: '代理商' }
+  const info = [
+    `认证类型：${typeLabels[bizType.value] || bizType.value}`,
+    bizPhone.value ? `联系电话：${bizPhone.value}` : '',
+    businessReason.value ? `业务描述：${businessReason.value}` : '',
+  ].filter(Boolean).join('\n')
   try {
     const res = await api('/api/business-apply', {
       method: 'POST',
       body: JSON.stringify({
         business_name: businessName.value.trim(),
-        document: bizDocImage.value,
+        document: info,
       }),
     })
     if (res.ok) {
-      // Don't clear — keep showing submitted data
+      businessName.value = ''
+      businessReason.value = ''
+      bizType.value = ''
+      bizPhone.value = ''
       ui.showToast('申请已提交，请等待管理员审核')
       const bizRes = await api('/api/my-business-application')
-      if (bizRes.ok) {
+      if (bizRes.ok) bizApp.value = await bizRes.json()
-        bizApp.value = await bizRes.json()
-        // Restore document image from app data
-        if (bizApp.value.document) bizDocImage.value = bizApp.value.document
-      }
     } else {
       const err = await res.json().catch(() => ({}))
       ui.showToast(err.detail || '提交失败')
@@ -1155,8 +1148,6 @@ async function applyBusiness() {
   margin-bottom: 12px;
 }
 
-.auto-save-hint { font-size: 12px; color: #999; font-style: italic; }
-
 .verified-badge {
   padding: 12px;
   background: #e8f5e9;

frontend/src/views/OilReference.vue

@@ -19,7 +19,7 @@
     </div>
 
     <!-- Dilution Ratio Modal -->
-    <div v-if="showDilution" class="modal-overlay" @mousedown.self="showDilution = false">
+    <div v-if="showDilution" class="modal-overlay" @click.self="showDilution = false">
       <div ref="dilutionCardRef" style="position:relative;z-index:1;background:white;border-radius:20px;max-width:420px;width:100%;max-height:88vh;overflow-y:auto;box-shadow:0 16px 56px rgba(0,0,0,0.25)" @click.stop>
         <div style="background:linear-gradient(135deg,#2e7d32,#66bb6a);border-radius:20px 20px 0 0;padding:28px 24px;color:white;text-align:center;position:relative">
           <button @click="showDilution = false" style="position:absolute;top:12px;right:16px;background:rgba(255,255,255,0.2);border:none;color:white;width:30px;height:30px;border-radius:50%;cursor:pointer;font-size:16px">×</button>
@@ -48,7 +48,7 @@
     </div>
 
     <!-- Safety Cautions Modal -->
-    <div v-if="showContra" class="modal-overlay" @mousedown.self="showContra = false">
+    <div v-if="showContra" class="modal-overlay" @click.self="showContra = false">
       <div ref="contraCardRef" style="position:relative;z-index:1;background:white;border-radius:20px;max-width:420px;width:100%;max-height:88vh;overflow-y:auto;box-shadow:0 16px 56px rgba(0,0,0,0.25)" @click.stop>
         <div style="background:linear-gradient(135deg,#e65100,#ff9800);border-radius:20px 20px 0 0;padding:28px 24px;color:white;text-align:center;position:relative">
           <button @click="showContra = false" style="position:absolute;top:12px;right:16px;background:rgba(255,255,255,0.2);border:none;color:white;width:30px;height:30px;border-radius:50%;cursor:pointer;font-size:16px">×</button>
@@ -98,21 +98,16 @@
         <button @click="viewMode = 'drop'" :style="viewMode === 'drop' ? 'background:var(--sage);color:white' : 'background:white;color:var(--text-mid)'" style="border:none;border-radius:0;font-size:12px;padding:6px 12px;cursor:pointer">每滴价</button>
       </div>
       <!-- Desktop: text buttons -->
-      <button v-if="auth.canManage" class="toolbar-btn-text" @click="showAddForm = !showAddForm">{{ showAddForm ? '收起' : '＋ 新增' }}</button>
+      <button v-if="auth.canEdit" class="toolbar-btn-text" @click="showAddForm = !showAddForm">{{ showAddForm ? '收起' : '＋ 新增' }}</button>
       <button v-if="auth.isAdmin" class="toolbar-btn-text" @click="exportPDF">📥 导出PDF</button>
       <!-- Mobile: emoji-only buttons -->
-      <button v-if="auth.canManage" class="toolbar-btn-icon" @click="showAddForm = !showAddForm" title="新增精油">➕</button>
+      <button v-if="auth.canEdit" class="toolbar-btn-icon" @click="showAddForm = !showAddForm" title="新增精油">➕</button>
       <button v-if="auth.isAdmin" class="toolbar-btn-icon" @click="exportPDF" title="导出PDF">📄</button>
     </div>
 
     <!-- Add Oil Form (toggleable) -->
-    <div v-if="showAddForm && auth.canManage" class="add-oil-form">
+    <div v-if="showAddForm && auth.canEdit" class="add-oil-form">
-      <div class="add-type-tabs">
+      <div class="form-row">
-        <button class="add-type-tab" :class="{ active: addType === 'oil' }" @click="addType = 'oil'">精油</button>
-        <button class="add-type-tab" :class="{ active: addType === 'product' }" @click="addType = 'product'">其他</button>
-      </div>
-      <!-- 新增精油 -->
-      <div v-if="addType === 'oil'" class="form-row">
         <input v-model="newOilName" style="flex:1;min-width:120px" placeholder="精油名称" class="form-input-sm" />
         <input v-model="newOilEnName" style="flex:1;min-width:100px" placeholder="英文名" class="form-input-sm" />
         <input v-model.number="newBottlePrice" style="width:100px" type="number" step="0.01" min="0" placeholder="会员价 ¥" class="form-input-sm" />
@@ -129,20 +124,6 @@
         <input v-model.number="newRetailPrice" style="width:100px" type="number" step="0.01" min="0" placeholder="零售价 ¥" class="form-input-sm" />
         <button class="btn btn-primary btn-sm" @click="addOil" :disabled="!newOilName.trim()">➕ 添加</button>
       </div>
-      <!-- 新增其他产品 -->
-      <div v-else class="form-row">
-        <input v-model="newOilName" style="flex:1;min-width:120px" placeholder="产品名称" class="form-input-sm" />
-        <input v-model="newOilEnName" style="flex:1;min-width:100px" placeholder="英文名" class="form-input-sm" />
-        <input v-model.number="newBottlePrice" style="width:100px" type="number" step="0.01" min="0" placeholder="会员价 ¥" class="form-input-sm" />
-        <input v-model.number="newProductAmount" style="width:70px" type="number" step="1" min="1" placeholder="容量" class="form-input-sm" />
-        <select v-model="newProductUnit" class="form-input-sm" style="width:60px">
-          <option value="ml">ml</option>
-          <option value="g">g</option>
-          <option value="capsule">颗</option>
-        </select>
-        <input v-model.number="newRetailPrice" style="width:100px" type="number" step="0.01" min="0" placeholder="零售价 ¥" class="form-input-sm" />
-        <button class="btn btn-primary btn-sm" @click="addProduct" :disabled="!newOilName.trim() || !newProductAmount">➕ 添加</button>
-      </div>
     </div>
 
     <!-- Oil Grid -->
@@ -165,13 +146,13 @@
             <div v-if="getMeta(name)?.retailPrice" class="oil-retail-line">¥{{ getMeta(name).retailPrice }}/瓶</div>
           </template>
           <template v-else>
-            <div class="oil-price-line">¥{{ oils.pricePerDrop(name).toFixed(2) }}<span class="oil-price-unit">/{{ oilPriceUnit(name) }}</span></div>
+            <div class="oil-price-line">¥{{ oils.pricePerDrop(name).toFixed(2) }}<span class="oil-price-unit">{{ name === '植物空胶囊' ? '/颗' : '/滴' }}</span></div>
             <div v-if="getMeta(name)?.retailPrice && getMeta(name)?.dropCount" class="oil-retail-line">
-              ¥{{ (getMeta(name).retailPrice / getMeta(name).dropCount).toFixed(2) }}/{{ oilPriceUnit(name) }}
+              ¥{{ (getMeta(name).retailPrice / getMeta(name).dropCount).toFixed(2) }}{{ name === '植物空胶囊' ? '/颗' : '/滴' }}
             </div>
           </template>
         </div>
-        <div v-if="auth.canManage" class="oil-chip-actions" @click.stop>
+        <div v-if="auth.canEdit" class="oil-chip-actions" @click.stop>
           <button @click="editOil(name)" title="编辑">✏️</button>
           <button @click="removeOil(name)" title="删除">🗑</button>
         </div>
@@ -180,7 +161,7 @@
     </div>
 
     <!-- Oil Knowledge Card Modal -->
-    <div v-if="activeCard && activeCardName" class="modal-overlay" @mousedown.self="closeOilModal">
+    <div v-if="activeCard && activeCardName" class="modal-overlay" @click.self="closeOilModal">
       <div class="oil-card-modal">
         <div class="oil-card-header">
           <div class="oil-card-header-content">
@@ -191,7 +172,7 @@
               <div class="oil-card-price-info" v-if="getMeta(activeCardName)">
                 ¥ {{ (getMeta(activeCardName).bottlePrice || 0).toFixed(2) }}
                 <span v-if="oils.pricePerDrop(activeCardName)">
-                  &middot; ¥ {{ oils.pricePerDrop(activeCardName).toFixed(4) }}/{{ oilPriceUnit(activeCardName) }}
+                  &middot; ¥ {{ oils.pricePerDrop(activeCardName).toFixed(4) }}/滴
                 </span>
               </div>
             </div>
@@ -235,7 +216,7 @@
     </div>
 
     <!-- Simple Oil Detail Panel (for oils without a knowledge card) -->
-    <div v-if="selectedOilName && !activeCard" class="modal-overlay" @mousedown.self="selectedOilName = null">
+    <div v-if="selectedOilName && !activeCard" class="modal-overlay" @click.self="selectedOilName = null">
       <div class="oil-detail-panel">
         <div class="detail-header">
           <div>
@@ -245,58 +226,32 @@
           <button class="btn-close" @click="selectedOilName = null">✕</button>
         </div>
         <div class="detail-body">
-          <!-- 精油（非ml产品） -->
+          <div class="detail-row">
-          <template v-if="oils.isDropUnit(selectedOilName)">
+            <span class="detail-label">会员价</span>
-            <div class="detail-row">
+            <span class="detail-value">{{ getMeta(selectedOilName)?.bottlePrice != null ? ('¥ ' + getMeta(selectedOilName).bottlePrice.toFixed(2)) : '--' }}</span>
-              <span class="detail-label">总容量</span>
+          </div>
-              <span class="detail-value">{{ volumeWithDrops(selectedOilName) }}</span>
+          <div class="detail-row">
-            </div>
+            <span class="detail-label">总滴数</span>
-            <div class="detail-row">
+            <span class="detail-value">{{ getMeta(selectedOilName)?.dropCount || '--' }}</span>
-              <span class="detail-label">会员价</span>
+          </div>
-              <span class="detail-value">{{ getMeta(selectedOilName)?.bottlePrice != null ? ('¥ ' + getMeta(selectedOilName).bottlePrice.toFixed(2)) : '--' }}</span>
+          <div class="detail-row">
-            </div>
+            <span class="detail-label">每滴价格</span>
-            <div class="detail-row">
+            <span class="detail-value">{{ oils.pricePerDrop(selectedOilName) ? ('¥ ' + oils.pricePerDrop(selectedOilName).toFixed(4)) : '--' }}</span>
-              <span class="detail-label">每{{ oilPriceUnit(selectedOilName) }}价格</span>
+          </div>
-              <span class="detail-value">{{ oils.pricePerDrop(selectedOilName) ? ('¥ ' + oils.pricePerDrop(selectedOilName).toFixed(4)) : '--' }}</span>
+          <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice">
-            </div>
+            <span class="detail-label">零售价</span>
-            <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice">
+            <span class="detail-value">¥ {{ getMeta(selectedOilName).retailPrice.toFixed(2) }}</span>
-              <span class="detail-label">零售价</span>
+          </div>
-              <span class="detail-value">¥ {{ getMeta(selectedOilName).retailPrice.toFixed(2) }}</span>
+          <div class="detail-row">
-            </div>
+            <span class="detail-label">每ml价格</span>
-            <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice && getMeta(selectedOilName)?.dropCount">
+            <span class="detail-value">{{ oils.pricePerDrop(selectedOilName) ? ('¥ ' + (oils.pricePerDrop(selectedOilName) * DROPS_PER_ML).toFixed(2)) : '--' }}</span>
-              <span class="detail-label">每{{ oilPriceUnit(selectedOilName) }}价格</span>
+          </div>
-              <span class="detail-value">¥ {{ (getMeta(selectedOilName).retailPrice / getMeta(selectedOilName).dropCount).toFixed(4) }}</span>
-            </div>
-          </template>
-          <!-- ml产品 -->
-          <template v-else>
-            <div class="detail-row">
-              <span class="detail-label">总容量</span>
-              <span class="detail-value">{{ getMeta(selectedOilName)?.dropCount || '--' }}{{ oils.unitLabel(selectedOilName) }}</span>
-            </div>
-            <div class="detail-row">
-              <span class="detail-label">会员价</span>
-              <span class="detail-value">{{ getMeta(selectedOilName)?.bottlePrice != null ? ('¥ ' + getMeta(selectedOilName).bottlePrice.toFixed(2)) : '--' }}</span>
-            </div>
-            <div class="detail-row">
-              <span class="detail-label">每{{ oils.unitLabel(selectedOilName) }}价格</span>
-              <span class="detail-value">{{ oils.pricePerDrop(selectedOilName) ? ('¥ ' + oils.pricePerDrop(selectedOilName).toFixed(2)) : '--' }}</span>
-            </div>
-            <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice">
-              <span class="detail-label">零售价</span>
-              <span class="detail-value">¥ {{ getMeta(selectedOilName).retailPrice.toFixed(2) }}</span>
-            </div>
-            <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice && getMeta(selectedOilName)?.dropCount">
-              <span class="detail-label">每{{ oils.unitLabel(selectedOilName) }}价格</span>
-              <span class="detail-value">¥ {{ (getMeta(selectedOilName).retailPrice / getMeta(selectedOilName).dropCount).toFixed(2) }}</span>
-            </div>
-          </template>
 
-          <h4 style="margin:16px 0 8px">含此{{ oils.isDropUnit(selectedOilName) ? '精油' : '产品' }}的配方</h4>
+          <h4 style="margin:16px 0 8px">含此精油的配方</h4>
           <div v-if="recipesWithOil.length" class="detail-recipes">
             <div v-for="r in recipesWithOil" :key="r._id" class="detail-recipe-item">
               <span class="dr-name">{{ r.name }}</span>
-              <span class="dr-drops">{{ getDropsForOil(r, selectedOilName) }}{{ oils.unitLabel(selectedOilName) }}</span>
+              <span class="dr-drops">{{ getDropsForOil(r, selectedOilName) }}滴</span>
             </div>
           </div>
           <div v-else class="empty-hint">暂无使用此精油的配方</div>
@@ -305,7 +260,7 @@
     </div>
 
     <!-- Edit Oil Overlay -->
-    <div v-if="editingOilName" class="modal-overlay" @mousedown.self="editingOilName = null" @keydown.enter="$event.isComposing || saveEditOil()">
+    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="$event.isComposing || saveEditOil()">
       <div class="modal-panel">
         <div class="modal-header">
           <h3>{{ editingOilName }}</h3>
@@ -432,15 +387,12 @@ const activeCardName = ref(null)
 const activeCard = ref(null)
 
 // Add oil form
-const addType = ref('oil')
 const newOilName = ref('')
 const newOilEnName = ref('')
 const newBottlePrice = ref(null)
 const newVolume = ref('5')
 const newCustomDrops = ref(null)
 const newRetailPrice = ref(null)
-const newProductAmount = ref(null)
-const newProductUnit = ref('ml')
 
 // Edit oil
 const editingOilName = ref(null)
@@ -520,24 +472,11 @@ for (const [ml, drops] of Object.entries(VOLUME_OPTIONS)) {
   DROPS_TO_VOLUME[drops] = ml + 'ml'
 }
 
-function oilPriceUnit(name) {
-  return oils.unitLabel(name)
-}
-
 function volumeLabel(dropCount, name) {
-  if (!oils.isDropUnit(name)) return dropCount + oils.unitLabel(name)
+  if (dropCount === 160) return '160颗'
   return DROPS_TO_VOLUME[dropCount] || (dropCount + '滴')
 }
 
-function volumeWithDrops(name) {
-  const meta = getMeta(name)
-  if (!meta || !meta.dropCount) return '--'
-  if (!oils.isDropUnit(name)) return meta.dropCount + oils.unitLabel(name)
-  const ml = DROPS_TO_VOLUME[meta.dropCount]
-  if (ml) return `${ml}/${meta.dropCount}滴`
-  return meta.dropCount + '滴'
-}
-
 function chipStyle(name) {
   const hasCard = !!getOilCard(name)
   if (hasCard) return 'cursor:pointer;border-left:3px solid var(--sage);background:linear-gradient(90deg,var(--sage-mist),white)'
@@ -679,29 +618,6 @@ async function addOil() {
   }
 }
 
-async function addProduct() {
-  if (!newOilName.value.trim() || !newProductAmount.value) return
-  try {
-    await oils.saveOil(
-      newOilName.value.trim(),
-      newBottlePrice.value || 0,
-      newProductAmount.value,
-      newRetailPrice.value || null,
-      newOilEnName.value.trim() || null,
-      newProductUnit.value
-    )
-    ui.showToast(`已添加: ${newOilName.value}`)
-    newOilName.value = ''
-    newOilEnName.value = ''
-    newBottlePrice.value = null
-    newProductAmount.value = null
-    newProductUnit.value = 'ml'
-    newRetailPrice.value = null
-  } catch (e) {
-    ui.showToast('添加失败: ' + (e.message || ''))
-  }
-}
-
 function editOil(name) {
   editingOilName.value = name
   editOilDisplayName.value = name
@@ -1110,24 +1026,12 @@ async function saveCardImage(name) {
 }
 
 /* ===== Add Oil Form ===== */
-.add-type-tabs { display: flex; gap: 0; margin-bottom: 10px; }
-.add-type-tab {
-  padding: 6px 20px; text-align: center; font-size: 13px; cursor: pointer;
-  border: 1.5px solid var(--border, #d4cfc7); background: #fff; color: var(--text-mid, #6b6375);
-  font-family: inherit;
-}
-.add-type-tab:first-child { border-radius: 8px 0 0 8px; }
-.add-type-tab:last-child { border-radius: 0 8px 8px 0; border-left: none; }
-.add-type-tab.active { background: var(--sage, #7a9e7e); color: #fff; border-color: var(--sage, #7a9e7e); }
-
 .add-oil-form {
   margin-bottom: 16px;
   padding: 14px;
   background: var(--sage-mist, #eef4ee);
   border-radius: 12px;
   border: 1.5px solid var(--border, #e0d4c0);
-  display: flex;
-  flex-direction: column;
 }
 /* Hide number input spinners in add form */
 .add-oil-form input[type="number"]::-webkit-inner-spin-button,

frontend/src/views/Projects.vue

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

frontend/src/views/RecipeSearch.vue

@@ -169,13 +169,12 @@ 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 { useRecipesStore } from '../stores/recipes'
 import { useDiaryStore } from '../stores/diary'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
 import RecipeCard from '../components/RecipeCard.vue'
 import RecipeDetailOverlay from '../components/RecipeDetailOverlay.vue'
-import { oilEn } from '../composables/useOilTranslation'
 
 const auth = useAuthStore()
 const oils = useOilsStore()
@@ -239,8 +238,6 @@ onMounted(async () => {
 
 function selectCategory(cat) {
   selectedCategory.value = cat.tag_name || cat.name
-  searchQuery.value = ''
-  reportedMissing.value = false
 }
 
 function slideCat(dir) {
@@ -250,7 +247,7 @@ function slideCat(dir) {
 
 // Public recipes (all recipes in the public library)
 const filteredRecipes = computed(() => {
-  let list = recipeStore.recipes.filter(r => !r.tags || !r.tags.includes('已下架'))
+  let list = recipeStore.recipes
   if (selectedCategory.value) {
     list = list.filter(r => r.tags && r.tags.includes(selectedCategory.value))
   }
@@ -316,15 +313,10 @@ function expandQuery(q) {
 const exactResults = computed(() => {
   if (!searchQuery.value.trim()) return []
   const q = searchQuery.value.trim().toLowerCase()
-  const isEn = /^[a-zA-Z\s]+$/.test(q)
   return recipeStore.recipes.filter(r => {
-    if (r.tags && r.tags.includes('已下架')) return false
     const nameMatch = r.name.toLowerCase().includes(q)
-    const enNameMatch = isEn && (r.en_name || '').toLowerCase().includes(q)
+    const tagMatch = r.tags && r.tags.some(t => t.toLowerCase().includes(q))
-    const oilEnMatch = isEn && r.ingredients.some(ing => (oilEn(ing.oil) || '').toLowerCase().includes(q))
+    return nameMatch || tagMatch
-    const visibleTags = auth.canEdit ? (r.tags || []) : (r.tags || []).filter(t => !EDITOR_ONLY_TAGS.includes(t))
-    const tagMatch = visibleTags.some(t => t.toLowerCase().includes(q))
-    return nameMatch || enNameMatch || oilEnMatch || tagMatch
   }).sort((a, b) => a.name.localeCompare(b.name, 'zh'))
 })
 
@@ -337,7 +329,6 @@ const similarResults = computed(() => {
   const terms = expandQuery(q).filter(t => t.length >= 2 || t === q)
 
   return recipeStore.recipes.filter(r => {
-    if (r.tags && r.tags.includes('已下架')) return false
     if (exactIds.has(r._id)) return false
     const name = r.name
     // Match by expanded synonyms (name only, not ingredients)
@@ -377,7 +368,7 @@ const myDiaryRecipes = computed(() => {
 
 const favoritesPreview = computed(() => {
   if (!auth.isLoggedIn) return []
-  let list = recipeStore.recipes.filter(r => recipeStore.isFavorite(r) && !(r.tags && r.tags.includes('已下架')))
+  let list = recipeStore.recipes.filter(r => recipeStore.isFavorite(r))
   if (searchQuery.value.trim()) {
     const q = searchQuery.value.trim().toLowerCase()
     list = list.filter(r => {
@@ -728,7 +719,7 @@ function onCarouselTouchEnd(e) {
   font-size: 14px;
   font-weight: 600;
   color: #3e3a44;
-  padding: 10px 12px;
+  padding: 8px 4px;
   margin-bottom: 8px;
 }
 

frontend/src/views/UserManagement.vue

@@ -30,11 +30,10 @@
             <div class="review-info">
               <span class="review-name">{{ group.latest.display_name || group.latest.username }}</span>
               <span class="review-reason">商户名：{{ group.latest.business_name }}</span>
-              <span class="biz-status-tag" :class="'biz-' + group.effectiveStatus">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.effectiveStatus] }}</span>
+              <span class="biz-status-tag" :class="'biz-' + group.latest.status">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.latest.status] }}</span>
-              <img v-if="group.latest.document && group.latest.document.startsWith('data:image')" :src="group.latest.document" class="biz-doc-preview" @click="showDocFull = group.latest.document" />
             </div>
             <div class="review-actions">
-              <template v-if="group.effectiveStatus === 'pending'">
+              <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>
@@ -82,7 +81,10 @@
     <div class="user-list">
       <div v-for="u in filteredUsers" :key="u._id || u.id" class="user-card">
         <div class="user-info">
-          <div class="user-name">{{ u.username }}</div>
+          <div class="user-name">
+            {{ u.display_name || u.username }}
+            <span class="user-username" v-if="u.display_name">@{{ u.username }}</span>
+          </div>
           <div class="user-meta">
             <span class="user-role-badge" :class="'role-' + u.role">{{ roleLabel(u.role) }}</span>
             <span v-if="u.business_verified" class="biz-badge">💼 商业认证</span>
@@ -91,29 +93,24 @@
         </div>
         <div class="user-actions">
           <select
-            v-if="u.role !== 'admin'"
             :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>
           </select>
-          <button v-if="u.business_verified" class="btn-sm btn-outline" @click="revokeBusiness(u)" title="撤销商业认证">💼</button>
+          <button v-if="!u.business_verified" class="btn-sm btn-outline" @click="grantBusiness(u)" title="开通商业认证">💼</button>
-          <button v-else class="btn-sm btn-outline" @click="grantBusiness(u)" title="开通商业认证" style="opacity:0.3">💼</button>
+          <button v-else class="btn-sm btn-outline" @click="revokeBusiness(u)" title="撤销商业认证" style="opacity:0.5">💼✕</button>
-          <button class="btn-sm btn-delete" @click="removeUser(u)" :disabled="u.role === 'admin'" title="删除用户">🗑️</button>
+          <button class="btn-sm btn-delete" @click="removeUser(u)" title="删除用户">🗑️</button>
         </div>
       </div>
       <div v-if="filteredUsers.length === 0" class="empty-hint">未找到用户</div>
     </div>
 
     <div class="user-count">共 {{ users.length }} 个用户</div>
-
-    <!-- Full-size document preview -->
-    <div v-if="showDocFull" class="doc-overlay" @click="showDocFull = null">
-      <img :src="showDocFull" class="doc-full-img" />
-    </div>
   </div>
 </template>
 
@@ -131,7 +128,6 @@ const users = ref([])
 const searchQuery = ref('')
 const filterRole = ref('')
 const translations = ref([])
-const showDocFull = ref(null)
 const businessApps = ref([])
 import { reactive } from 'vue'
 
@@ -145,13 +141,6 @@ const groupedBizApps = computed(() => {
   return Object.values(map).map(g => {
     g.history.sort((a, b) => b.id - a.id)
     g.latest = g.history[0]
-    // Check if user is already verified (from users list)
-    const user = users.value.find(u => (u._id || u.id) === g.user_id)
-    if (user && user.business_verified) {
-      g.effectiveStatus = 'approved'
-    } else {
-      g.effectiveStatus = g.latest.status
-    }
     return reactive(g)
   }).filter(g => g.latest)
 })
@@ -162,10 +151,10 @@ function formatDate(d) {
 }
 
 const roles = [
+  { value: 'admin', label: '管理员' },
   { value: 'senior_editor', label: '高级编辑' },
   { value: 'editor', label: '编辑' },
   { value: 'viewer', label: '查看者' },
-  { value: 'business', label: '企业用户' },
 ]
 
 const filteredUsers = computed(() => {
@@ -178,11 +167,7 @@ const filteredUsers = computed(() => {
     )
   }
   if (filterRole.value) {
-    if (filterRole.value === 'business') {
+    list = list.filter(u => u.role === filterRole.value)
-      list = list.filter(u => u.business_verified)
-    } else {
-      list = list.filter(u => u.role === filterRole.value)
-    }
   }
   return list
 })
@@ -451,10 +436,6 @@ onMounted(() => {
 }
 .biz-reject-reason { color: #c62828; font-size: 11px; }
 .biz-time { color: #bbb; font-size: 11px; margin-left: auto; }
-.biz-doc-preview { width: 60px; height: 60px; object-fit: cover; border-radius: 6px; cursor: pointer; border: 1px solid #e5e4e7; margin-top: 6px; }
-.biz-doc-preview:hover { border-color: #7ec6a4; }
-.doc-overlay { position: fixed; inset: 0; background: rgba(0,0,0,0.7); z-index: 1000; display: flex; align-items: center; justify-content: center; cursor: pointer; }
-.doc-full-img { max-width: 90vw; max-height: 90vh; border-radius: 10px; }
 
 .btn-approve {
   background: #4a9d7e;
@@ -758,5 +739,4 @@ onMounted(() => {
     justify-content: flex-end;
   }
 }
-
 </style>

frontend/vite.config.js

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