feat: 大量管理配方和搜索改进

- 存为我的：修复调用错误API，改用 diaryStore.createDiary - 存为我的：同名检测（我的配方 + 公共配方库） - 我的配方：使用 RecipeCard 统一卡片格式 - 管理配方：按钮缩小、编辑时隐藏智能粘贴、精油搜索框支持拼音跳转 - 管理配方：批量操作改为按钮组（打标签/删除/导出卡片/分享到公共库） - 管理配方：我的配方加勾选框、全选按钮、编辑功能 - 搜索：模糊匹配 + 同义词扩展（37组），精确/相似分层显示 - 搜索：无匹配时通知编辑添加，搜索时隐藏无匹配的收藏/我的配方区 - 搜索：配方按首字母排序 - 共享审核：通知高级编辑+管理员，我的配方显示共享状态 - 通知：搜索未收录→已添加按钮，审核类→去审核按钮跳转 - 贡献统计：非管理员显示已贡献公共配方数 - 登录弹窗：加反馈问题按钮（无需登录） - 精油编辑：右上角加保存按钮，支持回车保存 - 后端：新增 /api/me/contribution 接口 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-09 20:13:09 +00:00
parent 80397ec7ca
commit 27c46cb803
7 changed files with 645 additions and 154 deletions
--- a/backend/main.py
+++ b/backend/main.py
@@ -766,14 +766,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)
-    # Notify admin when non-admin creates a recipe
-    if user["role"] != "admin":
+    # Notify admin and senior editors when non-admin creates a recipe
+    if user["role"] not in ("admin", "senior_editor"):
        who = user.get("display_name") or user["username"]
-        conn.execute(
-            "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
-            ("admin", "📝 新配方待审核",
-             f"{who} 新增了配方「{recipe.name}」，请到管理配方查看并采纳。")
-        )
+        for role in ("admin", "senior_editor"):
+            conn.execute(
+                "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
+                (role, "📝 新配方待审核",
+                 f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
+            )
    conn.commit()
    conn.close()
    return {"id": rid}
@@ -1397,6 +1398,19 @@ def get_unmatched_searches(days: int = 7, user=Depends(require_role("admin", "se
    return [dict(r) for r in rows]


+# ── Contribution stats ─────────────────────────────────
+@app.get("/api/me/contribution")
+def my_contribution(user=Depends(get_current_user)):
+    if not user.get("id"):
+        return {"shared_count": 0}
+    conn = get_db()
+    count = conn.execute(
+        "SELECT COUNT(*) FROM recipes WHERE owner_id = ?", (user["id"],)
+    ).fetchone()[0]
+    conn.close()
+    return {"shared_count": count}
+
+
 # ── Notifications ──────────────────────────────────────
@app.get("/api/notifications")
 def get_notifications(user=Depends(get_current_user)):
--- a/frontend/src/components/LoginModal.vue
+++ b/frontend/src/components/LoginModal.vue
@@ -51,6 +51,15 @@
        <button class="login-submit" :disabled="loading" @click="submit">
          {{ loading ? '请稍候...' : (mode === 'login' ? '登录' : '注册') }}
        </button>
+
+        <div class="login-divider"></div>
+        <button v-if="!showFeedback" class="login-feedback-btn" @click="showFeedback = true">🐛 反馈问题（无需登录）</button>
+        <div v-if="showFeedback" class="feedback-section">
+          <textarea v-model="feedbackText" class="login-input" rows="3" placeholder="描述你遇到的问题..." style="resize:vertical;"></textarea>
+          <button class="login-submit" :disabled="!feedbackText.trim() || feedbackLoading" @click="submitFeedback">
+            {{ feedbackLoading ? '提交中...' : '提交反馈' }}
+          </button>
+        </div>
      </div>
    </div>
  </div>
@@ -60,6 +69,7 @@
 import { ref } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
+import { api } from '../composables/useApi'

 const emit = defineEmits(['close'])

@@ -73,6 +83,9 @@ const confirmPassword = ref('')
 const displayName = ref('')
 const errorMsg = ref('')
 const loading = ref(false)
+const showFeedback = ref(false)
+const feedbackText = ref('')
+const feedbackLoading = ref(false)

 async function submit() {
  errorMsg.value = ''
@@ -115,6 +128,26 @@ async function submit() {
    loading.value = false
  }
 }
+
+async function submitFeedback() {
+  if (!feedbackText.value.trim()) return
+  feedbackLoading.value = true
+  try {
+    const res = await api('/api/bug-report', {
+      method: 'POST',
+      body: JSON.stringify({ content: feedbackText.value.trim(), priority: 0 }),
+    })
+    if (res.ok) {
+      feedbackText.value = ''
+      showFeedback.value = false
+      ui.showToast('反馈已提交，感谢！')
+    }
+  } catch {
+    ui.showToast('提交失败')
+  } finally {
+    feedbackLoading.value = false
+  }
+}
 </script>

 <style scoped>
@@ -209,4 +242,31 @@ async function submit() {
  opacity: 0.6;
  cursor: not-allowed;
 }
+
+.login-divider {
+  height: 1px;
+  background: #eee;
+  margin: 4px 0;
+}
+
+.login-feedback-btn {
+  background: none;
+  border: none;
+  color: #999;
+  font-size: 13px;
+  cursor: pointer;
+  font-family: inherit;
+  text-align: center;
+  padding: 4px 0;
+}
+
+.login-feedback-btn:hover {
+  color: #666;
+}
+
+.feedback-section {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
 </style>
--- a/frontend/src/components/RecipeDetailOverlay.vue
+++ b/frontend/src/components/RecipeDetailOverlay.vue
@@ -9,7 +9,7 @@
            <button class="action-btn action-btn-fav action-btn-sm" @click="handleToggleFavorite">
              {{ isFav ? '★ 已收藏' : '☆ 收藏' }}
            </button>
-            <button v-if="!recipe._diary_id" class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
+            <button v-if="!props.isDiary" class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
              📔 存为我的
            </button>
          </div>
@@ -359,7 +359,9 @@ import { matchesPinyinInitials } from '../composables/usePinyinMatch'
 // TagPicker replaced with inline tag editing

 const props = defineProps({
-  recipeIndex: { type: Number, required: true },
+  recipeIndex: { type: Number, default: null },
+  recipeData: { type: Object, default: null },
+  isDiary: { type: Boolean, default: false },
 })

 const emit = defineEmits(['close'])
@@ -386,9 +388,10 @@ const generatingImage = ref(false)
 const previewOverride = ref(null)

 // ---- Source recipe ----
-const recipe = computed(() =>
-  recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
-)
+const recipe = computed(() => {
+  if (props.recipeData) return props.recipeData
+  return recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
+})

 // ---- Display recipe: previewOverride when in preview mode, otherwise saved recipe ----
 const displayRecipe = computed(() => {
@@ -710,22 +713,31 @@ async function saveToDiary() {
    return
  }
  const name = await showPrompt('保存为我的配方，名称：', recipe.value.name)
-  // null = user cancelled (clicked 取消)
  if (name === null) return
-  // empty string = user cleared the name field
  if (!name.trim()) {
    ui.showToast('请输入配方名称')
    return
  }
+  const trimmed = name.trim()
+  const dupDiary = diaryStore.userDiary.some(d => d.name === trimmed)
+  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(),
      note: recipe.value.note || '',
-      ingredients: recipe.value.ingredients.map(i => ({ oil_name: i.oil, drops: i.drops })),
+      ingredients: recipe.value.ingredients.map(i => ({ oil: i.oil, drops: i.drops })),
      tags: recipe.value.tags || [],
+      source_recipe_id: recipe.value._id || null,
    }
-    console.log('[saveToDiary] saving recipe:', payload)
-    await recipesStore.saveRecipe(payload)
+    await diaryStore.createDiary(payload)
    ui.showToast('已保存！可在「配方查询 → 我的配方」查看')
  } catch (e) {
    console.error('[saveToDiary] failed:', e)
--- a/frontend/src/components/UserMenu.vue
+++ b/frontend/src/components/UserMenu.vue
@@ -30,7 +30,14 @@
               class="notif-item" :class="{ unread: !n.is_read }">
            <div class="notif-item-header">
              <div class="notif-title">{{ n.title }}</div>
-              <button v-if="!n.is_read" class="notif-mark-one" @click="markOneRead(n)">已读</button>
+              <div v-if="!n.is_read" class="notif-actions">
+                <!-- 搜索未收录通知：已添加按钮 -->
+                <button v-if="isSearchMissing(n)" class="notif-action-btn notif-btn-added" @click="markAdded(n)">已添加</button>
+                <!-- 审核类通知：去审核按钮 -->
+                <button v-else-if="isReviewable(n)" class="notif-action-btn notif-btn-review" @click="goReview(n)">去审核</button>
+                <!-- 默认：已读按钮 -->
+                <button v-else class="notif-mark-one" @click="markOneRead(n)">已读</button>
+              </div>
            </div>
            <div v-if="n.body" class="notif-body">{{ n.body }}</div>
            <div class="notif-time">{{ formatTime(n.created_at) }}</div>
@@ -108,6 +115,29 @@ async function submitBug() {
  }
 }

+function isSearchMissing(n) {
+  return n.title && n.title.includes('用户需求')
+}
+
+function isReviewable(n) {
+  if (!n.title) return false
+  return n.title.includes('待审核') || n.title.includes('商业认证') || n.title.includes('申请')
+}
+
+async function markAdded(n) {
+  await markOneRead(n)
+}
+
+function goReview(n) {
+  markOneRead(n)
+  emit('close')
+  if (n.title.includes('配方')) {
+    router.push('/manage')
+  } else if (n.title.includes('商业认证') || n.title.includes('申请')) {
+    router.push('/users')
+  }
+}
+
 async function markOneRead(n) {
  try {
    await api(`/api/notifications/${n.id}/read`, { method: 'POST', body: '{}' })
@@ -209,6 +239,16 @@ onMounted(loadNotifications)
  font-family: inherit; white-space: nowrap; flex-shrink: 0;
 }
 .notif-mark-one:hover { background: #f0faf5; border-color: #7a9e7e; }
+.notif-actions { display: flex; gap: 4px; flex-shrink: 0; }
+.notif-action-btn {
+  background: none; border: 1px solid #ccc; border-radius: 6px;
+  font-size: 11px; cursor: pointer; padding: 2px 8px;
+  font-family: inherit; white-space: nowrap;
+}
+.notif-btn-added { color: #4a9d7e; border-color: #7ec6a4; }
+.notif-btn-added:hover { background: #e8f5e9; }
+.notif-btn-review { color: #e65100; border-color: #ffb74d; }
+.notif-btn-review:hover { background: #fff3e0; }
 .notif-body { color: #888; font-size: 12px; margin-top: 2px; white-space: pre-line; }
 .notif-time { color: #bbb; font-size: 11px; margin-top: 2px; }
 .notif-empty { text-align: center; color: #ccc; padding: 16px; font-size: 13px; }
--- a/frontend/src/views/OilReference.vue
+++ b/frontend/src/views/OilReference.vue
@@ -260,11 +260,14 @@
    </div>

    <!-- Edit Oil Overlay -->
-    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null">
+    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="saveEditOil">
      <div class="modal-panel">
        <div class="modal-header">
          <h3>{{ editingOilName }}</h3>
-          <button class="btn-close" @click="editingOilName = null">✕</button>
+          <div style="display:flex;gap:8px;align-items:center">
+            <button class="btn-primary" style="padding:6px 16px;font-size:13px" @click="saveEditOil">保存</button>
+            <button class="btn-close" @click="editingOilName = null">✕</button>
+          </div>
        </div>
        <div class="modal-body">
          <div class="form-group">
--- a/frontend/src/views/RecipeManager.vue
+++ b/frontend/src/views/RecipeManager.vue
@@ -24,8 +24,10 @@
        />
        <button v-if="manageSearch" class="search-clear-btn" @click="manageSearch = ''">✕</button>
      </div>
-      <button class="btn-primary" @click="showAddOverlay = true">+ 添加配方</button>
-      <button class="btn-outline" @click="exportExcel">📊 导出Excel</button>
+      <div class="toolbar-actions">
+        <button class="btn-outline btn-sm" @click="showAddOverlay = true">+ 添加配方</button>
+        <button class="btn-outline btn-sm" @click="exportExcel">📥 导出Excel</button>
+      </div>
    </div>

    <!-- Tag Filter Bar -->
@@ -45,30 +47,37 @@
    </div>

    <!-- Batch Operations -->
-    <div v-if="selectedIds.size > 0" class="batch-bar">
-      <span>已选 {{ selectedIds.size }} 项</span>
-      <select v-model="batchAction" class="batch-select">
-        <option value="">批量操作...</option>
-        <option value="tag">添加标签</option>
-        <option value="share">分享</option>
-        <option value="export">导出卡片</option>
-        <option value="delete">删除</option>
-      </select>
-      <button class="btn-sm btn-primary" @click="executeBatch" :disabled="!batchAction">执行</button>
-      <button class="btn-sm btn-outline" @click="clearSelection">取消选择</button>
+    <div v-if="selectedIds.size > 0 || selectedDiaryIds.size > 0" class="batch-bar">
+      <span>已选 {{ selectedIds.size + selectedDiaryIds.size }} 项</span>
+      <button class="btn-sm btn-outline" @click="executeBatchAction('tag')">🏷 打标签</button>
+      <button class="btn-sm btn-outline" @click="executeBatchAction('share_public')" v-if="selectedDiaryIds.size > 0">📤 分享到公共库</button>
+      <button class="btn-sm btn-outline" @click="executeBatchAction('export')">📷 导出卡片</button>
+      <button class="btn-sm btn-danger-outline" @click="executeBatchAction('delete')">🗑 删除</button>
+      <button class="btn-sm btn-outline" @click="clearSelection">取消</button>
    </div>

    <!-- My Recipes Section (from diary) -->
    <div class="recipe-section">
-      <h3 class="section-title">📖 我的配方 ({{ myRecipes.length }})</h3>
+      <h3 class="section-title">
+        <span>📖 我的配方 ({{ myRecipes.length }})</span>
+        <button class="btn-sm btn-outline" @click="toggleSelectAllDiary">全选/取消</button>
+      </h3>
      <div class="recipe-list">
        <div
          v-for="d in myFilteredRecipes"
          :key="'diary-' + d.id"
-          class="recipe-row diary-row"
+          class="recipe-row"
+          :class="{ selected: selectedDiaryIds.has(d.id) }"
        >
+          <input
+            type="checkbox"
+            :checked="selectedDiaryIds.has(d.id)"
+            @change="toggleDiarySelect(d.id)"
+            class="row-check"
+          />
          <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>
@@ -124,20 +133,22 @@
          <button class="btn-close" @click="closeOverlay">✕</button>
        </div>

-        <!-- Smart Paste Section -->
-        <div class="paste-section">
-          <textarea
-            v-model="smartPasteText"
-            class="paste-input"
-            placeholder="粘贴配方文本，支持智能识别...&#10;例如: 薰衣草3滴 茶树2滴"
-            rows="4"
-          ></textarea>
-          <button class="btn-primary" @click="handleSmartPaste" :disabled="!smartPasteText.trim()">
-            智能识别
-          </button>
-        </div>
+        <!-- Smart Paste Section (only for new recipes) -->
+        <template v-if="!editingRecipe">
+          <div class="paste-section">
+            <textarea
+              v-model="smartPasteText"
+              class="paste-input"
+              placeholder="粘贴配方文本，支持智能识别...&#10;例如: 薰衣草3滴 茶树2滴"
+              rows="4"
+            ></textarea>
+            <button class="btn-primary" @click="handleSmartPaste" :disabled="!smartPasteText.trim()">
+              智能识别
+            </button>
+          </div>

-        <div class="divider-text">或手动输入</div>
+          <div class="divider-text">或手动输入</div>
+        </template>

        <!-- Manual Form -->
        <div class="form-group">
@@ -148,14 +159,29 @@
        <div class="form-group">
          <label>成分</label>
          <div v-for="(ing, i) in formIngredients" :key="i" class="ing-row">
-            <select v-model="ing.oil" class="form-select">
-              <option value="">选择精油</option>
-              <option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
-            </select>
+            <div class="oil-search-wrap">
+              <input
+                v-model="ing._search"
+                class="form-select"
+                placeholder="输入搜索精油..."
+                @focus="ing._open = true"
+                @input="ing._open = true"
+                @blur="onOilBlur(ing)"
+              />
+              <div v-if="ing._open" class="oil-dropdown">
+                <div
+                  v-for="name in filteredOilNames(ing._search || '')"
+                  :key="name"
+                  class="oil-option"
+                  @mousedown.prevent="selectOil(ing, name)"
+                >{{ name }}</div>
+                <div v-if="filteredOilNames(ing._search || '').length === 0" class="oil-option oil-empty">无匹配</div>
+              </div>
+            </div>
            <input v-model.number="ing.drops" type="number" min="0" class="form-input-sm" placeholder="滴数" />
            <button class="btn-icon-sm" @click="formIngredients.splice(i, 1)">✕</button>
          </div>
-          <button class="btn-outline btn-sm" @click="formIngredients.push({ oil: '', drops: 1 })">+ 添加成分</button>
+          <button class="btn-outline btn-sm" @click="formIngredients.push({ oil: '', drops: 1, _search: '', _open: false })">+ 添加成分</button>
        </div>

        <div class="form-group">
@@ -205,6 +231,7 @@ import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
 import { showConfirm, showPrompt } from '../composables/useDialog'
 import { parseSingleBlock } from '../composables/useSmartPaste'
+import { matchesPinyinInitials } from '../composables/usePinyinMatch'
 import RecipeCard from '../components/RecipeCard.vue'
 import TagPicker from '../components/TagPicker.vue'

@@ -218,7 +245,7 @@ const manageSearch = ref('')
 const selectedTags = ref([])
 const showTagFilter = ref(false)
 const selectedIds = reactive(new Set())
-const batchAction = ref('')
+const selectedDiaryIds = reactive(new Set())
 const showAddOverlay = ref(false)
 const editingRecipe = ref(null)
 const showPending = ref(false)
@@ -259,7 +286,7 @@ function filterBySearchAndTags(list) {
      r.tags && selectedTags.value.every(t => r.tags.includes(t))
    )
  }
-  return result
+  return result.slice().sort((a, b) => a.name.localeCompare(b.name, 'zh'))
 }

 const myFilteredRecipes = computed(() => filterBySearchAndTags(myRecipes.value))
@@ -276,47 +303,84 @@ function toggleSelect(id) {
  else selectedIds.add(id)
 }

-function clearSelection() {
-  selectedIds.clear()
-  batchAction.value = ''
+function toggleDiarySelect(id) {
+  if (selectedDiaryIds.has(id)) selectedDiaryIds.delete(id)
+  else selectedDiaryIds.add(id)
 }

-async function executeBatch() {
-  const ids = [...selectedIds]
-  if (!ids.length || !batchAction.value) return
+function clearSelection() {
+  selectedIds.clear()
+  selectedDiaryIds.clear()
+}

-  if (batchAction.value === 'delete') {
-    const ok = await showConfirm(`确定删除 ${ids.length} 个配方？`)
+function toggleSelectAllDiary() {
+  if (selectedDiaryIds.size === myFilteredRecipes.value.length) {
+    selectedDiaryIds.clear()
+  } else {
+    myFilteredRecipes.value.forEach(d => selectedDiaryIds.add(d.id))
+  }
+}
+
+async function executeBatchAction(action) {
+  const pubIds = [...selectedIds]
+  const diaryIds = [...selectedDiaryIds]
+  const totalCount = pubIds.length + diaryIds.length
+  if (!totalCount) return
+
+  if (action === 'delete') {
+    const ok = await showConfirm(`确定删除 ${totalCount} 个配方？`)
    if (!ok) return
-    for (const id of ids) {
+    for (const id of pubIds) {
      await recipeStore.deleteRecipe(id)
    }
-    ui.showToast(`已删除 ${ids.length} 个配方`)
-  } else if (batchAction.value === 'tag') {
+    for (const id of diaryIds) {
+      await diaryStore.deleteDiary(id)
+    }
+    ui.showToast(`已删除 ${totalCount} 个配方`)
+  } else if (action === 'tag') {
    const tagName = await showPrompt('输入要添加的标签:')
    if (!tagName) return
-    for (const id of ids) {
+    for (const id of pubIds) {
      const recipe = recipeStore.recipes.find(r => r._id === id)
      if (recipe && !recipe.tags.includes(tagName)) {
        recipe.tags.push(tagName)
        await recipeStore.saveRecipe(recipe)
      }
    }
-    ui.showToast(`已为 ${ids.length} 个配方添加标签`)
-  } else if (batchAction.value === 'share') {
-    const text = ids.map(id => {
-      const r = recipeStore.recipes.find(rec => rec._id === id)
-      if (!r) return ''
-      const ings = r.ingredients.map(ing => `${ing.oil} ${ing.drops}滴`).join('，')
-      return `${r.name}：${ings}`
-    }).filter(Boolean).join('\n\n')
-    try {
-      await navigator.clipboard.writeText(text)
-      ui.showToast('已复制到剪贴板')
-    } catch {
-      ui.showToast('复制失败')
+    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 })
+        }
+      }
    }
-  } else if (batchAction.value === 'export') {
+    ui.showToast(`已为 ${totalCount} 个配方添加标签`)
+  } else if (action === 'share_public') {
+    const ok = await showConfirm(`将 ${diaryIds.length} 个配方分享到公共配方库？`)
+    if (!ok) return
+    let count = 0
+    for (const id of diaryIds) {
+      const d = diaryStore.userDiary.find(r => r.id === id)
+      if (!d) continue
+      try {
+        await api('/api/recipes', {
+          method: 'POST',
+          body: JSON.stringify({
+            name: d.name,
+            note: d.note || '',
+            ingredients: (d.ingredients || []).map(i => ({ oil_name: i.oil, drops: i.drops })),
+            tags: d.tags || [],
+          }),
+        })
+        count++
+      } catch {}
+    }
+    await recipeStore.loadRecipes()
+    ui.showToast(`已提交 ${count} 个配方，等待审核`)
+  } else if (action === 'export') {
    ui.showToast('导出卡片功能开发中')
  }
  clearSelection()
@@ -325,7 +389,7 @@ async function executeBatch() {
 function editRecipe(recipe) {
  editingRecipe.value = recipe
  formName.value = recipe.name
-  formIngredients.value = recipe.ingredients.map(i => ({ ...i }))
+  formIngredients.value = recipe.ingredients.map(i => ({ ...i, _search: i.oil, _open: false }))
  formNote.value = recipe.note || ''
  formTags.value = [...(recipe.tags || [])]
  showAddOverlay.value = true
@@ -339,7 +403,7 @@ function closeOverlay() {

 function resetForm() {
  formName.value = ''
-  formIngredients.value = [{ oil: '', drops: 1 }]
+  formIngredients.value = [{ oil: '', drops: 1, _search: '', _open: false }]
  formNote.value = ''
  formTags.value = []
  smartPasteText.value = ''
@@ -356,6 +420,28 @@ function handleSmartPaste() {
  }
 }

+function filteredOilNames(search) {
+  if (!search) return oils.oilNames
+  const q = search.toLowerCase()
+  return oils.oilNames.filter(name =>
+    name.toLowerCase().includes(q) || matchesPinyinInitials(name, q)
+  )
+}
+
+function selectOil(ing, name) {
+  ing.oil = name
+  ing._search = name
+  ing._open = false
+}
+
+function onOilBlur(ing) {
+  setTimeout(() => {
+    ing._open = false
+    if (!ing.oil) ing._search = ''
+    else ing._search = ing.oil
+  }, 150)
+}
+
 function toggleFormTag(tag) {
  const idx = formTags.value.indexOf(tag)
  if (idx >= 0) formTags.value.splice(idx, 1)
@@ -380,6 +466,18 @@ async function saveCurrentRecipe() {
    tags: formTags.value,
  }

+  if (editingRecipe.value && editingRecipe.value._diary_id) {
+    // Editing a diary (personal) recipe
+    try {
+      await diaryStore.updateDiary(editingRecipe.value._diary_id, payload)
+      ui.showToast('个人配方已更新')
+      closeOverlay()
+    } catch (e) {
+      ui.showToast('保存失败: ' + (e.message || '未知错误'))
+    }
+    return
+  }
+
  if (editingRecipe.value) {
    payload._id = editingRecipe.value._id
    payload._version = editingRecipe.value._version
@@ -402,9 +500,12 @@ onMounted(async () => {
 })

 function editDiaryRecipe(diary) {
-  // For now, navigate to MyDiary page to edit
-  // TODO: inline editing
-  ui.showToast('请到「我的」页面编辑个人配方')
+  editingRecipe.value = { _diary_id: diary.id, name: diary.name }
+  formName.value = diary.name
+  formIngredients.value = (diary.ingredients || []).map(i => ({ ...i, _search: i.oil, _open: false }))
+  formNote.value = diary.note || ''
+  formTags.value = [...(diary.tags || [])]
+  showAddOverlay.value = true
 }

 async function removeDiaryRecipe(diary) {
@@ -882,6 +983,44 @@ watch(() => recipeStore.recipes, () => {
  text-align: center;
 }

+.oil-search-wrap {
+  flex: 1;
+  position: relative;
+}
+
+.oil-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  background: #fff;
+  border: 1.5px solid #d4cfc7;
+  border-radius: 8px;
+  max-height: 180px;
+  overflow-y: auto;
+  z-index: 10;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.1);
+}
+
+.oil-option {
+  padding: 8px 12px;
+  font-size: 13px;
+  cursor: pointer;
+}
+
+.oil-option:hover {
+  background: #e8f5e9;
+}
+
+.oil-empty {
+  color: #999;
+  cursor: default;
+}
+
+.oil-empty:hover {
+  background: transparent;
+}
+
 .btn-icon-sm {
  border: none;
  background: transparent;
@@ -938,6 +1077,32 @@ watch(() => recipeStore.recipes, () => {
  background: #f8f7f5;
 }

+.toolbar-actions {
+  display: flex;
+  gap: 8px;
+}
+
+.btn-sm {
+  padding: 7px 14px;
+  font-size: 13px;
+}
+
+.btn-danger-outline {
+  background: #fff;
+  color: #c0392b;
+  border: 1.5px solid #e8b4b0;
+  border-radius: 10px;
+  padding: 7px 14px;
+  font-size: 13px;
+  cursor: pointer;
+  font-family: inherit;
+  white-space: nowrap;
+}
+
+.btn-danger-outline:hover {
+  background: #fdf0ee;
+}
+
 .btn-sm {
  padding: 6px 14px;
  font-size: 12px;
--- a/frontend/src/views/RecipeSearch.vue
+++ b/frontend/src/views/RecipeSearch.vue
@@ -49,57 +49,91 @@

    <!-- Personal Section (logged in) -->
    <div v-if="auth.isLoggedIn" class="personal-section">
+      <template v-if="!searchQuery || myDiaryRecipes.length > 0">
      <div class="section-header" @click="showMyRecipes = !showMyRecipes">
        <span>📖 我的配方 ({{ myDiaryRecipes.length }})</span>
+        <span v-if="!auth.isAdmin && sharedCount > 0" class="contrib-badge">已贡献 {{ sharedCount }} 条公共配方</span>
        <span class="toggle-icon">{{ showMyRecipes ? '▾' : '▸' }}</span>
      </div>
      <div v-if="showMyRecipes" class="recipe-grid">
-        <div
-          v-for="d in myDiaryRecipes"
-          :key="'diary-' + d.id"
-          class="recipe-card diary-card"
-          @click="openDiaryDetail(d)"
-        >
-          <div class="card-name">{{ d.name }}</div>
-          <div class="card-oils">{{ (d.ingredients || []).map(i => i.oil).join('、') }}</div>
-          <div class="card-bottom">
-            <span class="card-price">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
-            <button class="share-btn" @click.stop="shareDiaryToPublic(d)" title="共享到公共配方库">📤</button>
-          </div>
+        <div v-for="d in myDiaryRecipes" :key="'diary-' + d.id" class="diary-card-wrap">
+          <RecipeCard
+            :recipe="diaryAsRecipe(d)"
+            :index="-1"
+            @click="openDiaryDetail(d)"
+          />
+          <span v-if="getDiaryShareStatus(d) === 'shared'" class="share-status shared">已共享</span>
+          <span v-else-if="getDiaryShareStatus(d) === 'pending'" class="share-status pending">审核中</span>
        </div>
        <div v-if="myDiaryRecipes.length === 0" class="empty-hint">暂无个人配方</div>
      </div>
+      </template>

-      <div class="section-header" @click="showFavorites = !showFavorites">
-        <span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
-        <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
-      </div>
-      <div v-if="showFavorites" class="recipe-grid">
-        <RecipeCard
-          v-for="r in favoritesPreview"
-          :key="r._id"
-          :recipe="r"
-          :index="findGlobalIndex(r)"
-          @click="openDetail(findGlobalIndex(r))"
-          @toggle-fav="handleToggleFav(r)"
-        />
-        <div v-if="favoritesPreview.length === 0" class="empty-hint">暂无收藏配方</div>
-      </div>
+      <template v-if="!searchQuery || favoritesPreview.length > 0">
+        <div class="section-header" @click="showFavorites = !showFavorites">
+          <span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
+          <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
+        </div>
+        <div v-if="showFavorites" class="recipe-grid">
+          <RecipeCard
+            v-for="r in favoritesPreview"
+            :key="r._id"
+            :recipe="r"
+            :index="findGlobalIndex(r)"
+            @click="openDetail(findGlobalIndex(r))"
+            @toggle-fav="handleToggleFav(r)"
+          />
+          <div v-if="favoritesPreview.length === 0" class="empty-hint">暂无收藏配方</div>
+        </div>
+      </template>
    </div>

    <!-- Search Results (public recipes) -->
    <div v-if="searchQuery" class="search-results-section">
-      <div class="section-label">🔍 公共配方搜索结果 ({{ fuzzyResults.length }})</div>
-      <div class="recipe-grid">
-        <RecipeCard
-          v-for="(r, i) in fuzzyResults"
-          :key="r._id"
-          :recipe="r"
-          :index="findGlobalIndex(r)"
-          @click="openDetail(findGlobalIndex(r))"
-          @toggle-fav="handleToggleFav(r)"
-        />
-        <div v-if="fuzzyResults.length === 0" class="empty-hint">未找到匹配的公共配方</div>
+      <!-- Exact matches -->
+      <template v-if="exactResults.length > 0">
+        <div class="section-label">🔍 搜索结果 ({{ exactResults.length }})</div>
+        <div class="recipe-grid">
+          <RecipeCard
+            v-for="r in exactResults"
+            :key="r._id"
+            :recipe="r"
+            :index="findGlobalIndex(r)"
+            @click="openDetail(findGlobalIndex(r))"
+            @toggle-fav="handleToggleFav(r)"
+          />
+        </div>
+      </template>
+
+      <!-- Similar/related matches -->
+      <template v-if="similarResults.length > 0">
+        <div class="section-label similar-label">
+          {{ exactResults.length > 0 ? '💡 相关配方' : '💡 没有完全匹配，以下是相关配方' }}
+          ({{ similarResults.length }})
+        </div>
+        <div class="recipe-grid">
+          <RecipeCard
+            v-for="r in similarResults"
+            :key="'sim-' + r._id"
+            :recipe="r"
+            :index="findGlobalIndex(r)"
+            @click="openDetail(findGlobalIndex(r))"
+            @toggle-fav="handleToggleFav(r)"
+          />
+        </div>
+      </template>
+
+      <!-- No results at all -->
+      <div v-if="exactResults.length === 0 && similarResults.length === 0" class="no-match-box">
+        <div class="empty-hint">未找到「{{ searchQuery }}」相关配方</div>
+      </div>
+
+      <!-- Report missing button -->
+      <div v-if="exactResults.length === 0" class="no-match-box" style="margin-top:12px">
+        <button v-if="!reportedMissing" class="btn-report-missing" @click="reportMissing">
+          📢 {{ similarResults.length > 0 ? '以上都不是我想找的，通知编辑添加' : '通知编辑添加此配方' }}
+        </button>
+        <div v-else class="reported-hint">已通知编辑，感谢反馈！</div>
      </div>
    </div>

@@ -121,9 +155,11 @@

    <!-- Recipe Detail Overlay -->
    <RecipeDetailOverlay
-      v-if="selectedRecipeIndex !== null"
+      v-if="selectedRecipeIndex !== null || selectedDiaryRecipe !== null"
      :recipeIndex="selectedRecipeIndex"
-      @close="selectedRecipeIndex = null"
+      :recipeData="selectedDiaryRecipe"
+      :isDiary="selectedDiaryRecipe !== null"
+      @close="selectedRecipeIndex = null; selectedDiaryRecipe = null"
    />
  </div>
 </template>
@@ -152,9 +188,11 @@ const searchQuery = ref('')
 const selectedCategory = ref(null)
 const categories = ref([])
 const selectedRecipeIndex = ref(null)
+const selectedDiaryRecipe = ref(null)
 const showMyRecipes = ref(true)
 const showFavorites = ref(true)
 const catIdx = ref(0)
+const sharedCount = ref(0)

 onMounted(async () => {
  try {
@@ -164,9 +202,16 @@ onMounted(async () => {
    }
  } catch {}

-  // Load personal diary recipes
+  // Load personal diary recipes & contribution stats
  if (auth.isLoggedIn) {
    await diaryStore.loadDiary()
+    try {
+      const cRes = await api('/api/me/contribution')
+      if (cRes.ok) {
+        const data = await cRes.json()
+        sharedCount.value = data.shared_count || 0
+      }
+    } catch {}
  }

  // Return to a recipe card after QR upload redirect
@@ -206,21 +251,107 @@ const filteredRecipes = computed(() => {
  if (selectedCategory.value) {
    list = list.filter(r => r.tags && r.tags.includes(selectedCategory.value))
  }
-  return list
+  return list.slice().sort((a, b) => a.name.localeCompare(b.name, 'zh'))
 })

-// Search results from public recipes
-const fuzzyResults = computed(() => {
+// Synonym groups for broader fuzzy matching
+const synonymGroups = [
+  ['胸', '乳腺', '乳房', '丰胸', '胸部'],
+  ['瘦', '减肥', '减脂', '消脂', '纤体', '塑形', '体重'],
+  ['痘', '痤疮', '粉刺', '暗疮', '长痘', '祛痘'],
+  ['斑', '色斑', '淡斑', '雀斑', '黑色素', '美白', '亮肤'],
+  ['皱', '抗皱', '皱纹', '紧致', '抗衰', '抗老'],
+  ['睡', '眠', '失眠', '助眠', '安眠', '好眠', '入睡'],
+  ['焦虑', '紧张', '压力', '情绪', '放松', '舒缓', '安神', '宁神'],
+  ['头', '头痛', '头疼', '偏头痛', '头晕'],
+  ['咳', '咳嗽', '止咳', '清咽'],
+  ['鼻', '鼻炎', '鼻塞', '过敏性鼻炎', '打喷嚏'],
+  ['感冒', '发烧', '发热', '流感', '风寒', '风热'],
+  ['胃', '消化', '肠胃', '胃痛', '胃胀', '积食', '便秘'],
+  ['肝', '护肝', '养肝', '肝脏', '排毒'],
+  ['肾', '补肾', '养肾', '肾虚'],
+  ['腰', '腰痛', '腰酸', '腰椎'],
+  ['肩', '肩颈', '颈椎', '肩周'],
+  ['关节', '骨骼', '骨质', '风湿', '类风湿'],
+  ['肌肉', '酸痛', '疼痛', '拉伤'],
+  ['月经', '痛经', '经期', '姨妈', '生理期', '调经'],
+  ['子宫', '卵巢', '生殖', '备孕', '怀孕', '孕'],
+  ['前列腺', '男性', '阳'],
+  ['湿', '祛湿', '排湿', '湿气', '化湿'],
+  ['免疫', '免疫力', '抵抗力'],
+  ['脱发', '掉发', '生发', '头发', '发际线', '秃'],
+  ['过敏', '敏感', '荨麻疹', '湿疹', '皮炎'],
+  ['血压', '高血压', '低血压', '血管', '循环'],
+  ['血糖', '糖尿病', '降糖'],
+  ['淋巴', '排毒', '水肿', '浮肿'],
+  ['呼吸', '肺', '支气管', '哮喘', '气管'],
+  ['眼', '眼睛', '视力', '近视', '干眼'],
+  ['耳', '耳鸣', '中耳炎', '耳朵'],
+  ['口', '口腔', '口臭', '牙', '牙龈', '牙疼'],
+  ['皮肤', '护肤', '保湿', '修复', '焕肤'],
+  ['疤', '疤痕', '伤疤', '妊娠纹'],
+  ['心', '心脏', '心悸', '养心'],
+  ['甲状腺', '甲亢', '甲减'],
+  ['高', '长高', '增高', '个子'],
+  ['静脉', '静脉曲张'],
+  ['痔', '痔疮'],
+]
+
+function expandQuery(q) {
+  const terms = [q]
+  for (const group of synonymGroups) {
+    if (group.some(t => q.includes(t) || t.includes(q))) {
+      for (const t of group) {
+        if (!terms.includes(t)) terms.push(t)
+      }
+    }
+  }
+  return terms
+}
+
+// Search results: exact matches (query in recipe name or tags, NOT oil names to avoid noise like 西班牙牛至)
+const exactResults = computed(() => {
  if (!searchQuery.value.trim()) return []
  const q = searchQuery.value.trim().toLowerCase()
  return recipeStore.recipes.filter(r => {
    const nameMatch = r.name.toLowerCase().includes(q)
-    const oilMatch = r.ingredients.some(ing => ing.oil.toLowerCase().includes(q))
    const tagMatch = r.tags && r.tags.some(t => t.toLowerCase().includes(q))
-    return nameMatch || oilMatch || tagMatch
-  })
+    return nameMatch || tagMatch
+  }).sort((a, b) => a.name.localeCompare(b.name, 'zh'))
 })

+// Similar results: synonym expansion, only match against recipe NAME (not ingredients/tags)
+// Filter out single-char expanded terms to avoid overly broad matches
+const similarResults = computed(() => {
+  if (!searchQuery.value.trim()) return []
+  const q = searchQuery.value.trim()
+  const exactIds = new Set(exactResults.value.map(r => r._id))
+  const terms = expandQuery(q).filter(t => t.length >= 2 || t === q)
+
+  return recipeStore.recipes.filter(r => {
+    if (exactIds.has(r._id)) return false
+    const name = r.name
+    // Match by expanded synonyms (name only, not ingredients)
+    if (terms.some(t => name.includes(t))) return true
+    return false
+  }).sort((a, b) => a.name.localeCompare(b.name, 'zh')).slice(0, 30)
+})
+
+const reportedMissing = ref(false)
+
+async function reportMissing() {
+  try {
+    await api('/api/symptom-search', {
+      method: 'POST',
+      body: JSON.stringify({ query: searchQuery.value.trim(), report_missing: true }),
+    })
+    reportedMissing.value = true
+    ui.showToast('已通知编辑，感谢反馈！')
+  } catch {
+    ui.showToast('通知失败')
+  }
+}
+
 // Personal recipes from diary (separate from public recipes)
 const myDiaryRecipes = computed(() => {
  if (!auth.isLoggedIn) return []
@@ -260,27 +391,24 @@ function openDetail(index) {
  }
 }

-function openDiaryDetail(diary) {
-  // Create a temporary recipe-like object from diary and open it
-  const tmpRecipe = {
-    _id: null,
-    _diary_id: diary.id,
-    name: diary.name,
-    note: diary.note || '',
-    tags: diary.tags || [],
-    ingredients: diary.ingredients || [],
-    _owner_id: auth.user.id,
+function getDiaryShareStatus(d) {
+  const pub = recipeStore.recipes.find(r => r.name === d.name && r._owner_id === auth.user?.id)
+  if (pub) return 'shared'
+  return null
+}
+
+function diaryAsRecipe(d) {
+  return {
+    _id: 'diary-' + d.id,
+    name: d.name,
+    note: d.note || '',
+    tags: d.tags || [],
+    ingredients: d.ingredients || [],
  }
-  recipeStore.recipes.push(tmpRecipe)
-  const tmpIdx = recipeStore.recipes.length - 1
-  selectedRecipeIndex.value = tmpIdx
-  // Clean up temp recipe when detail closes
-  const unwatch = watch(selectedRecipeIndex, (val) => {
-    if (val === null) {
-      recipeStore.recipes.splice(tmpIdx, 1)
-      unwatch()
-    }
-  })
+}
+
+function openDiaryDetail(diary) {
+  selectedDiaryRecipe.value = diaryAsRecipe(diary)
 }

 async function handleToggleFav(recipe) {
@@ -317,12 +445,13 @@ async function shareDiaryToPublic(diary) {
 }

 function onSearch() {
-  // fuzzyResults computed handles the filtering reactively
+  reportedMissing.value = false
 }

 function clearSearch() {
  searchQuery.value = ''
  selectedCategory.value = null
+  reportedMissing.value = false
 }

 // Carousel swipe
@@ -535,6 +664,40 @@ function onCarouselTouchEnd(e) {
  color: #999;
 }

+.diary-card-wrap {
+  position: relative;
+}
+
+.share-status {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  font-size: 10px;
+  padding: 2px 8px;
+  border-radius: 8px;
+  font-weight: 600;
+}
+
+.share-status.shared {
+  background: #e8f5e9;
+  color: #2e7d32;
+}
+
+.share-status.pending {
+  background: #fff3e0;
+  color: #e65100;
+}
+
+.contrib-badge {
+  font-size: 11px;
+  color: #4a9d7e;
+  background: #e8f5e9;
+  padding: 2px 8px;
+  border-radius: 8px;
+  font-weight: 500;
+  margin-left: auto;
+}
+
 .section-label {
  font-size: 14px;
  font-weight: 600;
@@ -562,6 +725,40 @@ function onCarouselTouchEnd(e) {
  padding: 24px 0;
 }

+.similar-label {
+  color: #e65100;
+  background: #fff8e1;
+  padding: 8px 14px;
+  border-radius: 10px;
+}
+
+.no-match-box {
+  text-align: center;
+  padding: 12px 0;
+}
+
+.btn-report-missing {
+  background: linear-gradient(135deg, #ffb74d, #e65100);
+  color: #fff;
+  border: none;
+  border-radius: 10px;
+  padding: 10px 20px;
+  font-size: 14px;
+  cursor: pointer;
+  font-family: inherit;
+  margin-top: 8px;
+}
+
+.btn-report-missing:hover {
+  opacity: 0.9;
+}
+
+.reported-hint {
+  color: #4a9d7e;
+  font-size: 13px;
+  font-weight: 500;
+}
+
 .diary-card {
  background: white;
  border-radius: 14px;