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

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

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

backend/main.py

@@ -477,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}
@@ -520,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}
@@ -543,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:
@@ -554,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}
@@ -626,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}
@@ -653,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}
@@ -781,14 +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
-    owner_id = user["id"]
-    if user["role"] in ("senior_editor",):
-        admin = c.execute("SELECT id FROM users WHERE role = 'admin' LIMIT 1").fetchone()
-        if admin:
-            owner_id = admin["id"]
     c.execute("INSERT INTO recipes (name, note, owner_id) VALUES (?, ?, ?)",
-              (recipe.name, recipe.note, owner_id))
+              (recipe.name, recipe.note, user["id"]))
     rid = c.lastrowid
     for ing in recipe.ingredients:
         c.execute(
@@ -799,21 +781,15 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
         c.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (tag,))
         c.execute("INSERT OR IGNORE INTO recipe_tags (recipe_id, tag_name) VALUES (?, ?)", (rid, tag))
     log_audit(conn, user["id"], "create_recipe", "recipe", rid, recipe.name)
-    who = user.get("display_name") or user["username"]
+    # Notify admin and senior editors when non-admin creates a recipe
-    if user["role"] == "senior_editor":
+    if user["role"] not in ("admin", "senior_editor"):
-        # Senior editor adds directly — just inform admin
+        who = user.get("display_name") or user["username"]
-        conn.execute(
+        for role in ("admin", "senior_editor"):
-            "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
+            conn.execute(
-            ("admin", "📋 新配方已添加",
+                "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
-             f"{who} 将配方「{recipe.name}」添加到了公共配方库。\n[recipe_id:{rid}]")
+                (role, "📝 新配方待审核",
-        )
+                 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}
@@ -824,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, "权限不足")
 
@@ -918,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:
@@ -940,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}
@@ -1094,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()
@@ -1104,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}
@@ -1552,35 +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
+        "SELECT COUNT(*) FROM recipes WHERE owner_id = ?", (user["id"],)
-    pending_rows = conn.execute(
+    ).fetchone()[0]
-        "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 ──────────────────────────────────────
@@ -1622,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()

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/components/RecipeCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="recipe-card" @click="$emit('click', index)">
-    <div class="recipe-card-name">{{ recipe.name }}</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>

frontend/src/components/RecipeDetailOverlay.vue

@@ -6,16 +6,19 @@
         <!-- 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,7 +61,7 @@
             <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">
@@ -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>
 
@@ -585,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) {
@@ -627,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(),
@@ -1142,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;
@@ -1226,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; }
@@ -1817,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/UserMenu.vue

@@ -131,33 +131,17 @@ function isSearchMissing(n) {
 
 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')

frontend/src/stores/auth.js

@@ -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/views/AuditLog.vue

@@ -91,11 +91,6 @@ const ACTION_MAP = {
   update_user: '修改用户',
   delete_user: '删除用户',
   undo_delete_user: '恢复用户',
-  business_apply: '申请商业认证',
-  approve_business: '通过商业认证',
-  reject_business: '拒绝商业认证',
-  grant_business: '开通商业认证',
-  revoke_business: '撤销商业认证',
 }
 
 const actionTypes = [
@@ -104,7 +99,6 @@ const actionTypes = [
   { value: 'user', label: '用户' },
   { value: 'tag', label: '标签' },
   { value: 'adopt', label: '审核' },
-  { value: 'business', label: '商业认证' },
 ]
 
 const targetTypes = [
@@ -153,10 +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.display_name) parts.push(`显示名: ${d.display_name}`)
     if (d.original_log_id) parts.push(`恢复自 #${d.original_log_id}`)
     if (parts.length) return parts.join(' · ')

frontend/src/views/MyDiary.vue

@@ -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>
@@ -505,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
   })
 }
@@ -574,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
@@ -610,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
@@ -1178,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

@@ -98,15 +98,15 @@
         <button @click="viewMode = 'drop'" :style="viewMode === 'drop' ? 'background:var(--sage);color:white' : 'background:white;color:var(--text-mid)'" style="border:none;border-radius:0;font-size:12px;padding:6px 12px;cursor:pointer">每滴价</button>
       </div>
       <!-- Desktop: text buttons -->
-      <button v-if="auth.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="form-row">
         <input v-model="newOilName" style="flex:1;min-width:120px" placeholder="精油名称" class="form-input-sm" />
         <input v-model="newOilEnName" style="flex:1;min-width:100px" placeholder="英文名" class="form-input-sm" />
@@ -152,7 +152,7 @@
             </div>
           </template>
         </div>
-        <div v-if="auth.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>

frontend/src/views/RecipeManager.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="recipe-manager">
-    <!-- Review Bar (admin + senior_editor with assigned reviews) -->
+    <!-- Review Bar (admin only) -->
-    <div v-if="(auth.isAdmin || auth.canManage) && pendingCount > 0" class="review-bar" @click="showPending = !showPending" >
+    <div v-if="auth.isAdmin && pendingCount > 0" class="review-bar" @click="showPending = !showPending" >
       📝 待审核配方: {{ pendingCount }} 条
       <span class="toggle-icon">{{ showPending ? '▾' : '▸' }}</span>
     </div>
@@ -9,44 +9,45 @@
       <div v-for="r in pendingRecipes" :key="r._id" class="pending-item">
         <span class="pending-name clickable" @click="openRecipeDetail(r)">{{ r.name }}</span>
         <span class="pending-owner">{{ r._owner_name }}</span>
-        <template v-if="auth.isAdmin">
+        <button class="btn-sm btn-approve" @click="approveRecipe(r)">通过</button>
-          <button class="btn-sm btn-approve" @click="approveRecipe(r)">通过</button>
+        <button class="btn-sm btn-reject" @click="rejectRecipe(r)">拒绝</button>
-          <button class="btn-sm btn-reject" @click="rejectRecipe(r)">拒绝</button>
-          <button class="btn-sm btn-outline" @click="r._showAssign = !r._showAssign">指派</button>
-          <div v-if="r._showAssign" class="assign-row">
-            <select v-model="r._assignTo" class="assign-select">
-              <option value="">选择审核人...</option>
-              <option v-for="u in seniorEditors" :key="u.id" :value="u.id">{{ u.display_name || u.username }}</option>
-            </select>
-            <button class="btn-sm btn-primary" @click="assignReview(r)" :disabled="!r._assignTo">发送</button>
-          </div>
-        </template>
-        <template v-else>
-          <button class="btn-sm btn-approve" @click="recommendApprove(r)">推荐通过</button>
-          <button class="btn-sm btn-reject" @click="rejectRecipe(r)">拒绝</button>
-        </template>
       </div>
     </div>
 
-    <!-- Search bar -->
+    <!-- Row 1: Search (editor+) -->
-    <div class="search-bar">
+    <template v-if="auth.canEdit">
-      <div class="search-box">
+      <div class="manage-toolbar">
-        <input class="search-input" v-model="manageSearch" placeholder="搜索配方名、精油、标签..." />
+        <div class="search-box">
-        <button v-if="manageSearch" class="search-clear-btn" @click="manageSearch = ''">✕</button>
+          <input class="search-input" v-model="manageSearch" placeholder="搜索配方..." />
+          <button v-if="manageSearch" class="search-clear-btn" @click="manageSearch = ''">✕</button>
+        </div>
       </div>
-    </div>
+    </template>
 
-    <!-- Action buttons -->
+    <!-- Row 2: Add + Select + Tags + Batch + Export -->
-    <div class="action-bar">
+    <div class="toolbar-row">
-      <button class="action-chip" @click="showAddOverlay = true">新增</button>
+      <button v-if="auth.canEdit" class="btn-outline btn-sm" @click="showAddOverlay = true">新增</button>
-      <button class="action-chip" :class="{ active: isAllSelected }" @click="toggleSelectAll">
+      <button
-        全选<span v-if="totalSelected > 0" class="chip-count">{{ totalSelected }}</span>
+        class="btn-sm"
+        :class="isAllSelected ? 'btn-select-active' : 'btn-outline'"
+        @click="toggleSelectAll"
+      >全选</button>
+      <span v-if="totalSelected > 0" class="select-count">共{{ totalSelected }}个</span>
+      <button class="tag-toggle-btn" @click="showTagFilter = !showTagFilter">
+        标签 {{ showTagFilter ? '▾' : '▸' }}
       </button>
-      <button class="action-chip" :class="{ active: showTagFilter }" @click="showTagFilter = !showTagFilter">标签</button>
+      <button v-if="totalSelected > 0" class="tag-toggle-btn" @click="showBatchMenu = !showBatchMenu">
-      <button v-if="totalSelected > 0" class="action-chip" :class="{ active: showBatchMenu }" @click="showBatchMenu = !showBatchMenu">批量</button>
+        批量操作 {{ showBatchMenu ? '▾' : '▸' }}
-      <button v-if="totalSelected > 0" class="action-chip cancel" @click="clearSelection">取消</button>
+      </button>
+      <button v-if="totalSelected > 0" class="btn-sm btn-outline" @click="clearSelection">取消</button>
       <button v-if="auth.isAdmin" class="export-btn" @click="exportExcel" title="导出Excel">📥</button>
     </div>
+    <div v-if="showBatchMenu && totalSelected > 0" class="batch-menu">
+      <button class="batch-menu-btn" @click="executeBatchAction('tag')">🏷 批量打标签</button>
+      <button class="batch-menu-btn" @click="executeBatchAction('export')">📷 批量导出卡片</button>
+      <button v-if="selectedDiaryIds.size > 0 && selectedIds.size === 0" class="batch-menu-btn" @click="executeBatchAction('share_public')">📤 批量共享到公共库</button>
+      <button class="batch-menu-btn batch-delete" @click="executeBatchAction('delete')">🗑 批量删除</button>
+    </div>
     <div v-if="showTagFilter" class="tag-list-bar">
       <span
         v-for="tag in recipeStore.allTags"
@@ -61,55 +62,15 @@
       </div>
     </div>
 
-    <div v-if="showBatchMenu && totalSelected > 0" class="batch-menu">
-      <button class="batch-menu-btn" @click="doBatch('tag')">🏷 批量打标签</button>
-      <button class="batch-menu-btn" @click="doBatch('export')">📷 批量导出卡片</button>
-      <button v-if="selectedDiaryIds.size > 0 && selectedIds.size === 0" class="batch-menu-btn" @click="doBatch('share_public')">📤 批量共享到公共库</button>
-      <button class="batch-menu-btn batch-delete" @click="doBatch('delete')">🗑 批量删除</button>
-    </div>
-    <!-- Batch Tag Picker -->
-    <div v-if="showBatchTagPicker" class="batch-tag-picker">
-      <div class="editor-tags">
-        <span v-for="tag in batchTagsSelected" :key="tag" class="editor-tag">
-          {{ tag }}
-          <span class="tag-remove" @click="batchTagsSelected = batchTagsSelected.filter(t => t !== tag)">×</span>
-        </span>
-      </div>
-      <div class="candidate-tags">
-        <span
-          v-for="tag in recipeStore.allTags.filter(t => !batchTagsSelected.includes(t))"
-          :key="tag"
-          class="candidate-tag"
-          @click="batchTagsSelected.push(tag)"
-        >+ {{ tag }}</span>
-      </div>
-      <div class="tag-input-row">
-        <input v-model="batchNewTag" class="editor-input" placeholder="新标签..." @keydown.enter="addBatchTag" style="flex:1;max-width:120px" />
-        <button class="action-btn action-btn-sm" @click="addBatchTag" :disabled="!batchNewTag.trim()">+</button>
-      </div>
-      <div v-if="batchExistingTags.length" style="margin-top:8px">
-        <div style="font-size:12px;color:#999;margin-bottom:4px">点击移除已有标签：</div>
-        <div class="editor-tags">
-          <span v-for="tag in batchExistingTags" :key="'rm-'+tag" class="editor-tag tag-removable" @click="batchTagsToRemove.includes(tag) ? batchTagsToRemove.splice(batchTagsToRemove.indexOf(tag),1) : batchTagsToRemove.push(tag)" :class="{ 'tag-marked-remove': batchTagsToRemove.includes(tag) }">
-            {{ tag }} <span style="margin-left:2px">{{ batchTagsToRemove.includes(tag) ? '✓移除' : '×' }}</span>
-          </span>
-        </div>
-      </div>
-      <div style="display:flex;gap:6px;margin-top:8px">
-        <button class="action-btn action-btn-primary action-btn-sm" @click="applyBatchTags">确认</button>
-        <button class="action-btn action-btn-sm" @click="showBatchTagPicker = false">取消</button>
-      </div>
-    </div>
-
     <!-- My Recipes Section (from diary) -->
     <div class="recipe-section">
       <h3 class="section-title clickable" @click="showMyRecipes = !showMyRecipes">
-        <button class="mini-select" :class="{ active: isMyAllSelected }" @click.stop="toggleMySelect" title="全选我的配方">✓</button>
+        <button class="mini-select" :class="{ active: isMyAllSelected }" @click.stop="toggleMySelect">✓</button>
         <span>📖 我的配方 ({{ myRecipes.length }})</span>
         <span v-if="!auth.isAdmin" class="contrib-tag">已贡献 {{ sharedCount.adopted }}/{{ sharedCount.total }} 条</span>
         <span class="toggle-icon">{{ showMyRecipes ? '▾' : '▸' }}</span>
       </h3>
-      <template v-if="showMyRecipes || manageSearch || selectedTags.length">
+      <template v-if="showMyRecipes || manageSearch">
       <div class="recipe-list">
         <div
           v-for="d in myFilteredRecipes"
@@ -125,6 +86,7 @@
           />
           <div class="row-info" @click="editDiaryRecipe(d)">
             <span class="row-name">{{ d.name }}</span>
+            <span class="row-owner">{{ auth.user?.display_name || auth.user?.username }}</span>
             <span class="row-tags">
               <span v-for="t in (d.tags || [])" :key="t" class="mini-tag">{{ t }}</span>
             </span>
@@ -133,7 +95,8 @@
             <span v-else-if="getDiaryShareStatus(d) === 'pending'" class="share-tag pending">等待审核</span>
           </div>
           <div class="row-actions">
-            <button class="btn-icon" @click="handleShare(d)" title="共享到公共配方库">📤</button>
+            <button v-if="getDiaryShareStatus(d) !== 'shared'" class="btn-icon" @click="shareDiaryToPublic(d)" title="共享到公共配方库">📤</button>
+            <button class="btn-icon" @click="editDiaryRecipe(d)" title="编辑">✏️</button>
             <button class="btn-icon" @click="removeDiaryRecipe(d)" title="删除">🗑️</button>
           </div>
         </div>
@@ -145,11 +108,11 @@
     <!-- Public Recipes Section (editor+) -->
     <div v-if="auth.canEdit" class="recipe-section">
       <h3 class="section-title clickable" @click="showPublicRecipes = !showPublicRecipes">
-        <button class="mini-select" :class="{ active: isPubAllSelected }" @click.stop="togglePubSelect" title="全选公共配方">✓</button>
+        <button class="mini-select" :class="{ active: isPubAllSelected }" @click.stop="togglePubSelect">✓</button>
         <span>🌿 公共配方库 ({{ publicRecipes.length }})</span>
         <span class="toggle-icon">{{ showPublicRecipes ? '▾' : '▸' }}</span>
       </h3>
-      <div v-if="showPublicRecipes || manageSearch || selectedTags.length" class="recipe-list">
+      <div v-if="showPublicRecipes || manageSearch" class="recipe-list">
         <div
           v-for="r in publicFilteredRecipes"
           :key="r._id"
@@ -164,12 +127,14 @@
           />
           <div class="row-info" @click="editRecipe(r)">
             <span class="row-name">{{ r.name }}</span>
+            <span class="row-owner">{{ r._owner_name }}</span>
             <span class="row-tags">
               <span v-for="t in r.tags" :key="t" class="mini-tag">{{ t }}</span>
             </span>
             <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(r.ingredients)) }}</span>
           </div>
           <div class="row-actions" v-if="auth.canEditRecipe(r)">
+            <button class="btn-icon" @click="editRecipe(r)" title="编辑">✏️</button>
             <button class="btn-icon" @click="removeRecipe(r)" title="删除">🗑️</button>
           </div>
         </div>
@@ -234,7 +199,7 @@
           </div>
           <div class="editor-header-actions">
             <button class="action-btn action-btn-primary action-btn-sm" @click="saveCurrentRecipe">💾 保存</button>
-            <button class="action-btn action-btn-sm" @click="previewRecipe">👁 预览</button>
+            <button class="action-btn action-btn-sm" @click="closeOverlay">✕ 取消</button>
           </div>
         </div>
 
@@ -259,7 +224,7 @@
             <select v-model.number="formDilution" class="select-sm">
               <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">时，纯精油总数约为 {{ suggestedEoDrops }} 滴，现在为 {{ eoTotalDrops }} 滴</span>
+            <span class="ratio-hint">纯精油总数约为 {{ suggestedEoDrops }} 滴</span>
           </div>
         </div>
 
@@ -374,11 +339,9 @@
 
     <!-- Recipe Detail Overlay -->
     <RecipeDetailOverlay
-      v-if="previewRecipeIndex !== null || previewRecipeData !== null"
+      v-if="previewRecipeIndex !== null"
       :recipeIndex="previewRecipeIndex"
-      :recipeData="previewRecipeData"
+      @close="previewRecipeIndex = null"
-      :isDiary="true"
-      @close="previewRecipeIndex = null; previewRecipeData = null"
     />
 
     <!-- Tag Picker Overlay -->
@@ -424,7 +387,6 @@ const editingRecipe = ref(null)
 const showPending = ref(false)
 const pendingRecipes = ref([])
 const pendingCount = ref(0)
-const seniorEditors = ref([])
 
 // Form state
 const formName = ref('')
@@ -438,8 +400,8 @@ const newIngOil = ref('')
 const newIngSearch = ref('')
 const newIngDrops = ref(1)
 const newIngDropdownOpen = ref(false)
-const formVolume = ref('')
+const formVolume = ref('30')
-const formCustomVolume = ref(null)
+const formCustomVolume = ref(100)
 const formCustomUnit = ref('drops')
 const formDilution = ref(6)
 
@@ -584,82 +546,6 @@ function clearSelection() {
   showBatchMenu.value = false
 }
 
-function addBatchTag() {
-  const tag = batchNewTag.value.trim()
-  if (tag && !batchTagsSelected.value.includes(tag)) {
-    batchTagsSelected.value.push(tag)
-  }
-  batchNewTag.value = ''
-}
-
-async function applyBatchTags() {
-  const tagsToAdd = batchTagsSelected.value
-  const tagsToRemove = batchTagsToRemove.value
-  if (!tagsToAdd.length && !tagsToRemove.length) { ui.showToast('请选择要添加或移除的标签'); return }
-  const pubIds = [...selectedIds]
-  const diaryIds = [...selectedDiaryIds]
-  for (const id of pubIds) {
-    const recipe = recipeStore.recipes.find(r => r._id === id)
-    if (!recipe) continue
-    let newTags = [...recipe.tags]
-    let changed = false
-    for (const t of tagsToAdd) {
-      if (!newTags.includes(t)) { newTags.push(t); changed = true }
-    }
-    for (const t of tagsToRemove) {
-      const idx = newTags.indexOf(t)
-      if (idx >= 0) { newTags.splice(idx, 1); changed = true }
-    }
-    if (changed) {
-      await api(`/api/recipes/${recipe._id}`, {
-        method: 'PUT',
-        body: JSON.stringify({ tags: newTags }),
-      })
-      recipe.tags = newTags
-    }
-  }
-  for (const id of diaryIds) {
-    const d = diaryStore.userDiary.find(r => r.id === id)
-    if (!d) continue
-    let dtags = [...(d.tags || [])]
-    let changed = false
-    for (const t of tagsToAdd) {
-      if (!dtags.includes(t)) { dtags.push(t); changed = true }
-    }
-    for (const t of tagsToRemove) {
-      const idx = dtags.indexOf(t)
-      if (idx >= 0) { dtags.splice(idx, 1); changed = true }
-    }
-    if (changed) await diaryStore.updateDiary(id, { ...d, tags: dtags })
-  }
-  showBatchTagPicker.value = false
-  const msgs = []
-  if (tagsToAdd.length) msgs.push(`添加${tagsToAdd.length}个`)
-  if (tagsToRemove.length) msgs.push(`移除${tagsToRemove.length}个`)
-  ui.showToast(`已为 ${pubIds.length + diaryIds.length} 个配方${msgs.join('、')}标签`)
-  clearSelection()
-}
-
-function previewRecipe() {
-  const eoIngs = formIngredients.value.filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
-  const cleanIngs = eoIngs.map(i => ({ oil: i.oil, drops: i.drops }))
-  if (formCocoRow.value && cocoActualDrops.value > 0) {
-    cleanIngs.push({ oil: '椰子油', drops: cocoActualDrops.value })
-  }
-  previewRecipeData.value = {
-    _id: null,
-    name: formName.value || '未命名配方',
-    note: formNote.value || '',
-    tags: formTags.value,
-    ingredients: cleanIngs,
-  }
-}
-
-function doBatch(action) {
-  showBatchMenu.value = false
-  executeBatchAction(action)
-}
-
 function toggleSelectAll() {
   if (isAllSelected.value) {
     clearSelection()
@@ -706,11 +592,26 @@ async function executeBatchAction(action) {
     }
     ui.showToast(`已删除 ${totalCount} 个配方`)
   } else if (action === 'tag') {
-    batchTagsSelected.value = []
+    const tagName = await showPrompt('输入要添加的标签:')
-    batchTagsToRemove.value = []
+    if (!tagName) return
-    batchNewTag.value = ''
+    for (const id of pubIds) {
-    showBatchTagPicker.value = true
+      const recipe = recipeStore.recipes.find(r => r._id === id)
-    return // don't clear selection yet
+      if (recipe && !recipe.tags.includes(tagName)) {
+        recipe.tags.push(tagName)
+        await recipeStore.saveRecipe(recipe)
+      }
+    }
+    for (const id of diaryIds) {
+      const d = diaryStore.userDiary.find(r => r.id === id)
+      if (d) {
+        const tags = [...(d.tags || [])]
+        if (!tags.includes(tagName)) {
+          tags.push(tagName)
+          await diaryStore.updateDiary(id, { ...d, tags })
+        }
+      }
+    }
+    ui.showToast(`已为 ${totalCount} 个配方添加标签`)
   } else if (action === 'share_public') {
     const ok = await showConfirm(`将 ${diaryIds.length} 个配方分享到公共配方库？`)
     if (!ok) return
@@ -739,8 +640,23 @@ async function executeBatchAction(action) {
   clearSelection()
 }
 
-function calcDilutionFromIngs() {
+function calcDilutionFromIngs(ingredients) {
-  // No default selection — user chooses
+  const ings = ingredients || []
+  const coco = ings.find(i => i.oil === '椰子油')
+  const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
+  const cocoDrops = coco ? (coco.drops || 0) : 0
+  const totalDrops = eoDrops + cocoDrops
+  if (eoDrops > 0 && cocoDrops > 0) {
+    formDilution.value = Math.round(cocoDrops / eoDrops)
+  }
+  // Guess volume
+  const DROPS_PER_ML = 18.6
+  const ml = totalDrops / DROPS_PER_ML
+  if (ml <= 1.5) formVolume.value = 'single'
+  else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5'
+  else if (Math.abs(ml - 10) < 3) formVolume.value = '10'
+  else if (Math.abs(ml - 30) < 8) formVolume.value = '30'
+  else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(totalDrops); formCustomUnit.value = 'drops' }
 }
 
 function editRecipe(recipe) {
@@ -774,8 +690,7 @@ function resetForm() {
   newIngOil.value = ''
   newIngSearch.value = ''
   newIngDrops.value = 1
-  formVolume.value = ''
+  formVolume.value = '30'
-  formCustomVolume.value = null
   formDilution.value = 6
 }
 
@@ -945,10 +860,6 @@ function toggleFormTag(tag) {
 }
 
 async function saveCurrentRecipe() {
-  if (formVolume.value === 'custom' && !formCustomVolume.value) {
-    ui.showToast('请输入自定义容量')
-    return
-  }
   const eoIngs = formIngredients.value.filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
   if (!formName.value.trim()) {
     ui.showToast('请输入配方名称')
@@ -971,38 +882,6 @@ async function saveCurrentRecipe() {
     tags: formTags.value,
   }
 
-  // Dedup check for new recipes (not editing)
-  if (!editingRecipe.value) {
-    const name = formName.value.trim()
-    // Check public library
-    const pubDup = recipeStore.recipes.find(r => r.name === name)
-    // Check personal diary
-    const diaryDup = diaryStore.userDiary.find(d => d.name === name)
-    const dup = pubDup || diaryDup
-    if (dup) {
-      const dupIngs = (dup.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-      const myIngs = cleanIngs.filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-      const identical = dupIngs.length === myIngs.length && dupIngs.every((ing, i) => ing.oil === myIngs[i].oil && ing.drops === myIngs[i].drops)
-      const where = pubDup ? '公共配方库' : '我的配方'
-      if (identical) {
-        ui.showToast(`${where}中已有一模一样的配方「${name}」`)
-        return
-      }
-      // Show difference
-      const existIngs = dupIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-      const newIngs = myIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-      const ok = await showConfirm(
-        `${where}中已有同名配方「${name}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n是否改名后保存？`,
-        { okText: '改名', cancelText: '取消' }
-      )
-      if (!ok) return
-      const newName = await showPrompt('请输入新名称：', name)
-      if (!newName || !newName.trim()) return
-      formName.value = newName.trim()
-      diaryPayload.name = newName.trim()
-    }
-  }
-
   if (editingRecipe.value && editingRecipe.value._diary_id) {
     // Editing an existing diary recipe
     try {
@@ -1035,26 +914,7 @@ async function saveCurrentRecipe() {
     return
   }
 
-  // New recipe: admin/senior_editor can choose public or personal
+  // New recipe: always save to diary (personal)
-  if (auth.canManage) {
-    const toPublic = await showConfirm('保存到哪里？', { okText: '公共配方库', cancelText: '个人配方' })
-    if (toPublic) {
-      try {
-        const pubPayload = {
-          name: formName.value.trim(),
-          ingredients: cleanIngs.map(i => ({ oil_name: i.oil, drops: i.drops })),
-          note: formNote.value,
-          tags: formTags.value,
-        }
-        await recipeStore.saveRecipe(pubPayload)
-        ui.showToast('已添加到公共配方库')
-        closeOverlay()
-      } catch (e) {
-        ui.showToast('保存失败: ' + (e.message || '未知错误'))
-      }
-      return
-    }
-  }
   try {
     await diaryStore.createDiary(diaryPayload)
     ui.showToast('已添加到我的配方')
@@ -1104,52 +964,13 @@ async function saveAllParsed() {
   closeOverlay()
 }
 
-const sharedCount = ref({ adopted: 0, total: 0, adoptedNames: [], pendingNames: [] })
+const sharedCount = ref({ adopted: 0, total: 0 })
-
-async function loadContribution() {
-  try {
-    const res = await api('/api/me/contribution')
-    if (res.ok) {
-      const data = await res.json()
-      sharedCount.value = {
-        adopted: data.adopted_count || 0,
-        total: data.shared_count || 0,
-        adoptedNames: data.adopted_names || [],
-        pendingNames: data.pending_names || [],
-      }
-    }
-  } catch {}
-}
 const previewRecipeIndex = ref(null)
-const previewRecipeData = ref(null)
 const showBatchMenu = ref(false)
-const showBatchTagPicker = ref(false)
-const batchTagsSelected = ref([])
-const batchNewTag = ref('')
-const batchTagsToRemove = ref([])
-
-const batchExistingTags = computed(() => {
-  const tagSets = []
-  for (const id of selectedIds) {
-    const r = recipeStore.recipes.find(x => x._id === id)
-    if (r) tagSets.push(r.tags || [])
-  }
-  for (const id of selectedDiaryIds) {
-    const d = diaryStore.userDiary.find(x => x.id === id)
-    if (d) tagSets.push(d.tags || [])
-  }
-  if (!tagSets.length) return []
-  const all = new Set(tagSets.flat())
-  return [...all].sort((a, b) => a.localeCompare(b, 'zh'))
-})
 const totalSelected = computed(() => selectedIds.size + selectedDiaryIds.size)
 const isMyAllSelected = computed(() => myFilteredRecipes.value.length > 0 && selectedDiaryIds.size === myFilteredRecipes.value.length)
 const isPubAllSelected = computed(() => publicFilteredRecipes.value.length > 0 && selectedIds.size === publicFilteredRecipes.value.length)
-const isAllSelected = computed(() => {
+const isAllSelected = computed(() => isMyAllSelected.value && (!auth.canEdit || isPubAllSelected.value))
-  const myOk = myFilteredRecipes.value.length > 0 && isMyAllSelected.value
-  const pubOk = !auth.canEdit || (publicFilteredRecipes.value.length > 0 && isPubAllSelected.value)
-  return myOk && pubOk
-})
 const showMyRecipes = ref(false)
 const showPublicRecipes = ref(false)
 const showReviewHistory = ref(false)
@@ -1173,25 +994,19 @@ function formatDate(d) {
 onMounted(async () => {
   if (auth.isLoggedIn) {
     await diaryStore.loadDiary()
-    await loadContribution()
+    try {
+      const res = await api('/api/me/contribution')
+      if (res.ok) {
+        const data = await res.json()
+        sharedCount.value = { adopted: data.adopted_count || 0, total: data.shared_count || 0 }
+      }
+    } catch {}
   }
   if (auth.isAdmin) {
     try {
       const res = await api('/api/recipe-reviews')
       if (res.ok) reviewHistory.value = await res.json()
     } catch {}
-    try {
-      const res = await api('/api/users')
-      if (res.ok) {
-        const users = await res.json()
-        seniorEditors.value = users.filter(u => u.role === 'senior_editor')
-      }
-    } catch {}
-  }
-  // Auto-expand pending if navigated from notification
-  if (localStorage.getItem('oil_open_pending')) {
-    localStorage.removeItem('oil_open_pending')
-    showPending.value = true
   }
   // Open recipe editor if redirected from card view
   const editId = localStorage.getItem('oil_edit_recipe_id')
@@ -1215,96 +1030,20 @@ function editDiaryRecipe(diary) {
   showAddOverlay.value = true
 }
 
-async function assignReview(recipe) {
-  const userId = recipe._assignTo
-  if (!userId) return
-  try {
-    const res = await api('/api/recipes/' + recipe._id + '/assign-review', {
-      method: 'POST',
-      body: JSON.stringify({ user_id: userId }),
-    })
-    if (res.ok) {
-      recipe._showAssign = false
-      recipe._assignTo = ''
-      ui.showToast('已指派审核')
-    }
-  } catch {
-    ui.showToast('指派失败')
-  }
-}
-
 function openRecipeDetail(recipe) {
   const idx = recipeStore.recipes.findIndex(r => r._id === recipe._id)
   if (idx >= 0) previewRecipeIndex.value = idx
 }
 
-function diaryMatchesPublic(d) {
-  const pub = recipeStore.recipes.find(r => r.name === d.name)
-  if (!pub) return false
-  const dIngs = (d.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-  const pIngs = (pub.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-  return dIngs.length === pIngs.length && dIngs.every((ing, i) => ing.oil === pIngs[i].oil && ing.drops === pIngs[i].drops)
-}
-
 function getDiaryShareStatus(d) {
-  // Check pending (owned by user in public library, not yet adopted)
+  // Check if a public recipe with same name exists, owned by current user or adopted by admin
-  if (sharedCount.value.pendingNames.includes(d.name)) return 'pending'
+  const pub = recipeStore.recipes.find(r => r.name === d.name)
-  // Check if public library has same recipe with same content
+  if (!pub) return null
-  if (diaryMatchesPublic(d)) return 'shared'
+  if (pub._owner_id === auth.user?.id) return 'pending'
-  // Check adopted names from audit log
+  return 'shared'
-  if (sharedCount.value.adoptedNames.includes(d.name) && diaryMatchesPublic(d)) return 'shared'
-  return null
-}
-
-function handleShare(d) {
-  const status = getDiaryShareStatus(d)
-  if (status === 'shared') {
-    ui.showToast('该配方已共享到公共配方库，感谢你的贡献！')
-    return
-  }
-  if (status === 'pending') {
-    ui.showToast('该配方正在审核中，请耐心等待')
-    return
-  }
-  shareDiaryToPublic(d)
-}
-
-async function recommendApprove(recipe) {
-  try {
-    await api('/api/recipes/' + recipe._id + '/recommend', {
-      method: 'POST',
-      body: JSON.stringify({ recommendation: 'approve' }),
-    })
-    ui.showToast('已推荐通过，等待管理员最终审核')
-  } catch {
-    ui.showToast('操作失败')
-  }
 }
 
 async function shareDiaryToPublic(diary) {
-  // Check for duplicates in public library
-  const dup = recipeStore.recipes.find(r => r.name === diary.name)
-  if (dup) {
-    const dIngs = (diary.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-    const pIngs = (dup.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-    const identical = dIngs.length === pIngs.length && dIngs.every((ing, i) => ing.oil === pIngs[i].oil && ing.drops === pIngs[i].drops)
-    if (identical) {
-      ui.showToast('公共配方库中已有一模一样的配方「' + diary.name + '」')
-      return
-    }
-    // Same name, different content — show details
-    const existIngs = pIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-    const newIngs = dIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-    const action = await showConfirm(
-      `公共配方库中已有同名配方「${diary.name}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n是否改名后共享？`,
-      { okText: '改名', cancelText: '取消' }
-    )
-    if (!action) return
-    const newName = await showPrompt('请输入新名称：', diary.name)
-    if (!newName || !newName.trim()) return
-    diary = { ...diary, name: newName.trim() }
-  }
-
   const ok = await showConfirm(`将「${diary.name}」共享到公共配方库？`)
   if (!ok) return
   try {
@@ -1318,13 +1057,12 @@ async function shareDiaryToPublic(diary) {
       }),
     })
     if (res.ok) {
-      if (auth.isAdmin || auth.canManage) {
+      if (auth.isAdmin) {
         ui.showToast('已共享到公共配方库')
       } else {
         ui.showToast('已提交，等待管理员审核')
       }
       await recipeStore.loadRecipes()
-      await loadContribution()
     }
   } catch {
     ui.showToast('共享失败')
@@ -1353,59 +1091,7 @@ async function removeRecipe(recipe) {
   }
 }
 
-function recipesIdentical(a, b) {
-  if ((a.ingredients || []).length !== (b.ingredients || []).length) return false
-  const aIngs = [...a.ingredients].sort((x, y) => x.oil.localeCompare(y.oil))
-  const bIngs = [...b.ingredients].sort((x, y) => x.oil.localeCompare(y.oil))
-  return aIngs.every((ing, i) => ing.oil === bIngs[i].oil && ing.drops === bIngs[i].drops)
-}
-
-function formatIngsCompare(ings) {
-  return (ings || []).map(i => `${i.oil} ${i.drops}滴`).join('、')
-}
-
 async function approveRecipe(recipe) {
-  const dup = recipeStore.recipes.find(r => r.name === recipe.name && r._id !== recipe._id)
-  if (dup) {
-    if (recipesIdentical(recipe, dup)) {
-      // Identical — delete this duplicate silently
-      const ok = await showConfirm(`公共配方库中已有一模一样的配方「${recipe.name}」，忽略这条？`)
-      if (!ok) return
-      try {
-        await api(`/api/recipes/${recipe._id}/reject`, { method: 'POST', body: '{}' })
-        await recipeStore.loadRecipes()
-        ui.showToast('已忽略重复配方')
-      } catch { ui.showToast('操作失败') }
-      return
-    }
-    // Different content
-    const msg = `已有同名配方「${recipe.name}」但内容不同：\n\n` +
-      `已有：${formatIngsCompare(dup.ingredients)}\n` +
-      `新的：${formatIngsCompare(recipe.ingredients)}`
-    const action = await showConfirm(msg, { okText: '改名后采纳', cancelText: '放弃' })
-    if (!action) {
-      // User chose to discard
-      try {
-        await api(`/api/recipes/${recipe._id}/reject`, { method: 'POST', body: JSON.stringify({ reason: '与已有同名配方重复' }) })
-        await recipeStore.loadRecipes()
-        ui.showToast('已放弃')
-      } catch { ui.showToast('操作失败') }
-      return
-    }
-    // User wants to rename
-    const newName = await showPrompt('请输入新名称：', recipe.name)
-    if (!newName || !newName.trim()) return
-    try {
-      await api(`/api/recipes/${recipe._id}`, {
-        method: 'PUT',
-        body: JSON.stringify({ name: newName.trim() }),
-      })
-      recipe.name = newName.trim()
-    } catch {
-      ui.showToast('改名失败')
-      return
-    }
-  }
   try {
     const res = await api('/api/recipes/' + recipe._id + '/adopt', { method: 'POST' })
     if (res.ok) {
@@ -1474,9 +1160,7 @@ function onTagPickerSave(tags) {
 
 watch(() => recipeStore.recipes, () => {
   if (auth.isAdmin) {
-    const pending = recipeStore.recipes
+    const pending = recipeStore.recipes.filter(r => r._owner_id && r._owner_id !== auth.user.id)
-      .filter(r => r._owner_id && r._owner_id !== auth.user.id)
-      .map(r => ({ ...r, _showAssign: false, _assignTo: '' }))
     pendingRecipes.value = pending
     pendingCount.value = pending.length
   }
@@ -1736,8 +1420,8 @@ watch(() => recipeStore.recipes, () => {
 .log-recipe { font-weight: 500; color: #3e3a44; }
 .log-from { color: #999; font-size: 12px; }
 .log-time { color: #bbb; font-size: 11px; margin-left: auto; white-space: nowrap; }
-.section-title.clickable { cursor: pointer; display: flex; align-items: center; gap: 6px; }
+.section-title.clickable { cursor: pointer; display: flex; justify-content: space-between; align-items: center; }
-.toggle-icon { font-size: 12px; color: #999; margin-left: auto; }
+.toggle-icon { font-size: 12px; color: #999; }
 
 .contrib-tag {
   font-size: 11px;
@@ -1905,13 +1589,13 @@ watch(() => recipeStore.recipes, () => {
 .action-btn-primary { background: linear-gradient(135deg, #7ec6a4, #4a9d7e); color: #fff; border-color: transparent; }
 .action-btn-primary:hover { opacity: 0.9; }
 .action-btn-sm { padding: 5px 12px; font-size: 12px; }
-.volume-controls { display: flex; gap: 4px; margin-bottom: 8px; flex-wrap: wrap; }
+.volume-controls { display: flex; gap: 6px; margin-bottom: 8px; }
-.volume-btn { padding: 8px 10px; border: 1.5px solid #d4cfc7; border-radius: 8px; background: #fff; font-size: 13px; cursor: pointer; font-family: inherit; color: #6b6375; text-align: center; }
+.volume-btn { flex: 1; padding: 6px 0; border: 1.5px solid #d4cfc7; border-radius: 8px; background: #fff; font-size: 13px; cursor: pointer; font-family: inherit; color: #6b6375; text-align: center; }
 .volume-btn.active { background: #e8f5e9; border-color: #7ec6a4; color: #2e7d5a; font-weight: 600; }
 .volume-btn:hover { border-color: #7ec6a4; }
 .custom-volume-row { display: flex; gap: 6px; align-items: center; margin-bottom: 6px; }
 .ratio-row { display: flex; align-items: center; gap: 8px; margin-top: 8px; flex-wrap: wrap; }
-.ratio-label { font-size: 12px; color: #4a9d7e; font-weight: 500; white-space: nowrap; }
+.ratio-label { font-size: 12px; color: #3e3a44; font-weight: 500; white-space: nowrap; }
 .ratio-options { display: flex; gap: 4px; flex-wrap: wrap; }
 .ratio-btn {
   padding: 3px 8px; border: 1px solid #e5e4e7; border-radius: 6px; background: #fff;
@@ -1930,40 +1614,15 @@ watch(() => recipeStore.recipes, () => {
 }
 .drops-sm { width: 50px; padding: 4px 6px; border: 1.5px solid #d4cfc7; border-radius: 6px; font-size: 12px; text-align: center; outline: none; font-family: inherit; }
 .drops-sm:focus { border-color: #7ec6a4; }
-.select-sm { padding: 3px 6px; border: 1.5px solid #d4cfc7; border-radius: 6px; font-size: 12px; font-family: inherit; background: #fff; width: auto; }
+.select-sm { padding: 4px 6px; border: 1.5px solid #d4cfc7; border-radius: 6px; font-size: 12px; font-family: inherit; background: #fff; width: auto; }
 .btn-select-active { background: #e8f5e9; color: #2e7d5a; border: 1.5px solid #7ec6a4; border-radius: 10px; padding: 7px 14px; font-size: 13px; cursor: pointer; font-family: inherit; font-weight: 600; }
-.search-bar { margin-bottom: 8px; }
+.toolbar-row {
-.search-bar .search-box {
+  display: flex; gap: 8px; align-items: center; flex-wrap: wrap; margin-bottom: 8px;
-  display: flex; align-items: center; background: #f8f7f5; border: 1.5px solid #e5e4e7;
-  border-radius: 10px; padding: 2px 10px;
-}
-.search-bar .search-input {
-  flex: 1; border: none; background: transparent; padding: 8px 4px; font-size: 14px;
-  outline: none; font-family: inherit;
-}
-
-.action-bar {
-  display: flex; gap: 6px; align-items: center; flex-wrap: wrap; margin-bottom: 10px;
-}
-.action-chip {
-  padding: 5px 14px; border: 1.5px solid #e5e4e7; border-radius: 20px; background: #fff;
-  font-size: 13px; cursor: pointer; font-family: inherit; color: #6b6375; white-space: nowrap;
-  transition: all 0.15s;
-}
-.action-chip:hover { border-color: #7ec6a4; color: #4a9d7e; }
-.action-chip.active { background: #e8f5e9; border-color: #7ec6a4; color: #2e7d5a; font-weight: 600; }
-.action-chip.cancel { color: #999; }
-.chip-count {
-  display: inline-block; background: #4a9d7e; color: #fff; font-size: 11px;
-  min-width: 16px; height: 16px; line-height: 16px; text-align: center;
-  border-radius: 8px; margin-left: 4px; padding: 0 4px;
-}
-.detail-close-btn {
-  border: none; background: #f0eeeb; width: 26px; height: 26px; border-radius: 50%;
-  cursor: pointer; font-size: 13px; display: flex; align-items: center; justify-content: center; color: #6b6375;
 }
 .select-count { font-size: 12px; color: #4a9d7e; font-weight: 500; white-space: nowrap; }
-.batch-menu { display: flex; gap: 6px; flex-wrap: wrap; margin-bottom: 8px; }
+.batch-menu {
+  display: flex; gap: 6px; flex-wrap: wrap; margin-bottom: 8px; padding: 8px 0;
+}
 .batch-menu-btn {
   padding: 5px 12px; border: 1.5px solid #e5e4e7; border-radius: 8px; background: #fff;
   font-size: 12px; cursor: pointer; font-family: inherit; color: #6b6375;
@@ -1971,22 +1630,13 @@ watch(() => recipeStore.recipes, () => {
 .batch-menu-btn:hover { border-color: #7ec6a4; color: #4a9d7e; }
 .batch-delete { color: #c0392b; border-color: #e8b4b0; }
 .batch-delete:hover { background: #fdf0ee; border-color: #c0392b; }
-.batch-tag-picker {
-  padding: 12px; background: #f8faf8; border: 1.5px solid #d4e8d4; border-radius: 10px; margin-bottom: 10px;
-}
-.tag-removable { cursor: pointer; transition: all 0.15s; }
-.tag-removable:hover { background: #fce4ec; border-color: #e8b4b0; color: #c62828; }
-.tag-marked-remove { background: #ffebee !important; color: #c62828 !important; text-decoration: line-through; }
 .mini-select {
-  width: 18px; height: 18px; border: 1.5px solid #d4cfc7; border-radius: 4px;
+  width: 20px; height: 20px; border: 1.5px solid #d4cfc7; border-radius: 4px;
-  background: #fff; color: transparent; font-size: 11px; cursor: pointer;
+  background: #fff; color: transparent; font-size: 12px; cursor: pointer;
   display: inline-flex; align-items: center; justify-content: center; flex-shrink: 0;
-  padding: 0; margin-right: 4px; line-height: 1;
+  margin-right: 4px;
 }
 .mini-select.active { background: #4a9d7e; border-color: #4a9d7e; color: #fff; }
-.assign-row { display: flex; gap: 6px; align-items: center; margin-top: 4px; }
-.assign-select { padding: 4px 8px; border: 1px solid #d4cfc7; border-radius: 6px; font-size: 12px; font-family: inherit; }
-.btn-primary { background: linear-gradient(135deg, #7ec6a4, #4a9d7e); color: #fff; border: none; border-radius: 8px; cursor: pointer; font-family: inherit; }
 .tag-list-bar {
   display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 10px; padding: 8px 0;
 }

frontend/src/views/RecipeSearch.vue

@@ -719,7 +719,7 @@ function onCarouselTouchEnd(e) {
   font-size: 14px;
   font-weight: 600;
   color: #3e3a44;
-  padding: 10px 12px;
+  padding: 8px 4px;
   margin-bottom: 8px;
 }