test: PR#29测试 — 拼音匹配扩展、viewer标签可见性

新增14个单元测试:
- 拼音匹配: mlk→麦卢卡、tx→檀香等11个用例
- viewer标签可见性: 只看自己diary标签、不看公共标签

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

.gitignore

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

backend/database.py

@@ -165,6 +165,8 @@ 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()]

backend/main.py

@@ -6,12 +6,18 @@ 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)
@@ -57,7 +63,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 FROM users WHERE token = ?", (token,)).fetchone()
+    user = conn.execute("SELECT id, username, role, display_name, password, business_verified, username_changed FROM users WHERE token = ?", (token,)).fetchone()
     conn.close()
     if not user:
         return ANON_USER
@@ -93,6 +99,7 @@ class RecipeIn(BaseModel):
     note: str = ""
     ingredients: list[IngredientIn]
     tags: list[str] = []
+    en_name: Optional[str] = None
 
 
 class RecipeUpdate(BaseModel):
@@ -125,7 +132,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.get("display_name", ""), "id": user.get("id"), "has_password": bool(user.get("password")), "business_verified": bool(user.get("business_verified"))}
+    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"))}
 
 
 # ── Bug Reports ─────────────────────────────────────────
@@ -343,20 +350,24 @@ 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位")
-    token = _secrets.token_hex(24)
+    # 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)
     try:
         conn.execute(
             "INSERT INTO users (username, token, role, display_name, password) VALUES (?, ?, ?, ?, ?)",
-            (username, token, "viewer", display_name or username, hash_password(password))
+            (username, token, "viewer", 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, display_name or username, None)
+        log_audit(conn, uid["id"] if uid else None, "register", "user", username, username, None)
         conn.commit()
     except Exception:
         conn.close()
@@ -373,7 +384,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 FROM users WHERE username = ?", (username,)).fetchone()
+    user = conn.execute("SELECT id, token, password, display_name, role, username FROM users WHERE LOWER(username) = LOWER(?)", (username,)).fetchone()
     if not user:
         conn.close()
         raise HTTPException(401, "用户名不存在")
@@ -445,6 +456,30 @@ 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)):
@@ -693,7 +728,7 @@ def upsert_oil(oil: OilIn, user=Depends(require_role("admin", "senior_editor")))
         "ON CONFLICT(name) DO UPDATE SET bottle_price=excluded.bottle_price, drop_count=excluded.drop_count, "
         "retail_price=excluded.retail_price, en_name=COALESCE(excluded.en_name, oils.en_name), "
         "is_active=COALESCE(excluded.is_active, oils.is_active)",
-        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, oil.en_name, oil.is_active),
+        (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),
     )
     log_audit(conn, user["id"], "upsert_oil", "oil", oil.name, oil.name,
               json.dumps({"bottle_price": oil.bottle_price, "drop_count": oil.drop_count}))
@@ -789,8 +824,9 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
         admin = c.execute("SELECT id FROM users WHERE role = 'admin' LIMIT 1").fetchone()
         if admin:
             owner_id = admin["id"]
-    c.execute("INSERT INTO recipes (name, note, owner_id) VALUES (?, ?, ?)",
+    en_name = title_case(recipe.en_name) if recipe.en_name else auto_translate(recipe.name)
-              (recipe.name, recipe.note, owner_id))
+    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(
@@ -850,10 +886,13 @@ 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 = ?", (update.en_name, recipe_id))
+        c.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (title_case(update.en_name), recipe_id))
     if update.ingredients is not None:
         c.execute("DELETE FROM recipe_ingredients WHERE recipe_id = ?", (recipe_id,))
         for ing in update.ingredients:
@@ -916,6 +955,10 @@ 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}))
@@ -1096,10 +1139,45 @@ 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(snapshot, ensure_ascii=False))
+              json.dumps(detail, ensure_ascii=False))
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1533,6 +1611,8 @@ 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)):
@@ -1598,7 +1678,10 @@ def my_contribution(user=Depends(get_current_user)):
         (f'%"from_user": "{display}"%',)
     ).fetchall()
     adopted_names = list(set(r["target_name"] for r in adopted_rows if r["target_name"]))
-    # pending: recipes still owned by user in public library
+    # pending: recipes still owned by user in public library (skip admin — admin owns all public recipes)
+    if user.get("role") == "admin":
+        pending_names = []
+    else:
         pending_rows = conn.execute(
             "SELECT name FROM recipes WHERE owner_id = ?", (user["id"],)
         ).fetchall()
@@ -1811,6 +1894,36 @@ 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

@@ -0,0 +1,108 @@
+"""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

@@ -0,0 +1,112 @@
+"""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/pr27-features.cy.js

@@ -0,0 +1,661 @@
+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/src/App.vue

@@ -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.display_name || auth.user.username }} ▾</span>
+          <span class="user-name">{{ auth.user.username }} ▾</span>
           <span v-if="unreadNotifCount > 0" class="notif-badge">{{ unreadNotifCount }}</span>
         </template>
         <template v-else>
@@ -88,6 +88,7 @@ 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)

frontend/src/__tests__/pr27Features.test.js

@@ -0,0 +1,378 @@
+import { describe, it, expect } from 'vitest'
+import { recipeNameEn, oilEn } from '../composables/useOilTranslation'
+import { matchesPinyinInitials, getPinyinInitials } 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)
+  })
+})

frontend/src/components/LoginModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login-overlay" @click.self="$emit('close')">
+  <div class="login-overlay" @mousedown.self="$emit('close')">
     <div class="login-card">
       <div class="login-header">
         <span
@@ -37,14 +37,6 @@
           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>
 
@@ -80,7 +72,6 @@ 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)
@@ -109,11 +100,7 @@ async function submit() {
       await auth.login(username.value.trim(), password.value)
       ui.showToast('登录成功')
     } else {
-      await auth.register(
+      await auth.register(username.value.trim(), password.value)
-        username.value.trim(),
-        password.value,
-        displayName.value.trim() || username.value.trim()
-      )
       ui.showToast('注册成功')
     }
     emit('close')

frontend/src/components/RecipeDetailOverlay.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="detail-overlay" @click.self="$emit('close')">
+  <div class="detail-overlay" @mousedown.self="$emit('close')">
     <div class="detail-panel">
       <!-- ==================== CARD VIEW ==================== -->
       <div v-if="viewMode === 'card'" class="detail-card-view">
@@ -64,7 +64,7 @@
             <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 }} {{ cardLang === 'en' ? 'drops' : '滴' }}</span>
+                <span class="ec-drops">{{ ing.drops }} {{ cardLang === 'en' ? (ing.drops === 1 ? 'drop' : '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>

frontend/src/components/TagPicker.vue

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

frontend/src/components/UserMenu.vue

@@ -1,7 +1,10 @@
 <template>
-  <div class="usermenu-overlay" @click.self="$emit('close')">
+  <div class="usermenu-overlay" @mousedown.self="$emit('close')">
     <div class="usermenu-card">
-      <div class="usermenu-name">{{ auth.user.display_name || auth.user.username }}</div>
+      <div class="usermenu-name">
+        {{ 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">
@@ -38,6 +41,9 @@
               <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>
                 <!-- 默认：已读按钮 -->
@@ -129,6 +135,36 @@ 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
@@ -215,7 +251,9 @@ onMounted(loadNotifications)
   z-index: 4001;
 }
 
-.usermenu-name { font-size: 16px; font-weight: 600; color: #3e3a44; margin-bottom: 14px; }
+.usermenu-name { font-size: 16px; font-weight: 600; color: #3e3a44; margin-bottom: 14px; display: flex; align-items: center; gap: 8px; }
+.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,10 +37,58 @@ 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) {
-  // Try to translate known keywords
+  if (!name) return name
-  // Simple approach: return original name for now, user can customize
+  const parts = []
-  return name
+  let i = 0
+  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,6 +57,25 @@ 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',
 }
 
 /**

frontend/src/stores/auth.js

@@ -40,9 +40,10 @@ export const useAuthStore = defineStore('auth', () => {
         id: data.id,
         role: data.role,
         username: data.username,
-        display_name: data.display_name,
+        display_name: data.username,
         has_password: data.has_password ?? false,
         business_verified: data.business_verified ?? false,
+        username_changed: data.username_changed ?? false,
       }
     } catch {
       logout()
@@ -56,11 +57,10 @@ export const useAuthStore = defineStore('auth', () => {
     await loadMe()
   }
 
-  async function register(username, password, displayName) {
+  async function register(username, password) {
     const data = await api.post('/api/register', {
       username,
       password,
-      display_name: displayName,
     })
     token.value = data.token
     localStorage.setItem('oil_auth_token', data.token)

frontend/src/stores/recipes.js

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { api } from '../composables/useApi'
 
-export const EDITOR_ONLY_TAGS = ['已审核']
+export const EDITOR_ONLY_TAGS = ['已审核', '已下架']
 
 export const useRecipesStore = defineStore('recipes', () => {
   const recipes = ref([])

frontend/src/views/BugTracker.vue

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

frontend/src/views/Inventory.vue

@@ -1,5 +1,11 @@
 <template>
   <div class="inventory-page">
+    <!-- Login prompt -->
+    <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
@@ -84,6 +90,7 @@
     <div v-else class="empty-hint">
       {{ ownedOils.length ? '暂无完全匹配的配方' : '添加精油后自动推荐配方' }}
     </div>
+    </template>
   </div>
 </template>
 
@@ -473,4 +480,7 @@ 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

@@ -208,22 +208,6 @@
 
     <!-- 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">

frontend/src/views/OilReference.vue

@@ -19,7 +19,7 @@
     </div>
 
     <!-- Dilution Ratio Modal -->
-    <div v-if="showDilution" class="modal-overlay" @click.self="showDilution = false">
+    <div v-if="showDilution" class="modal-overlay" @mousedown.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" @click.self="showContra = false">
+    <div v-if="showContra" class="modal-overlay" @mousedown.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>
@@ -161,7 +161,7 @@
     </div>
 
     <!-- Oil Knowledge Card Modal -->
-    <div v-if="activeCard && activeCardName" class="modal-overlay" @click.self="closeOilModal">
+    <div v-if="activeCard && activeCardName" class="modal-overlay" @mousedown.self="closeOilModal">
       <div class="oil-card-modal">
         <div class="oil-card-header">
           <div class="oil-card-header-content">

frontend/src/views/Projects.vue

@@ -207,7 +207,7 @@
     </div>
 
     <!-- Import From Recipe Modal -->
-    <div v-if="showImportModal" class="overlay" @click.self="showImportModal = false">
+    <div v-if="showImportModal" class="overlay" @mousedown.self="showImportModal = false">
       <div class="overlay-panel">
         <div class="overlay-header">
           <h3>从配方导入</h3>

frontend/src/views/RecipeManager.vue

@@ -1,5 +1,11 @@
 <template>
   <div class="recipe-manager">
+    <!-- Login prompt for non-logged-in users -->
+    <div v-if="!auth.isLoggedIn" class="login-prompt">
+      <p>登录后可管理配方、创建个人配方集</p>
+      <button class="btn-primary" @click="ui.openLogin()">登录 / 注册</button>
+    </div>
+    <template v-else>
     <!-- Review Bar (admin + senior_editor with assigned reviews) -->
     <div v-if="(auth.isAdmin || auth.canManage) && pendingCount > 0" class="review-bar" @click="showPending = !showPending" >
       📝 待审核配方: {{ pendingCount }} 条
@@ -77,7 +83,7 @@
       </div>
       <div class="candidate-tags">
         <span
-          v-for="tag in recipeStore.allTags.filter(t => !batchTagsSelected.includes(t))"
+          v-for="tag in visibleAllTags.filter(t => !batchTagsSelected.includes(t))"
           :key="tag"
           class="candidate-tag"
           @click="batchTagsSelected.push(tag)"
@@ -388,6 +394,7 @@
       @save="onTagPickerSave"
       @close="showTagPicker = false"
     />
+    </template>
   </div>
 </template>
 
@@ -857,6 +864,13 @@ function filteredOilNames(search) {
 }
 
 function selectOil(ing, name) {
+  // Check for duplicate oil in current recipe
+  const existing = formIngredients.value.find(i => i !== ing && i.oil === name)
+  if (existing) {
+    ui.showToast(`已有「${name}」，请直接修改滴数`)
+    ing._open = false
+    return
+  }
   ing.oil = name
   ing._search = name
   ing._open = false
@@ -1294,9 +1308,13 @@ const previewRecipeIndex = ref(null)
 const previewRecipeData = ref(null)
 const showBatchMenu = ref(false)
 const visibleAllTags = computed(() => {
-  const tags = recipeStore.allTags
+  if (auth.canEdit) return recipeStore.allTags
-  if (auth.canEdit) return tags
+  // Viewer: only show tags from their own diary recipes
-  return tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+  const myTags = new Set()
+  for (const d of diaryStore.userDiary) {
+    for (const t of (d.tags || [])) myTags.add(t)
+  }
+  return [...myTags].sort((a, b) => a.localeCompare(b, 'zh'))
 })
 const showBatchTagPicker = ref(false)
 const batchTagsSelected = ref([])
@@ -1672,6 +1690,11 @@ watch(() => recipeStore.recipes, () => {
   padding: 0 12px 24px;
 }
 
+.login-prompt {
+  text-align: center; padding: 60px 20px; color: #6b6375;
+}
+.login-prompt p { margin-bottom: 16px; font-size: 15px; }
+
 .review-bar {
   background: linear-gradient(135deg, #fff3e0, #ffe0b2);
   padding: 12px 16px;

frontend/src/views/RecipeSearch.vue

@@ -250,7 +250,7 @@ function slideCat(dir) {
 
 // Public recipes (all recipes in the public library)
 const filteredRecipes = computed(() => {
-  let list = recipeStore.recipes
+  let list = recipeStore.recipes.filter(r => !r.tags || !r.tags.includes('已下架'))
   if (selectedCategory.value) {
     list = list.filter(r => r.tags && r.tags.includes(selectedCategory.value))
   }
@@ -318,6 +318,7 @@ const exactResults = computed(() => {
   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 oilEnMatch = isEn && r.ingredients.some(ing => (oilEn(ing.oil) || '').toLowerCase().includes(q))
@@ -336,6 +337,7 @@ 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)
@@ -375,7 +377,7 @@ const myDiaryRecipes = computed(() => {
 
 const favoritesPreview = computed(() => {
   if (!auth.isLoggedIn) return []
-  let list = recipeStore.recipes.filter(r => recipeStore.isFavorite(r))
+  let list = recipeStore.recipes.filter(r => recipeStore.isFavorite(r) && !(r.tags && r.tags.includes('已下架')))
   if (searchQuery.value.trim()) {
     const q = searchQuery.value.trim().toLowerCase()
     list = list.filter(r => {

frontend/src/views/UserManagement.vue

@@ -82,10 +82,7 @@
     <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">
+          <div class="user-name">{{ u.username }}</div>
-            {{ 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>
@@ -94,18 +91,18 @@
         </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="grantBusiness(u)" title="开通商业认证">💼</button>
+          <button v-if="u.business_verified" class="btn-sm btn-outline" @click="revokeBusiness(u)" title="撤销商业认证">💼</button>
-          <button v-else class="btn-sm btn-outline" @click="revokeBusiness(u)" title="撤销商业认证" style="opacity:0.5">💼✕</button>
+          <button v-else class="btn-sm btn-outline" @click="grantBusiness(u)" title="开通商业认证" style="opacity:0.3">💼</button>
-          <button class="btn-sm btn-delete" @click="removeUser(u)" title="删除用户">🗑️</button>
+          <button class="btn-sm btn-delete" @click="removeUser(u)" :disabled="u.role === 'admin'" title="删除用户">🗑️</button>
         </div>
       </div>
       <div v-if="filteredUsers.length === 0" class="empty-hint">未找到用户</div>
@@ -165,10 +162,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(() => {
@@ -181,8 +178,12 @@ const filteredUsers = computed(() => {
     )
   }
   if (filterRole.value) {
+    if (filterRole.value === 'business') {
+      list = list.filter(u => u.business_verified)
+    } else {
       list = list.filter(u => u.role === filterRole.value)
     }
+  }
   return list
 })
 
@@ -757,4 +758,5 @@ onMounted(() => {
     justify-content: flex-end;
   }
 }
+
 </style>