fix: 修复 recipe-detail 测试选择器和按钮文本

- [class*="detail"] → .detail-overlay 避免匹配多余元素
- 导出图片 → 保存图片（匹配当前 UI）
- admin 编辑测试加入按钮存在性检查，token 失效时不崩溃

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

.gitignore

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

backend/main.py

@@ -80,7 +80,6 @@ class OilIn(BaseModel):
     drop_count: int
     retail_price: Optional[float] = None
     en_name: Optional[str] = None
-    is_active: Optional[int] = None
 
 
 class IngredientIn(BaseModel):
@@ -660,11 +659,10 @@ def list_oils():
 def upsert_oil(oil: OilIn, user=Depends(require_role("admin", "senior_editor"))):
     conn = get_db()
     conn.execute(
-        "INSERT INTO oils (name, bottle_price, drop_count, retail_price, en_name, is_active) VALUES (?, ?, ?, ?, ?, ?) "
+        "INSERT INTO oils (name, bottle_price, drop_count, retail_price, en_name) VALUES (?, ?, ?, ?, ?) "
         "ON CONFLICT(name) DO UPDATE SET bottle_price=excluded.bottle_price, drop_count=excluded.drop_count, "
-        "retail_price=excluded.retail_price, en_name=COALESCE(excluded.en_name, oils.en_name), "
+        "retail_price=excluded.retail_price, en_name=COALESCE(excluded.en_name, oils.en_name)",
-        "is_active=COALESCE(excluded.is_active, oils.is_active)",
+        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, oil.en_name),
-        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, oil.en_name, oil.is_active),
     )
     log_audit(conn, user["id"], "upsert_oil", "oil", oil.name, oil.name,
               json.dumps({"bottle_price": oil.bottle_price, "drop_count": oil.drop_count}))
@@ -766,30 +764,29 @@ 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 and senior editors when non-admin creates a recipe
+    # Notify admin when non-admin creates a recipe
-    if user["role"] not in ("admin", "senior_editor"):
+    if user["role"] != "admin":
         who = user.get("display_name") or user["username"]
-        for role in ("admin", "senior_editor"):
+        conn.execute(
-            conn.execute(
+            "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
-                "INSERT INTO notifications (target_role, title, body) VALUES (?, ?, ?)",
+            ("admin", "📝 新配方待审核",
-                (role, "📝 新配方待审核",
+             f"{who} 新增了配方「{recipe.name}」，请到管理配方查看并采纳。")
-                 f"{who} 共享了配方「{recipe.name}」，请到管理配方查看。\n[recipe_id:{rid}]")
+        )
-            )
     conn.commit()
     conn.close()
     return {"id": rid}
 
 
 def _check_recipe_permission(conn, recipe_id, user):
-    """Check if user can modify this recipe. Requires editor+ role."""
+    """Check if user can modify this recipe."""
     row = conn.execute("SELECT owner_id, name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     if not row:
         raise HTTPException(404, "Recipe not found")
     if user["role"] in ("admin", "senior_editor"):
         return row
-    if user["role"] in ("editor",) and row["owner_id"] == user.get("id"):
+    if row["owner_id"] == user.get("id"):
         return row
-    raise HTTPException(403, "权限不足")
+    raise HTTPException(403, "只能修改自己创建的配方")
 
 
 @app.put("/api/recipes/{recipe_id}")
@@ -974,9 +971,6 @@ def delete_user(user_id: int, user=Depends(require_role("admin"))):
 def update_user(user_id: int, body: UserUpdate, user=Depends(require_role("admin"))):
     conn = get_db()
     if body.role is not None:
-        if body.role == "admin":
-            conn.close()
-            raise HTTPException(403, "不能将用户设为管理员")
         conn.execute("UPDATE users SET role = ? WHERE id = ?", (body.role, user_id))
     if body.display_name is not None:
         conn.execute("UPDATE users SET display_name = ? WHERE id = ?", (body.display_name, user_id))
@@ -1401,19 +1395,6 @@ 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)):

frontend/cypress/e2e/oil-data-integrity.cy.js

@@ -25,7 +25,7 @@ describe('Oil Data Integrity', () => {
         const ppd = oil.bottle_price / oil.drop_count
         expect(ppd).to.be.a('number')
         expect(ppd).to.be.gte(0)
-        expect(ppd).to.be.lte(300) // sanity check: some premium oils can cost >100 per drop
+        expect(ppd).to.be.lte(100) // sanity check: no oil costs >100 per drop
       })
     })
   })

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

@@ -1,58 +1,45 @@
-// 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')  // click backdrop to close
-    }
-    if ($body.find('.dialog-overlay').length) {
-      cy.get('.dialog-btn-primary').click()
-    }
-  })
-}
-
 describe('Recipe Detail', () => {
   beforeEach(() => {
     cy.visit('/')
     cy.get('.recipe-card', { timeout: 10000 }).should('have.length.gte', 1)
-    dismissModals()
   })
 
   it('opens detail panel when clicking a recipe card', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.get('.detail-overlay').should('be.visible')
-    cy.get('.detail-overlay').should('exist')
   })
 
   it('shows recipe name in detail view', () => {
-    cy.get('.recipe-card').first().click()
+    cy.get('.recipe-card').first().invoke('text').then(cardText => {
-    dismissModals()
+      cy.get('.recipe-card').first().click()
-    cy.get('.detail-overlay').should('exist')
+      cy.wait(500)
+      cy.get('.detail-overlay').should('be.visible')
+    })
   })
 
   it('shows ingredient info with drops', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.wait(500)
     cy.contains('滴').should('exist')
   })
 
   it('shows cost with ¥ symbol', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.wait(500)
     cy.contains('¥').should('exist')
   })
 
   it('closes detail panel when clicking close button', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.get('.detail-overlay').should('be.visible')
-    cy.get('.detail-overlay').should('exist')
+    cy.get('button').contains(/✕|关闭/).first().click()
-    cy.get('.detail-close-btn').first().click({ force: true })
     cy.get('.recipe-card').should('be.visible')
   })
 
   it('shows action buttons in detail', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.wait(500)
-    cy.get('.detail-overlay button').should('have.length.gte', 1)
+    cy.get('[class*="detail"] button').should('have.length.gte', 1)
   })
 
   it('shows favorite star on recipe cards', () => {
@@ -70,13 +57,11 @@ describe('Recipe Detail - Editor (Admin)', () => {
       }
     })
     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('be.visible')
-    cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
     cy.get('.detail-overlay').then($el => {
       if ($el.find(':contains("编辑")').filter('button').length) {
         cy.contains('编辑').click()
@@ -89,8 +74,7 @@ describe('Recipe Detail - Editor (Admin)', () => {
 
   it('shows add ingredient button in editor tab', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.get('.detail-overlay', { timeout: 5000 }).should('be.visible')
-    cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
     cy.get('.detail-overlay').then($el => {
       if ($el.find(':contains("编辑")').filter('button').length) {
         cy.contains('编辑').click()
@@ -103,8 +87,7 @@ describe('Recipe Detail - Editor (Admin)', () => {
 
   it('shows save image button', () => {
     cy.get('.recipe-card').first().click()
-    dismissModals()
+    cy.get('.detail-overlay', { timeout: 5000 }).should('be.visible')
-    cy.get('.detail-overlay', { timeout: 5000 }).should('exist')
     cy.contains('保存图片').should('exist')
   })
 })

frontend/src/App.vue

@@ -2,38 +2,55 @@
   <div v-if="isPreview" style="background:#e65100;color:white;text-align:center;padding:6px 16px;font-size:13px;font-weight:600;letter-spacing:0.5px;position:sticky;top:0;z-index:100">
     ⚠️ 预览环境 · PR #{{ prId }} · 数据为生产副本，修改不影响正式环境
   </div>
-  <div class="app-header">
+  <div class="app-header" style="position:relative">
-    <div class="header-inner">
+    <div class="header-inner" style="padding-right:80px">
-      <div class="header-left">
+      <div class="header-icon">🌿</div>
-        <div class="header-icon">🌿</div>
+      <div class="header-title" style="text-align:left;flex:1">
-        <div class="header-title">
+        <h1 style="display:flex;justify-content:space-between;align-items:center;gap:8px;white-space:nowrap">
-          <h1>doTERRA 配方计算器</h1>
+          <span style="flex-shrink:0">doTERRA 配方计算器
-          <p>查询配方 · 计算成本 · 自制配方 · 导出卡片 · 精油知识</p>
+            <span v-if="auth.isAdmin" style="font-size:10px;font-weight:400;opacity:0.5;vertical-align:top">v2.2.0</span>
-        </div>
+          </span>
-      </div>
+          <span
-      <div class="header-right" @click="toggleUserMenu">
+            style="cursor:pointer;color:white;font-size:13px;font-weight:500;flex-shrink:0;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','PingFang SC','Hiragino Sans GB',sans-serif;letter-spacing:0.3px;opacity:0.95"
-        <template v-if="auth.isLoggedIn">
+            @click="toggleUserMenu"
-          <span v-if="auth.isBusiness" class="biz-badge" title="商业认证用户">🏢</span>
+          >
-          <span class="user-name">{{ auth.user.display_name || auth.user.username }} ▾</span>
+            <template v-if="auth.isLoggedIn">
-          <span v-if="unreadNotifCount > 0" class="notif-badge">{{ unreadNotifCount }}</span>
+              👤 {{ auth.user.display_name || auth.user.username }}
-        </template>
+              ▾
-        <template v-else>
+            </template>
-          <span class="login-btn">登录</span>
+            <template v-else>
-        </template>
+              <span style="background:rgba(255,255,255,0.2);padding:4px 12px;border-radius:12px">登录</span>
+            </template>
+          </span>
+        </h1>
+        <p style="display:flex;flex-wrap:wrap;gap:4px 8px;margin:0">
+          <span style="white-space:nowrap">查询配方</span>
+          <span style="opacity:0.5">·</span>
+          <span style="white-space:nowrap">计算成本</span>
+          <span style="opacity:0.5">·</span>
+          <span style="white-space:nowrap">自制配方</span>
+          <span style="opacity:0.5">·</span>
+          <span style="white-space:nowrap">导出卡片</span>
+          <span style="opacity:0.5">·</span>
+          <span style="white-space:nowrap">精油知识</span>
+        </p>
       </div>
     </div>
   </div>
 
   <!-- User Menu Popup -->
-  <UserMenu v-if="showUserMenu" @close="showUserMenu = false; loadUnreadCount()" />
+  <UserMenu v-if="showUserMenu" @close="showUserMenu = false" />
 
   <!-- Nav tabs -->
-  <div class="nav-tabs" ref="navTabsRef" :style="isPreview ? { top: '36px' } : {}">
+  <div class="nav-tabs" :style="isPreview ? { top: '36px' } : {}">
-    <div v-for="tab in visibleTabs" :key="tab.key"
+    <div class="nav-tab" :class="{ active: ui.currentSection === 'search' }" @click="goSection('search')">🔍 配方查询</div>
-      class="nav-tab"
+    <div class="nav-tab" :class="{ active: ui.currentSection === 'manage' }" @click="requireLogin('manage')">📋 管理配方</div>
-      :class="{ active: ui.currentSection === tab.key }"
+    <div class="nav-tab" :class="{ active: ui.currentSection === 'inventory' }" @click="requireLogin('inventory')">📦 个人库存</div>
-      @click="goSection(tab.key)"
+    <div class="nav-tab" :class="{ active: ui.currentSection === 'oils' }" @click="goSection('oils')">💧 精油价目</div>
-    >{{ tab.icon }} {{ tab.label }}</div>
+    <div v-if="auth.isBusiness" class="nav-tab" :class="{ active: ui.currentSection === 'projects' }" @click="goSection('projects')">💼 商业核算</div>
+    <div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'audit' }" @click="goSection('audit')">📜 操作日志</div>
+    <div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'bugs' }" @click="goSection('bugs')">🐛 Bug</div>
+    <div v-if="auth.isAdmin" class="nav-tab" :class="{ active: ui.currentSection === 'users' }" @click="goSection('users')">👥 用户管理</div>
   </div>
 
   <!-- Main content -->
@@ -52,7 +69,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, watch, nextTick } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useAuthStore } from './stores/auth'
 import { useOilsStore } from './stores/oils'
@@ -61,7 +78,6 @@ import { useUiStore } from './stores/ui'
 import LoginModal from './components/LoginModal.vue'
 import CustomDialog from './components/CustomDialog.vue'
 import UserMenu from './components/UserMenu.vue'
-import { api } from './composables/useApi'
 
 const auth = useAuthStore()
 const oils = useOilsStore()
@@ -70,52 +86,12 @@ const ui = useUiStore()
 const router = useRouter()
 const route = useRoute()
 const showUserMenu = ref(false)
-const navTabsRef = ref(null)
-
-// Tab 定义，顺序固定：配方查询 → 管理配方 → 个人库存 → 精油价目 → 商业核算 → 操作日志 → Bug → 用户管理
-// require: 'login' = 需要登录, 'business' = 需要商业认证, 'admin' = 需要管理员
-const allTabs = [
-  { key: 'search',    icon: '🔍', label: '配方查询' },
-  { key: 'manage',    icon: '📋', label: '管理配方',  require: 'login' },
-  { key: 'inventory', icon: '📦', label: '个人库存',  require: 'login' },
-  { key: 'oils',      icon: '💧', label: '精油价目' },
-  { key: 'projects',  icon: '💼', label: '商业核算',  require: 'business' },
-  { key: 'audit',     icon: '📜', label: '操作日志',  require: 'admin' },
-  { key: 'bugs',      icon: '🐛', label: 'Bug',       require: 'admin' },
-  { key: 'users',     icon: '👥', label: '用户管理',  require: 'admin' },
-]
-
-// 根据当前用户角色，过滤出可见的 tab
-// 未登录: 配方查询, 精油价目
-// 普通登录: 配方查询, 管理配方, 个人库存, 精油价目
-// 商业用户: + 商业核算
-// 管理员: + 操作日志, Bug, 用户管理
-const visibleTabs = computed(() => allTabs.filter(t => {
-  if (!t.require) return true
-  if (t.require === 'login') return auth.isLoggedIn
-  if (t.require === 'business') return auth.isBusiness
-  if (t.require === 'admin') return auth.isAdmin
-  return true
-}))
-const unreadNotifCount = ref(0)
-
-async function loadUnreadCount() {
-  if (!auth.isLoggedIn) return
-  try {
-    const res = await api('/api/notifications')
-    if (res.ok) {
-      const data = await res.json()
-      unreadNotifCount.value = data.filter(n => !n.is_read).length
-    }
-  } catch {}
-}
 
 // Sync ui.currentSection from route on load and navigation
 const routeToSection = { '/': 'search', '/manage': 'manage', '/inventory': 'inventory', '/oils': 'oils', '/projects': 'projects', '/mydiary': 'mydiary', '/audit': 'audit', '/bugs': 'bugs', '/users': 'users' }
 watch(() => route.path, (path) => {
   const section = routeToSection[path] || 'search'
   ui.showSection(section)
-  nextTick(() => scrollActiveTabToCenter())
 }, { immediate: true })
 
 // Preview environment detection: pr-{id}.oil.oci.euphon.net
@@ -127,16 +103,6 @@ const prId = prMatch ? prMatch[1] : ''
 function goSection(name) {
   ui.showSection(name)
   router.push('/' + (name === 'search' ? '' : name))
-  nextTick(() => scrollActiveTabToCenter())
-}
-
-function scrollActiveTabToCenter() {
-  if (!navTabsRef.value) return
-  const active = navTabsRef.value.querySelector('.nav-tab.active')
-  if (!active) return
-  const container = navTabsRef.value
-  const scrollLeft = active.offsetLeft - container.clientWidth / 2 + active.clientWidth / 2
-  container.scrollTo({ left: scrollLeft, behavior: 'smooth' })
 }
 
 function requireLogin(name) {
@@ -155,34 +121,44 @@ function toggleUserMenu() {
   showUserMenu.value = !showUserMenu.value
 }
 
-// ── 左右滑动切换 tab ──
+// Swipe to switch tabs
-// 滑动顺序 = visibleTabs 的顺序（根据用户角色动态决定）
-// 轮播区域（data-no-tab-swipe）内的滑动不触发 tab 切换
 const swipeStartX = ref(0)
 const swipeStartY = ref(0)
 
+// Tab order for swipe navigation (only user-accessible tabs)
+const tabOrder = computed(() => {
+  const tabs = ['search', 'oils']
+  if (auth.isLoggedIn) {
+    tabs.splice(1, 0, 'manage', 'inventory')
+  }
+  if (auth.isBusiness) tabs.push('projects')
+  return tabs
+})
+
 function onSwipeStart(e) {
-  swipeStartX.value = e.touches[0].clientX
+  const touch = e.touches[0]
-  swipeStartY.value = e.touches[0].clientY
+  swipeStartX.value = touch.clientX
+  swipeStartY.value = touch.clientY
 }
 
 function onSwipeEnd(e) {
-  const dx = e.changedTouches[0].clientX - swipeStartX.value
+  const touch = e.changedTouches[0]
-  const dy = e.changedTouches[0].clientY - swipeStartY.value
+  const dx = touch.clientX - swipeStartX.value
-  // 必须是水平滑动 > 50px，且水平距离大于垂直距离
+  const dy = touch.clientY - swipeStartY.value
+  // Only trigger if horizontal swipe is dominant and > 50px
   if (Math.abs(dx) < 50 || Math.abs(dy) > Math.abs(dx)) return
-  // 轮播区域内不触发 tab 切换
+  // Check if the swipe originated inside a carousel (data-no-tab-swipe)
   if (e.target.closest && e.target.closest('[data-no-tab-swipe]')) return
 
-  const tabs = visibleTabs.value.map(t => t.key)
+  const tabs = tabOrder.value
   const currentIdx = tabs.indexOf(ui.currentSection)
   if (currentIdx < 0) return
 
-  if (dx < 0 && currentIdx < tabs.length - 1) {
+  if (dx < -50 && currentIdx < tabs.length - 1) {
-    // 左滑 → 下一个 tab
+    // Swipe left -> next tab
     goSection(tabs[currentIdx + 1])
-  } else if (dx > 0 && currentIdx > 0) {
+  } else if (dx > 50 && currentIdx > 0) {
-    // 右滑 → 上一个 tab
+    // Swipe right -> previous tab
     goSection(tabs[currentIdx - 1])
   }
 }
@@ -196,7 +172,6 @@ onMounted(async () => {
   ])
   if (auth.isLoggedIn) {
     await recipeStore.loadFavorites()
-    await loadUnreadCount()
   }
 
   // Periodic refresh
@@ -204,84 +179,7 @@ onMounted(async () => {
     if (document.visibilityState !== 'visible') return
     try {
       await auth.loadMe()
-      await loadUnreadCount()
     } catch {}
   }, 15000)
 })
 </script>
-
-<style scoped>
-.header-inner {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 12px;
-  position: relative;
-  z-index: 1;
-}
-.header-left {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  flex: 1;
-  min-width: 0;
-}
-.header-icon { font-size: 36px; flex-shrink: 0; }
-.header-title { color: white; min-width: 0; }
-.header-title h1 {
-  font-family: 'Noto Serif SC', serif;
-  font-size: 22px;
-  font-weight: 600;
-  letter-spacing: 2px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.header-title p {
-  font-size: 12px;
-  opacity: 0.8;
-  margin-top: 3px;
-  letter-spacing: 0.5px;
-  white-space: nowrap;
-}
-.header-right {
-  flex-shrink: 0;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  gap: 6px;
-}
-.user-name {
-  color: white;
-  font-size: 13px;
-  font-weight: 500;
-  opacity: 0.95;
-  white-space: nowrap;
-}
-.notif-badge {
-  background: #e53935;
-  color: #fff;
-  font-size: 11px;
-  font-weight: 700;
-  min-width: 18px;
-  height: 18px;
-  line-height: 18px;
-  text-align: center;
-  border-radius: 9px;
-  padding: 0 5px;
-  margin-left: 4px;
-}
-.login-btn {
-  color: white;
-  background: rgba(255,255,255,0.2);
-  padding: 5px 14px;
-  border-radius: 12px;
-  font-size: 13px;
-}
-.biz-badge { font-size: 14px; }
-@media (max-width: 480px) {
-  .header-icon { font-size: 28px; }
-  .header-title h1 { font-size: 18px; }
-  .header-title p { font-size: 10px; }
-}
-</style>

frontend/src/assets/styles.css

@@ -69,24 +69,6 @@ body {
 .nav-tab:hover { color: var(--sage-dark); }
 .nav-tab.active { color: var(--sage-dark); border-bottom-color: var(--sage); }
 
-.section-title-bar {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: white;
-  padding: 12px 0;
-  position: sticky;
-  top: 0;
-  z-index: 50;
-}
-.section-title-text {
-  font-size: 15px;
-  font-weight: 600;
-  color: var(--sage-dark);
-  border-bottom: 2px solid var(--sage);
-  padding-bottom: 4px;
-}
-
 /* Main content */
 .main { padding: 24px; max-width: 960px; margin: 0 auto; }
 

frontend/src/components/LoginModal.vue

@@ -51,15 +51,6 @@
         <button class="login-submit" :disabled="loading" @click="submit">
           {{ loading ? '请稍候...' : (mode === 'login' ? '登录' : '注册') }}
         </button>
-
-        <div class="login-divider"></div>
-        <button v-if="!showFeedback" class="login-feedback-btn" @click="showFeedback = true">🐛 反馈问题（无需登录）</button>
-        <div v-if="showFeedback" class="feedback-section">
-          <textarea v-model="feedbackText" class="login-input" rows="3" placeholder="描述你遇到的问题..." style="resize:vertical;"></textarea>
-          <button class="login-submit" :disabled="!feedbackText.trim() || feedbackLoading" @click="submitFeedback">
-            {{ feedbackLoading ? '提交中...' : '提交反馈' }}
-          </button>
-        </div>
       </div>
     </div>
   </div>
@@ -69,7 +60,6 @@
 import { ref } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
-import { api } from '../composables/useApi'
 
 const emit = defineEmits(['close'])
 
@@ -83,9 +73,6 @@ const confirmPassword = ref('')
 const displayName = ref('')
 const errorMsg = ref('')
 const loading = ref(false)
-const showFeedback = ref(false)
-const feedbackText = ref('')
-const feedbackLoading = ref(false)
 
 async function submit() {
   errorMsg.value = ''
@@ -128,26 +115,6 @@ async function submit() {
     loading.value = false
   }
 }
-
-async function submitFeedback() {
-  if (!feedbackText.value.trim()) return
-  feedbackLoading.value = true
-  try {
-    const res = await api('/api/bug-report', {
-      method: 'POST',
-      body: JSON.stringify({ content: feedbackText.value.trim(), priority: 0 }),
-    })
-    if (res.ok) {
-      feedbackText.value = ''
-      showFeedback.value = false
-      ui.showToast('反馈已提交，感谢！')
-    }
-  } catch {
-    ui.showToast('提交失败')
-  } finally {
-    feedbackLoading.value = false
-  }
-}
 </script>
 
 <style scoped>
@@ -242,31 +209,4 @@ async function submitFeedback() {
   opacity: 0.6;
   cursor: not-allowed;
 }
-
-.login-divider {
-  height: 1px;
-  background: #eee;
-  margin: 4px 0;
-}
-
-.login-feedback-btn {
-  background: none;
-  border: none;
-  color: #999;
-  font-size: 13px;
-  cursor: pointer;
-  font-family: inherit;
-  text-align: center;
-  padding: 4px 0;
-}
-
-.login-feedback-btn:hover {
-  color: #666;
-}
-
-.feedback-section {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
 </style>

frontend/src/components/RecipeDetailOverlay.vue

@@ -9,7 +9,7 @@
             <button class="action-btn action-btn-fav action-btn-sm" @click="handleToggleFavorite">
               {{ isFav ? '★ 已收藏' : '☆ 收藏' }}
             </button>
-            <button v-if="!props.isDiary" class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
+            <button v-if="!recipe._diary_id" class="action-btn action-btn-diary action-btn-sm" @click="saveToDiary">
               📔 存为我的
             </button>
           </div>
@@ -36,8 +36,8 @@
           >English</button>
         </div>
 
-        <!-- Volume selector (only in editor mode) -->
+        <!-- Volume selector -->
-        <div v-if="viewMode === 'editor'" class="card-volume-toggle">
+        <div class="card-volume-toggle">
           <button
             v-for="(drops, ml) in VOLUME_DROPS"
             :key="ml"
@@ -49,44 +49,77 @@
 
         <!-- Card image (rendered by html2canvas) -->
         <div v-show="!cardImageUrl" ref="cardRef" class="export-card">
-          <!-- Background image overlay -->
+          <!-- Brand overlay layers -->
-          <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>
+          <div
-          <!-- QR: top-right -->
+            v-if="brand.brand_bg"
-          <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">
+            class="card-brand-bg"
-            <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)" />
+            :style="{ backgroundImage: `url('${brand.brand_bg}')` }"
-            <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 v-if="brand.qr_code" class="card-qr-wrapper">
+            <img
+              :src="brand.qr_code"
+              class="card-qr"
+              crossorigin="anonymous"
+            />
+            <div v-if="brand.brand_name" class="card-qr-name">{{ brand.brand_name }}</div>
           </div>
-          <!-- Card content -->
+          <img
-          <div style="position:relative;z-index:2">
+            v-if="brand.brand_logo"
-            <div class="ec-subtitle">
+            :src="brand.brand_logo"
+            class="card-logo"
+            crossorigin="anonymous"
+          />
+
+          <div class="card-content">
+            <div class="card-brand-text">
               {{ cardLang === 'en' ? 'doTERRA · Gifts of the Earth' : 'doTERRA · 来自大地的礼物' }}
             </div>
-            <div class="ec-title">{{ getCardRecipeName() }}</div>
+            <div class="card-title">
-            <div style="width:80px;height:2px;background:linear-gradient(90deg,var(--sage),var(--gold));border-radius:2px;margin:14px 0"></div>
+              {{ getCardRecipeName() }}
+            </div>
+            <div class="card-divider"></div>
 
-            <ul style="list-style:none;margin-bottom:20px;padding:0">
+            <!-- Ingredients (excluding coconut oil) -->
-              <li v-for="(ing, i) in cardIngredients" :key="i" class="ec-ing">
+            <ul class="card-ingredients">
-                <span class="ec-oil-name">{{ getCardOilName(ing.oil) }}</span>
+              <li v-for="(ing, i) in cardIngredients" :key="i">
-                <span class="ec-drops">{{ ing.drops }} {{ cardLang === 'en' ? 'drops' : '滴' }}</span>
+                <span class="card-oil-name">
-                <span class="ec-cost">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * ing.drops) }}</span>
+                  {{ getCardOilName(ing.oil) }}
-                <span v-if="hasRetailForOil(ing.oil) && retailPerDrop(ing.oil) > oilsStore.pricePerDrop(ing.oil)" class="ec-retail">{{ oilsStore.fmtPrice(retailPerDrop(ing.oil) * ing.drops) }}</span>
+                </span>
+                <span class="card-oil-drops">
+                  {{ ing.drops }} {{ cardLang === 'en' ? 'drops' : '滴' }}
+                </span>
+                <span class="card-oil-cost">
+                  {{ oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * ing.drops) }}
+                </span>
+                <span
+                  v-if="hasRetailForOil(ing.oil) && retailPerDrop(ing.oil) > oilsStore.pricePerDrop(ing.oil)"
+                  class="card-retail-strike"
+                >{{ oilsStore.fmtPrice(retailPerDrop(ing.oil) * ing.drops) }}</span>
               </li>
             </ul>
 
-            <div v-if="dilutionDesc" style="padding:10px 14px;background:rgba(180,150,100,0.08);border-radius:10px;font-size:12px;color:var(--text-mid);margin-bottom:12px">{{ dilutionDesc }}</div>
+            <!-- Dilution description -->
+            <div v-if="dilutionDesc" class="card-dilution">{{ dilutionDesc }}</div>
 
-            <div v-if="displayRecipe.note" style="font-size:12px;color:var(--brown-light);margin-bottom:12px;font-style:italic">📝 {{ displayRecipe.note }}</div>
+            <!-- Note -->
-
+            <div v-if="displayRecipe.note" class="card-note">
-            <div class="ec-total-bar">
+              {{ '📝 ' + displayRecipe.note }}
-              <span style="color:rgba(255,255,255,0.85);font-size:12px;letter-spacing:1px">{{ cardLang === 'en' ? 'Total Cost' : '配方总成本' }}</span>
-              <span style="color:white;font-size:17px;font-weight:700">{{ priceInfo.cost }}<span v-if="priceInfo.hasRetail" style="text-decoration:line-through;opacity:0.6;font-size:11px;margin-left:4px">{{ priceInfo.retail }}</span></span>
             </div>
 
-            <!-- Logo left + Date right -->
+            <!-- Total cost bar -->
-            <div class="ec-bottom">
+            <div class="card-total">
-              <img v-if="brand.brand_logo" :src="brand.brand_logo" crossorigin="anonymous" class="ec-logo" />
+              <div class="card-total-label">
-              <span v-else></span>
+                {{ cardLang === 'en' ? 'Total Cost' : '配方总成本' }}
-              <span class="ec-date">{{ cardLang === 'en' ? 'Date: ' : '制作日期：' }}{{ todayStr }}</span>
+              </div>
+              <div class="card-total-price">
+                {{ priceInfo.cost }}
+                <span v-if="priceInfo.hasRetail" class="card-total-retail">{{ priceInfo.retail }}</span>
+              </div>
+            </div>
+
+            <!-- Date -->
+            <div class="card-footer">
+              {{ cardLang === 'en' ? 'Date: ' : '制作日期：' }}{{ todayStr }}
             </div>
           </div>
         </div>
@@ -103,7 +136,7 @@
           <button
             v-if="cardLang === 'en' && authStore.canManage"
             class="action-btn"
-            @click="openTranslationEditor"
+            @click="showTranslationEditor = true"
           >✏️ 修改翻译</button>
           <button
             v-if="showBrandHint"
@@ -359,9 +392,7 @@ import { matchesPinyinInitials } from '../composables/usePinyinMatch'
 // TagPicker replaced with inline tag editing
 
 const props = defineProps({
-  recipeIndex: { type: Number, default: null },
+  recipeIndex: { type: Number, required: true },
-  recipeData: { type: Object, default: null },
-  isDiary: { type: Boolean, default: false },
 })
 
 const emit = defineEmits(['close'])
@@ -388,10 +419,9 @@ const generatingImage = ref(false)
 const previewOverride = ref(null)
 
 // ---- Source recipe ----
-const recipe = computed(() => {
+const recipe = computed(() =>
-  if (props.recipeData) return props.recipeData
+  recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
-  return recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
+)
-})
 
 // ---- Display recipe: previewOverride when in preview mode, otherwise saved recipe ----
 const displayRecipe = computed(() => {
@@ -401,6 +431,7 @@ const displayRecipe = computed(() => {
 
 const canEditThisRecipe = computed(() => {
   if (authStore.canEdit) return true
+  if (authStore.isLoggedIn && recipe.value._owner_id === authStore.user.id) return true
   return false
 })
 
@@ -486,25 +517,13 @@ async function loadBrand() {
   } catch {
     brand.value = {}
   }
-  // Prompt QR upload: logged-in users once per month, anonymous every time
+  // Show upload prompt if user hasn't set up brand assets yet
   if (showBrandHint.value) {
-    let shouldPrompt = true
+    const ok = await showConfirm(
-    if (authStore.isLoggedIn) {
+      '上传你的专属二维码，让配方卡片更专业 ✨',
-      const lastPrompt = localStorage.getItem('qr_upload_prompt_time')
+      { okText: '去上传', cancelText: '取消' }
-      const oneMonth = 30 * 24 * 60 * 60 * 1000
+    )
-      if (lastPrompt && Date.now() - Number(lastPrompt) < oneMonth) {
+    if (ok) goUploadQr()
-        shouldPrompt = false
-      } else {
-        localStorage.setItem('qr_upload_prompt_time', String(Date.now()))
-      }
-    }
-    if (shouldPrompt) {
-      const ok = await showConfirm(
-        '上传你的专属二维码，让配方卡片更专业 ✨',
-        { okText: '去上传', cancelText: '下次再说' }
-      )
-      if (ok) goUploadQr()
-    }
   }
 }
 
@@ -565,14 +584,11 @@ async function saveImage() {
     await generateCardImage()
   }
   if (!cardImageUrl.value) return
-  const filename = `${recipe.value.name || '配方'}_配方卡`
+  const link = document.createElement('a')
-  try {
+  link.download = `${recipe.value.name || '配方'}_配方卡.png`
-    const { saveImageFromUrl } = await import('../composables/useSaveImage')
+  link.href = cardImageUrl.value
-    await saveImageFromUrl(cardImageUrl.value, filename)
+  link.click()
-    ui.showToast('已保存图片')
+  ui.showToast('已保存图片')
-  } catch {
-    ui.showToast('保存失败')
-  }
 }
 
 function copyText() {
@@ -598,83 +614,28 @@ function copyText() {
   })
 }
 
-function openTranslationEditor() {
-  // Pre-populate from single source of truth: oilsMeta.enName (DB)
-  const map = {}
-  for (const ing of cardIngredients.value) {
-    map[ing.oil] = getOilEnglish(ing.oil)
-  }
-  customOilNameEn.value = map
-  customRecipeNameEn.value = recipe.value.en_name || ''
-  showTranslationEditor.value = true
-}
-
 async function applyTranslation() {
   showTranslationEditor.value = false
-  let saved = 0
+  // Persist en_name to backend
-  let failed = 0
+  if (recipe.value._id && customRecipeNameEn.value) {
-
-  // 1. Save recipe English name to recipes table
-  if (recipe.value._id && customRecipeNameEn.value.trim()) {
     try {
       await api.put(`/api/recipes/${recipe.value._id}`, {
-        en_name: customRecipeNameEn.value.trim(),
+        en_name: customRecipeNameEn.value,
+        version: recipe.value._version,
       })
-      saved++
+      ui.showToast('翻译已保存')
     } catch (e) {
-      console.error('Save recipe en_name failed:', e)
+      ui.showToast('翻译保存失败')
-      failed++
     }
   }
-
-  // 2. Save each oil's English name to oils table
-  //    This is THE single source of truth — both oil reference page and recipe card read from here
-  for (const [oilName, enName] of Object.entries(customOilNameEn.value)) {
-    if (!enName?.trim()) continue
-    const meta = oilsStore.oilsMeta[oilName]
-    if (!meta) continue
-    if (meta.enName === enName.trim()) continue // no change
-    try {
-      await oilsStore.saveOil(oilName, meta.bottlePrice, meta.dropCount, meta.retailPrice, enName.trim())
-      saved++
-    } catch (e) {
-      console.error('Save oil en_name failed:', oilName, e)
-      failed++
-    }
-  }
-
-  // 3. Reload ALL data — this updates oilsMeta.enName and recipe.en_name
-  //    So the next render reads fresh data from the single source
-  await Promise.all([
-    oilsStore.loadOils(),
-    recipesStore.loadRecipes(),
-  ])
-
-  if (saved > 0) {
-    ui.showToast(`翻译已保存（${saved}项）` + (failed > 0 ? `，${failed}项失败` : ''))
-  } else if (failed > 0) {
-    ui.showToast(`保存失败 ${failed} 项`)
-  } else {
-    ui.showToast('没有修改')
-  }
-
-  // Regenerate card image with updated names from store
   cardImageUrl.value = null
   nextTick(() => generateCardImage())
 }
 
 // Override translation getters for card rendering
-function getOilEnglish(name) {
-  return oilsStore.oilsMeta[name]?.enName || oilEn(name) || ''
-}
-
 function getCardOilName(name) {
   if (cardLang.value === 'en') {
-    // During editing, use customOilNameEn; otherwise read from store (single source of truth)
+    return customOilNameEn.value[name] || oilEn(name) || name
-    if (showTranslationEditor.value && customOilNameEn.value[name]) {
-      return customOilNameEn.value[name]
-    }
-    return getOilEnglish(name) || name
   }
   return name
 }
@@ -712,31 +673,22 @@ 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: i.oil, drops: i.drops })),
+      ingredients: recipe.value.ingredients.map(i => ({ oil_name: i.oil, drops: i.drops })),
       tags: recipe.value.tags || [],
-      source_recipe_id: recipe.value._id || null,
     }
-    await diaryStore.createDiary(payload)
+    console.log('[saveToDiary] saving recipe:', payload)
+    await recipesStore.saveRecipe(payload)
     ui.showToast('已保存！可在「配方查询 → 我的配方」查看')
   } catch (e) {
     console.error('[saveToDiary] failed:', e)
@@ -1154,106 +1106,9 @@ async function saveRecipe() {
   border-radius: 50%;
 }
 
-/* ===== Export Card Content (responsive) ===== */
+.card-content {
-.ec-subtitle {
+  position: relative;
-  font-size: 11px;
+  z-index: 2;
-  letter-spacing: 3px;
-  color: var(--sage);
-  margin-bottom: 8px;
-  white-space: nowrap;
-}
-.ec-title {
-  font-size: 26px;
-  font-weight: 700;
-  color: var(--text-dark);
-  margin-bottom: 6px;
-  line-height: 1.3;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: calc(100% - 80px); /* leave room for QR */
-}
-.ec-ing {
-  display: flex;
-  align-items: center;
-  padding: 9px 0;
-  border-bottom: 1px solid rgba(180,150,100,0.15);
-  font-size: 14px;
-}
-.ec-oil-name {
-  flex: 1;
-  color: var(--text-dark);
-  font-weight: 500;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  min-width: 0;
-}
-.ec-drops {
-  width: 50px;
-  text-align: right;
-  color: var(--sage-dark);
-  font-size: 13px;
-  white-space: nowrap;
-  flex-shrink: 0;
-}
-.ec-cost {
-  width: 60px;
-  text-align: right;
-  color: var(--text-light);
-  font-size: 12px;
-  white-space: nowrap;
-  flex-shrink: 0;
-}
-.ec-retail {
-  width: 55px;
-  text-align: right;
-  color: var(--text-light);
-  font-size: 10px;
-  text-decoration: line-through;
-  white-space: nowrap;
-  flex-shrink: 0;
-}
-.ec-total-bar {
-  background: linear-gradient(135deg, var(--sage), #5a7d5e);
-  border-radius: 12px;
-  padding: 10px 16px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  white-space: nowrap;
-}
-.ec-bottom {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 12px;
-}
-.ec-logo {
-  height: 36px;
-  object-fit: contain;
-  opacity: 1;
-}
-.ec-date {
-  font-size: 11px;
-  color: var(--text-light);
-  letter-spacing: 1px;
-}
-
-/* Mobile: smaller card text */
-@media (max-width: 420px) {
-  .export-card { padding: 24px; }
-  .ec-subtitle { font-size: 9px; letter-spacing: 2px; }
-  .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; }
-  .ec-retail { width: 45px; font-size: 9px; }
-  .ec-total-bar { padding: 10px 14px; }
-  .ec-total-bar span:first-child { font-size: 11px; }
-  .ec-total-bar span:last-child { font-size: 16px; }
-  .ec-date { font-size: 9px; }
-  .ec-logo { height: 28px; }
 }
 
 /* Brand overlays */
@@ -1273,12 +1128,12 @@ async function saveRecipe() {
 .card-qr-wrapper {
   position: absolute;
   top: 36px;
-  right: 36px;
+  right: 24px;
   display: flex;
   flex-direction: column;
   align-items: center;
   gap: 3px;
-  z-index: 3;
+  z-index: 2;
 }
 
 .card-qr {
@@ -1299,20 +1154,15 @@ async function saveRecipe() {
 }
 
 .card-logo {
-  height: 28px;
+  position: absolute;
+  bottom: 60px;
+  left: 50%;
+  transform: translateX(-50%);
+  height: 60px;
   object-fit: contain;
-  opacity: 0.6;
+  z-index: 1;
-}
+  opacity: 0.2;
-.card-logo-placeholder {
+  pointer-events: none;
-  /* keeps footer right-aligned even without logo */
-}
-.card-bottom-row {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-end;
-  margin-top: 16px;
-  margin-right: -80px; /* counteract card-content padding-right to span full width */
-  padding-right: 0;
 }
 
 .card-brand-text {
@@ -1411,7 +1261,6 @@ async function saveRecipe() {
   justify-content: space-between;
   align-items: center;
   margin-top: 8px;
-  margin-right: -80px; /* counteract card-content padding-right */
 }
 
 .card-total-label {
@@ -1436,7 +1285,8 @@ async function saveRecipe() {
 }
 
 .card-footer {
-  text-align: right;
+  margin-top: 16px;
+  text-align: center;
   font-size: 11px;
   color: var(--text-light, #9a8570);
   letter-spacing: 1px;

frontend/src/components/UserMenu.vue

@@ -30,14 +30,7 @@
                class="notif-item" :class="{ unread: !n.is_read }">
             <div class="notif-item-header">
               <div class="notif-title">{{ n.title }}</div>
-              <div v-if="!n.is_read" class="notif-actions">
+              <button v-if="!n.is_read" class="notif-mark-one" @click="markOneRead(n)">已读</button>
-                <!-- 搜索未收录通知：已添加按钮 -->
-                <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>
@@ -115,29 +108,6 @@ 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: '{}' })
@@ -163,11 +133,7 @@ function handleLogout() {
   auth.logout()
   ui.showToast('已退出登录')
   emit('close')
-  if (router.currentRoute.value.meta.requiresAuth) {
+  router.push('/')
-    router.push('/')
-  } else {
-    window.location.reload()
-  }
 }
 
 onMounted(loadNotifications)
@@ -239,16 +205,6 @@ 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; }

frontend/src/composables/useOilTranslation.js

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

frontend/src/composables/useSaveImage.js

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

frontend/src/router/index.js

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

frontend/src/stores/auth.js

@@ -28,6 +28,16 @@ export const useAuthStore = defineStore('auth', () => {
 
   // Actions
   async function initToken() {
+    const params = new URLSearchParams(window.location.search)
+    const urlToken = params.get('token')
+    if (urlToken) {
+      token.value = urlToken
+      localStorage.setItem('oil_auth_token', urlToken)
+      // Clean URL
+      const url = new URL(window.location)
+      url.searchParams.delete('token')
+      window.history.replaceState({}, '', url)
+    }
     if (token.value) {
       await loadMe()
     }
@@ -75,7 +85,7 @@ export const useAuthStore = defineStore('auth', () => {
 
   function canEditRecipe(recipe) {
     if (isAdmin.value || user.value.role === 'senior_editor') return true
-    if (canEdit.value && recipe._owner_id === user.value.id) return true
+    if (recipe._owner_id === user.value.id) return true
     return false
   }
 

frontend/src/stores/oils.js

@@ -68,7 +68,7 @@ export const useOilsStore = defineStore('oils', () => {
         bottlePrice: oil.bottle_price,
         dropCount: oil.drop_count,
         retailPrice: oil.retail_price ?? null,
-        isActive: oil.is_active !== 0,
+        isActive: oil.is_active ?? true,
         enName: oil.en_name ?? null,
       }
     }

frontend/src/views/MyDiary.vue

@@ -2,8 +2,8 @@
   <div class="my-diary">
     <!-- Sub Tabs -->
     <div class="sub-tabs">
-      <button class="sub-tab" :class="{ active: activeTab === 'brand' }" @click="activeTab = 'brand'">🏷 我的品牌</button>
+      <button class="sub-tab" :class="{ active: activeTab === 'brand' }" @click="activeTab = 'brand'">🏷️ Brand</button>
-      <button class="sub-tab" :class="{ active: activeTab === 'account' }" @click="activeTab = 'account'">👤 我的账户</button>
+      <button class="sub-tab" :class="{ active: activeTab === 'account' }" @click="activeTab = 'account'">👤 Account</button>
     </div>
 
     <!-- Diary Tab -->
@@ -113,94 +113,50 @@
         <button class="btn-return" @click="goBackToRecipe">← 返回配方卡片</button>
       </div>
       <div class="section-card">
-        <p style="font-size:13px;color:var(--text-light);margin-bottom:16px">分享配方卡片时，二维码、背景图、Logo 会自动展示在卡片上</p>
+        <h4>🏷️ 品牌设置</h4>
 
-        <!-- Three upload areas side by side -->
-        <div style="display:flex;gap:20px;flex-wrap:wrap;margin-bottom:16px">
-          <!-- QR Code -->
-          <div>
-            <label class="form-label">📱 二维码</label>
-            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">卡片右上角展示</p>
-            <div class="upload-box" @click="triggerUpload('qr')">
-              <img v-if="brandQrImage" :src="brandQrImage" class="upload-box-img" />
-              <span v-else class="upload-box-hint">点击上传</span>
-            </div>
-            <input ref="qrInput" type="file" accept="image/*" style="display:none" @change="handleUpload('qr', $event)" />
-            <button v-if="brandQrImage" class="btn-clear" @click="clearBrandImage('qr')">清除</button>
-          </div>
-
-          <!-- Background -->
-          <div>
-            <label class="form-label">🖼 背景图</label>
-            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">铺满整张卡片，半透明</p>
-            <div class="upload-box" @click="triggerUpload('bg')">
-              <img v-if="brandBg" :src="brandBg" class="upload-box-img" />
-              <span v-else class="upload-box-hint">点击上传</span>
-            </div>
-            <input ref="bgInput" type="file" accept="image/*" style="display:none" @change="handleUpload('bg', $event)" />
-            <button v-if="brandBg" class="btn-clear" @click="clearBrandImage('bg')">清除</button>
-          </div>
-
-          <!-- Logo -->
-          <div>
-            <label class="form-label">🏷 Logo</label>
-            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">卡片左下角水印</p>
-            <div class="upload-box" @click="triggerUpload('logo')">
-              <img v-if="brandLogo" :src="brandLogo" class="upload-box-img" />
-              <span v-else class="upload-box-hint">点击上传</span>
-            </div>
-            <input ref="logoInput" type="file" accept="image/*" style="display:none" @change="handleUpload('logo', $event)" />
-            <button v-if="brandLogo" class="btn-clear" @click="clearBrandImage('logo')">清除</button>
-          </div>
-        </div>
-
-        <!-- Brand name -->
         <div class="form-group">
-          <label class="form-label">品牌名称或标语（显示在二维码下方）</label>
+          <label>品牌名称</label>
-          <textarea v-model="brandName" class="form-control" rows="2" placeholder="扫码申请成为优惠顾客&#10;我的精油小屋" style="max-width:350px;font-size:13px" @blur="saveBrandSettings"></textarea>
+          <input v-model="brandName" class="form-input" placeholder="您的品牌名称" @blur="saveBrandSettings" />
-          <div style="display:flex;gap:6px;margin-top:6px">
+        </div>
-            <button class="btn-align" :class="{ active: brandAlign === 'left' }" @click="brandAlign='left'; saveBrandSettings()">靠左</button>
+
-            <button class="btn-align" :class="{ active: brandAlign === 'center' }" @click="brandAlign='center'; saveBrandSettings()">居中</button>
+        <div class="form-group">
-            <button class="btn-align" :class="{ active: brandAlign === 'right' }" @click="brandAlign='right'; saveBrandSettings()">靠右</button>
+          <label>二维码链接</label>
+          <input v-model="brandQrUrl" class="form-input" placeholder="https://..." @blur="saveBrandSettings" />
+          <div v-if="brandQrUrl" class="qr-preview">
+            <img :src="'https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=' + encodeURIComponent(brandQrUrl)" alt="QR" class="qr-img" />
           </div>
         </div>
 
-        <!-- Card Preview -->
+        <div class="form-group">
-        <div style="margin-bottom:16px">
+          <label>我的二维码图片</label>
-          <label class="form-label">📋 配方卡片预览</label>
+          <div class="upload-area" @click="triggerUpload('qr')">
-          <div class="card-preview-mini">
+            <img v-if="brandQrImage" :src="brandQrImage" class="upload-preview qr-upload-preview" />
-            <!-- Background overlay -->
+            <span v-else class="upload-hint">📲 点击上传二维码图片</span>
-            <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;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>
-            <!-- Content -->
-            <div style="position:relative;z-index:1">
-              <div style="font-size:7px;letter-spacing:1.5px;color:var(--sage);margin-bottom:3px">doTERRA · 来自大地的礼物</div>
-              <div style="font-size:13px;font-weight:700;color:var(--text-dark);margin-bottom:3px;line-height:1.3">配方名称</div>
-              <div style="width:30px;height:1px;background:linear-gradient(90deg,var(--sage),var(--gold));margin:6px 0"></div>
-              <div style="font-size:9px;color:var(--text-light);margin-bottom:6px">薰衣草 · 乳香 · 茶树</div>
-              <!-- Total cost bar -->
-              <div style="background:linear-gradient(135deg,var(--sage),#5a7d5e);border-radius:6px;padding:6px 10px;display:flex;justify-content:space-between;align-items:center">
-                <span style="color:rgba(255,255,255,0.85);font-size:8px;letter-spacing:0.5px">配方总成本</span>
-                <span style="color:white;font-size:12px;font-weight:700">¥12.50</span>
-              </div>
-              <!-- Logo left + Date right -->
-              <div style="display:flex;justify-content:space-between;align-items:flex-end;margin-top:8px">
-                <img v-if="brandLogo" :src="brandLogo" style="height:18px;object-fit:contain" />
-                <span v-else></span>
-                <span style="font-size:7px;color:var(--text-light);letter-spacing:0.5px">制作日期：{{ new Date().toLocaleDateString('zh-CN') }}</span>
-              </div>
-            </div>
           </div>
+          <input ref="qrInput" type="file" accept="image/*" style="display:none" @change="handleUpload('qr', $event)" />
+          <button v-if="brandQrImage" class="btn-outline btn-sm btn-clear-img" @click="clearBrandImage('qr')">清除二维码</button>
+          <div class="field-hint">上传后将显示在配方卡片右下角</div>
         </div>
 
-        <div style="display:flex;gap:8px;align-items:center">
+        <div class="form-group">
-          <button class="btn btn-primary" @click="saveBrandSettings">💾 保存品牌设置</button>
+          <label>品牌Logo</label>
-          <button v-if="returnRecipeId" class="btn btn-outline" @click="goBackToRecipe">← 返回配方卡片</button>
+          <div class="upload-area" @click="triggerUpload('logo')">
+            <img v-if="brandLogo" :src="brandLogo" class="upload-preview" />
+            <span v-else class="upload-hint">点击上传Logo</span>
+          </div>
+          <input ref="logoInput" type="file" accept="image/*" style="display:none" @change="handleUpload('logo', $event)" />
+          <button v-if="brandLogo" class="btn-outline btn-sm btn-clear-img" @click="clearBrandImage('logo')">清除Logo</button>
+        </div>
+
+        <div class="form-group">
+          <label>卡片背景</label>
+          <div class="upload-area" @click="triggerUpload('bg')">
+            <img v-if="brandBg" :src="brandBg" class="upload-preview wide" />
+            <span v-else class="upload-hint">点击上传背景图</span>
+          </div>
+          <input ref="bgInput" type="file" accept="image/*" style="display:none" @change="handleUpload('bg', $event)" />
+          <button v-if="brandBg" class="btn-outline btn-sm btn-clear-img" @click="clearBrandImage('bg')">清除背景</button>
         </div>
       </div>
     </div>
@@ -288,7 +244,6 @@ const brandQrUrl = ref('')
 const brandQrImage = ref('')
 const brandLogo = ref('')
 const brandBg = ref('')
-const brandAlign = ref('center')
 const logoInput = ref(null)
 const bgInput = ref(null)
 const qrInput = ref(null)
@@ -410,7 +365,6 @@ async function loadBrandSettings() {
       brandQrImage.value = data.qr_code || ''
       brandLogo.value = data.brand_logo || ''
       brandBg.value = data.brand_bg || ''
-      brandAlign.value = data.brand_align || 'center'
     }
   } catch {
     // no brand settings yet
@@ -419,16 +373,15 @@ async function loadBrandSettings() {
 
 async function saveBrandSettings() {
   try {
-    const res = await api('/api/brand', {
+    await api('/api/brand', {
       method: 'PUT',
       body: JSON.stringify({
         brand_name: brandName.value,
-        brand_align: brandAlign.value,
+        qr_url: brandQrUrl.value,
       }),
     })
-    if (res.ok) ui.showToast('已保存')
   } catch {
-    ui.showToast('保存失败')
+    // silent
   }
 }
 
@@ -447,96 +400,14 @@ function readFileAsBase64(file) {
   })
 }
 
-// Compress image if too large (keeps PNG for small images, JPEG for large)
-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
-      const maxDim = 600
-      if (w > maxDim || h > maxDim) {
-        const ratio = Math.min(maxDim / w, maxDim / h)
-        w = Math.round(w * ratio)
-        h = Math.round(h * ratio)
-      }
-      canvas.width = w
-      canvas.height = h
-      canvas.getContext('2d').drawImage(img, 0, 0, w, h)
-      // Try PNG first, then JPEG with decreasing quality
-      let result = canvas.toDataURL('image/png')
-      if (result.length > maxSize) {
-        let quality = 0.85
-        while (quality > 0.2) {
-          result = canvas.toDataURL('image/jpeg', quality)
-          if (result.length <= maxSize) break
-          quality -= 0.1
-        }
-      }
-      resolve(result)
-    }
-    img.onerror = () => resolve(base64) // fallback: return original
-    img.src = base64
-  })
-}
-
-// Crop image to square from center
-function cropToSquare(base64) {
-  return new Promise((resolve) => {
-    const img = new Image()
-    img.onload = () => {
-      const size = Math.min(img.width, img.height)
-      const x = (img.width - size) / 2
-      const y = (img.height - size) / 2
-      const canvas = document.createElement('canvas')
-      canvas.width = size
-      canvas.height = size
-      canvas.getContext('2d').drawImage(img, x, y, size, size, 0, 0, size, size)
-      resolve(canvas.toDataURL('image/png'))
-    }
-    img.onerror = () => resolve(base64)
-    img.src = base64
-  })
-}
-
-// Check if image is roughly square
-function checkSquare(base64) {
-  return new Promise((resolve) => {
-    const img = new Image()
-    img.onload = () => {
-      const ratio = img.width / img.height
-      resolve(ratio > 0.85 && ratio < 1.15) // within 15% of square
-    }
-    img.onerror = () => resolve(true)
-    img.src = base64
-  })
-}
-
 async function handleUpload(type, event) {
   const file = event.target.files[0]
   if (!file) return
   try {
-    let base64 = await readFileAsBase64(file)
+    const base64 = await readFileAsBase64(file)
-
-    // QR: check if square, offer to crop
-    if (type === 'qr') {
-      const isSquare = await checkSquare(base64)
-      if (!isSquare) {
-        const { showConfirm: confirm } = await import('../composables/useDialog')
-        const ok = await confirm('二维码图片不是正方形，是否自动裁剪为正方形？\n（取中心区域）')
-        if (ok) {
-          base64 = await cropToSquare(base64)
-        }
-      }
-    }
-
-    const maxSize = type === 'bg' ? 1000000 : 500000
-    base64 = await compressImage(base64, maxSize)
     const fieldMap = { logo: 'brand_logo', bg: 'brand_bg', qr: 'qr_code' }
     const field = fieldMap[type]
     if (!field) return
-    ui.showToast('正在上传...')
     const res = await api('/api/brand', {
       method: 'PUT',
       body: JSON.stringify({ [field]: base64 }),
@@ -545,30 +416,28 @@ async function handleUpload(type, event) {
       if (type === 'logo') brandLogo.value = base64
       else if (type === 'bg') brandBg.value = base64
       else if (type === 'qr') brandQrImage.value = base64
-      ui.showToast('上传成功 ✓')
+      ui.showToast('上传成功')
-    } else {
-      const err = await res.json().catch(() => ({}))
-      ui.showToast('上传失败: ' + (err.detail || res.status))
     }
-  } catch (e) {
+  } catch {
-    ui.showToast('上传出错: ' + (e.message || '网络错误'))
+    ui.showToast('上传失败')
   }
-  // Reset input so same file can be re-selected
-  event.target.value = ''
 }
 
 async function clearBrandImage(type) {
   const fieldMap = { logo: 'brand_logo', bg: 'brand_bg', qr: 'qr_code' }
   const field = fieldMap[type]
+  if (!field) return
   try {
-    await api('/api/brand', {
+    const res = await api('/api/brand', {
       method: 'PUT',
-      body: JSON.stringify({ [field]: null }),
+      body: JSON.stringify({ [field]: '' }),
     })
-    if (type === 'logo') brandLogo.value = ''
+    if (res.ok) {
-    else if (type === 'bg') brandBg.value = ''
+      if (type === 'logo') brandLogo.value = ''
-    else if (type === 'qr') brandQrImage.value = ''
+      else if (type === 'bg') brandBg.value = ''
-    ui.showToast('已清除')
+      else if (type === 'qr') brandQrImage.value = ''
+      ui.showToast('已清除')
+    }
   } catch {
     ui.showToast('清除失败')
   }
@@ -1007,59 +876,10 @@ async function applyBusiness() {
   color: #b0aab5;
 }
 
-/* Upload box (matching initial commit style) */
+.btn-clear-img {
-.upload-box {
-  width: 100px;
-  height: 100px;
-  border: 2px dashed var(--border, #e0d4c0);
-  border-radius: 12px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  overflow: hidden;
-  background: white;
-  transition: border-color 0.15s;
-}
-.upload-box:hover { border-color: var(--sage, #7a9e7e); }
-.upload-box-img { width: 100%; height: 100%; object-fit: contain; }
-.upload-box-hint { font-size: 12px; color: var(--text-light, #9a8570); }
-.btn-clear {
   margin-top: 6px;
-  font-size: 11px;
+  color: #d9534f;
-  background: none;
+  border-color: #d9534f;
-  border: 1px solid var(--border);
-  border-radius: 6px;
-  padding: 2px 8px;
-  cursor: pointer;
-  color: var(--text-light);
-}
-.btn-clear:hover { border-color: #c0392b; color: #c0392b; }
-.btn-align {
-  font-size: 11px;
-  padding: 3px 10px;
-  border: 1.5px solid var(--border);
-  border-radius: 6px;
-  background: white;
-  cursor: pointer;
-  color: var(--text-mid);
-}
-.btn-align.active {
-  background: var(--sage-mist);
-  border-color: var(--sage);
-  color: var(--sage-dark);
-}
-
-/* Card preview mini */
-.card-preview-mini {
-  position: relative;
-  width: 280px;
-  background: linear-gradient(145deg, #faf7f0, #f5ede0);
-  border-radius: 14px;
-  border: 1px solid #e0ccaa;
-  overflow: hidden;
-  font-family: 'Noto Serif SC', serif;
-  padding: 18px;
 }
 
 .hint-text {

frontend/src/views/OilReference.vue

@@ -2,25 +2,21 @@
   <div class="oil-reference">
     <!-- Knowledge Cards at Top -->
     <div style="display:flex;gap:10px;margin-bottom:16px;flex-wrap:wrap">
-      <div @click="showDilution = true" style="flex:1;min-width:140px;background:linear-gradient(135deg,#e8f5e9,#c8e6c9);border-radius:12px;padding:12px 16px;cursor:pointer;transition:transform 0.2s;display:flex;align-items:center;gap:10px" @mouseover="$event.currentTarget.style.transform='translateY(-2px)'" @mouseout="$event.currentTarget.style.transform=''">
+      <div @click="showDilution = true" style="flex:1;min-width:140px;background:linear-gradient(135deg,#e8f5e9,#c8e6c9);border-radius:14px;padding:16px;cursor:pointer;transition:transform 0.2s" @mouseover="$event.target.style.transform='translateY(-2px)'" @mouseout="$event.target.style.transform=''">
-        <span style="font-size:22px">💧</span>
+        <div style="font-size:24px;margin-bottom:6px">💧</div>
-        <div>
+        <div style="font-size:14px;font-weight:600;color:#2e7d32">稀释比例</div>
-          <div style="font-size:14px;font-weight:600;color:#2e7d32">稀释比例</div>
+        <div style="font-size:11px;color:#558b2f;margin-top:4px">不同年龄段的稀释指南</div>
-          <div style="font-size:10px;color:#558b2f;margin-top:2px;white-space:nowrap">不同年龄段的稀释指南</div>
-        </div>
       </div>
-      <div @click="showContra = true" style="flex:1;min-width:140px;background:linear-gradient(135deg,#fff8e1,#ffecb3);border-radius:12px;padding:12px 16px;cursor:pointer;transition:transform 0.2s;display:flex;align-items:center;gap:10px" @mouseover="$event.currentTarget.style.transform='translateY(-2px)'" @mouseout="$event.currentTarget.style.transform=''">
+      <div @click="showContra = true" style="flex:1;min-width:140px;background:linear-gradient(135deg,#fff8e1,#ffecb3);border-radius:14px;padding:16px;cursor:pointer;transition:transform 0.2s" @mouseover="$event.target.style.transform='translateY(-2px)'" @mouseout="$event.target.style.transform=''">
-        <span style="font-size:22px">⚠️</span>
+        <div style="font-size:24px;margin-bottom:6px">⚠️</div>
-        <div>
+        <div style="font-size:14px;font-weight:600;color:#f57f17">使用禁忌</div>
-          <div style="font-size:14px;font-weight:600;color:#f57f17">使用禁忌</div>
+        <div style="font-size:11px;color:#ff8f00;margin-top:4px">安全使用精油的注意事项</div>
-          <div style="font-size:10px;color:#ff8f00;margin-top:2px;white-space:nowrap">安全使用精油的注意事项</div>
-        </div>
       </div>
     </div>
 
     <!-- Dilution Ratio Modal -->
     <div v-if="showDilution" class="modal-overlay" @click.self="showDilution = false">
-      <div ref="dilutionCardRef" style="position:relative;z-index:1;background:white;border-radius:20px;max-width:420px;width:100%;max-height:88vh;overflow-y:auto;box-shadow:0 16px 56px rgba(0,0,0,0.25)" @click.stop>
+      <div style="position:relative;z-index:1;background:white;border-radius:20px;max-width:420px;width:100%;max-height:88vh;overflow-y:auto;box-shadow:0 16px 56px rgba(0,0,0,0.25)" @click.stop>
         <div style="background:linear-gradient(135deg,#2e7d32,#66bb6a);border-radius:20px 20px 0 0;padding:28px 24px;color:white;text-align:center;position:relative">
           <button @click="showDilution = false" style="position:absolute;top:12px;right:16px;background:rgba(255,255,255,0.2);border:none;color:white;width:30px;height:30px;border-radius:50%;cursor:pointer;font-size:16px">×</button>
           <div style="font-size:48px;margin-bottom:8px">💧</div>
@@ -49,7 +45,7 @@
 
     <!-- Safety Cautions Modal -->
     <div v-if="showContra" class="modal-overlay" @click.self="showContra = false">
-      <div ref="contraCardRef" style="position:relative;z-index:1;background:white;border-radius:20px;max-width:420px;width:100%;max-height:88vh;overflow-y:auto;box-shadow:0 16px 56px rgba(0,0,0,0.25)" @click.stop>
+      <div style="position:relative;z-index:1;background:white;border-radius:20px;max-width:420px;width:100%;max-height:88vh;overflow-y:auto;box-shadow:0 16px 56px rgba(0,0,0,0.25)" @click.stop>
         <div style="background:linear-gradient(135deg,#e65100,#ff9800);border-radius:20px 20px 0 0;padding:28px 24px;color:white;text-align:center;position:relative">
           <button @click="showContra = false" style="position:absolute;top:12px;right:16px;background:rgba(255,255,255,0.2);border:none;color:white;width:30px;height:30px;border-radius:50%;cursor:pointer;font-size:16px">×</button>
           <div style="font-size:48px;margin-bottom:8px">⚠️</div>
@@ -89,20 +85,16 @@
     </div>
 
     <!-- Search + View Toggle + Add + PDF -->
-    <div style="display:flex;gap:6px;align-items:center;margin-bottom:12px;flex-wrap:nowrap">
+    <div style="display:flex;gap:8px;align-items:center;margin-bottom:12px;flex-wrap:wrap">
-      <div class="search-box" style="flex:1;min-width:140px;margin-bottom:0">
+      <div class="search-box" style="flex:1;min-width:180px;margin-bottom:0">
         <input class="search-input" v-model="searchQuery" placeholder="搜索精油名称…" style="width:100%" />
       </div>
       <div style="display:flex;border:1.5px solid var(--border);border-radius:10px;overflow:hidden;flex-shrink:0">
         <button @click="viewMode = 'bottle'" :style="viewMode === 'bottle' ? '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>
         <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.canEdit" class="btn btn-primary btn-sm" @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="btn btn-gold btn-sm" @click="exportPDF" style="font-size:12px">📥 导出PDF</button>
-      <button v-if="auth.isAdmin" class="toolbar-btn-text" @click="exportPDF">📥 导出PDF</button>
-      <!-- Mobile: emoji-only buttons -->
-      <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) -->
@@ -132,22 +124,29 @@
         v-for="name in filteredOilNames"
         :key="name + '-' + cardVersion"
         class="oil-chip"
-        :class="{ 'oil-chip--inactive': getMeta(name)?.isActive === false, 'oil-chip--incomplete': auth.isAdmin && isIncomplete(name) }"
         :style="chipStyle(name)"
         @click="openOilDetail(name)"
       >
         <div style="flex:1;min-width:0">
-          <div class="oil-name-line">{{ name }}</div>
+          <span class="oil-chip-name">{{ name }}
-          <div class="oil-en-line">{{ getEnglishName(name) }}</div>
+            <span v-if="getOilCard(name)" style="font-size:9px;color:var(--sage);background:var(--sage-mist);padding:1px 5px;border-radius:6px;vertical-align:middle">📖</span>
+          </span>
+          <br>
+          <span style="font-size:10px;color:var(--text-light);font-weight:400">{{ getEnglishName(name) }}</span>
         </div>
         <div style="text-align:right;flex-shrink:0">
           <template v-if="viewMode === 'bottle'">
-            <div class="oil-price-line">¥{{ (getMeta(name)?.bottlePrice || 0).toFixed(0) }}<span class="oil-price-unit">/瓶</span></div>
+            <div style="font-size:13px;color:var(--sage-dark);font-weight:600">
-            <div v-if="getMeta(name)?.retailPrice" class="oil-retail-line">¥{{ getMeta(name).retailPrice }}/瓶</div>
+              ¥{{ (getMeta(name)?.bottlePrice || 0).toFixed(0) }}<span style="font-size:10px;font-weight:400;color:var(--text-light)">/瓶</span>
+              <span v-if="getMeta(name)?.dropCount" style="font-size:10px;font-weight:400;color:var(--text-light)"> {{ volumeLabel(getMeta(name).dropCount) }}</span>
+            </div>
+            <div v-if="getMeta(name)?.retailPrice" style="font-size:11px;color:var(--text-light);text-decoration:line-through">¥{{ getMeta(name).retailPrice }}</div>
           </template>
           <template v-else>
-            <div class="oil-price-line">¥{{ oils.pricePerDrop(name).toFixed(2) }}<span class="oil-price-unit">{{ name === '植物空胶囊' ? '/颗' : '/滴' }}</span></div>
+            <div style="font-size:13px;color:var(--sage-dark);font-weight:600">
-            <div v-if="getMeta(name)?.retailPrice && getMeta(name)?.dropCount" class="oil-retail-line">
+              ¥{{ oils.pricePerDrop(name).toFixed(2) }}{{ name === '植物空胶囊' ? '/颗' : '/滴' }}
+            </div>
+            <div v-if="getMeta(name)?.retailPrice && getMeta(name)?.dropCount" style="font-size:11px;color:var(--text-light);text-decoration:line-through">
               ¥{{ (getMeta(name).retailPrice / getMeta(name).dropCount).toFixed(2) }}{{ name === '植物空胶囊' ? '/颗' : '/滴' }}
             </div>
           </template>
@@ -260,14 +259,11 @@
     </div>
 
     <!-- Edit Oil Overlay -->
-    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="saveEditOil">
+    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null">
-      <div class="modal-panel">
+      <div class="modal-panel" style="max-width:400px">
         <div class="modal-header">
           <h3>{{ editingOilName }}</h3>
-          <div style="display:flex;gap:8px;align-items:center">
+          <button class="btn-close" @click="editingOilName = null">✕</button>
-            <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">
@@ -335,17 +331,9 @@
             </div>
           </div>
 
-          <div style="display:flex;gap:10px;justify-content:space-between;margin-top:16px">
+          <div style="display:flex;gap:10px;justify-content:flex-end;margin-top:16px">
-            <button
+            <button class="btn-outline" @click="editingOilName = null">取消</button>
-              :style="getMeta(editingOilName)?.isActive === false
+            <button class="btn-primary" @click="saveEditOil">保存</button>
-                ? 'padding:8px 14px;border-radius:8px;font-size:13px;cursor:pointer;font-family:inherit;border:1.5px solid #ccc;background:#f0f0f0;color:#999'
-                : 'padding:8px 14px;border-radius:8px;font-size:13px;cursor:pointer;font-family:inherit;border:1.5px solid #e8b4b0;background:transparent;color:#c0392b'"
-              @click="toggleOilActive"
-            >{{ getMeta(editingOilName)?.isActive === false ? '✓ 已下架 · 点击重新上架' : '下架' }}</button>
-            <div style="display:flex;gap:10px">
-              <button class="btn-outline" @click="editingOilName = null">取消</button>
-              <button class="btn-primary" @click="saveEditOil">保存</button>
-            </div>
           </div>
         </div>
       </div>
@@ -354,8 +342,7 @@
 </template>
 
 <script setup>
-import { ref, computed, watch, nextTick } from 'vue'
+import { ref, computed, watch } from 'vue'
-import html2canvas from 'html2canvas'
 import { useOilsStore, VOLUME_DROPS, DROPS_PER_ML } from '../stores/oils'
 import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
@@ -373,8 +360,6 @@ const ui = useUiStore()
 const showDilution = ref(false)
 const showContra = ref(false)
 const showAddForm = ref(false)
-const dilutionCardRef = ref(null)
-const contraCardRef = ref(null)
 
 // Search & view
 const searchQuery = ref('')
@@ -478,20 +463,14 @@ function volumeLabel(dropCount, name) {
 }
 
 function chipStyle(name) {
+  const meta = getMeta(name)
+  const isActive = meta?.isActive !== false
   const hasCard = !!getOilCard(name)
+  if (!isActive) return 'opacity:0.7;background:#f5f5f5'
   if (hasCard) return 'cursor:pointer;border-left:3px solid var(--sage);background:linear-gradient(90deg,var(--sage-mist),white)'
   return ''
 }
 
-function isIncomplete(name) {
-  const meta = getMeta(name)
-  if (!meta) return true
-  if (meta.isActive === false) return false // 下架的不算不全
-  // Incomplete: missing English name, retail price, or bottle price
-  const hasEn = meta.enName || getEnglishName(name)
-  return !meta.bottlePrice || !meta.retailPrice || !hasEn
-}
-
 function getEffectiveDropCount() {
   if (newVolume.value === 'custom') return newCustomDrops.value || 0
   return VOLUME_OPTIONS[newVolume.value] || 0
@@ -570,18 +549,12 @@ function parseMethodBadges(methodStr) {
 }
 
 // Actions
-async function openOilDetail(name) {
+function openOilDetail(name) {
   const card = getOilCard(name)
   if (card) {
     activeCardName.value = name
     activeCard.value = card
     selectedOilName.value = null
-    // Pre-generate card image for instant save
-    oilCardImageUrl.value = null
-    await nextTick()
-    await new Promise(r => setTimeout(r, 300))
-    const el = document.querySelector('.oil-card-modal')
-    if (el) await generateImageFromRef({ value: el }, oilCardImageUrl)
   } else {
     activeCard.value = null
     activeCardName.value = null
@@ -680,42 +653,6 @@ async function saveEditOil() {
   }
 }
 
-async function toggleOilActive() {
-  const name = editingOilName.value
-  if (!name) { ui.showToast('错误: 没有选中精油'); return }
-  const meta = getMeta(name)
-  if (!meta) { ui.showToast('错误: 找不到精油数据'); return }
-  const newActive = meta.isActive === false ? 1 : 0
-  const payload = {
-    name,
-    bottle_price: Number(meta.bottlePrice) || 0,
-    drop_count: Number(meta.dropCount) || 1,
-    retail_price: meta.retailPrice ? Number(meta.retailPrice) : null,
-    en_name: meta.enName || null,
-    is_active: newActive,
-  }
-  try {
-    const res = await fetch('/api/oils', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': 'Bearer ' + localStorage.getItem('oil_auth_token'),
-      },
-      body: JSON.stringify(payload),
-    })
-    if (!res.ok) {
-      const text = await res.text()
-      ui.showToast('下架失败[' + res.status + ']: ' + text)
-      return
-    }
-    await oils.loadOils()
-    cardVersion.value++
-    ui.showToast(newActive ? '已重新上架' : '已下架')
-  } catch (e) {
-    ui.showToast('网络错误: ' + e.message)
-  }
-}
-
 async function removeOil(name) {
   const ok = await showConfirm(`确定删除精油 "${name}"？`)
   if (!ok) return
@@ -788,86 +725,33 @@ function exportPDF() {
   setTimeout(() => w.print(), 500)
 }
 
-// ──── Save image logic (identical to RecipeDetailOverlay) ────
+// Save modal as image using html2canvas
-
+async function saveModalImage(name) {
-// Pre-generated image URLs (same pattern as cardImageUrl in recipe card)
-const dilutionImageUrl = ref(null)
-const contraImageUrl = ref(null)
-const oilCardImageUrl = ref(null)
-
-async function generateImageFromRef(elRef, imageUrlRef) {
-  const el = elRef.value || elRef
-  if (!el) return
-  await nextTick()
-  await new Promise(r => setTimeout(r, 100))
   try {
-    // Same params as RecipeDetailOverlay.generateCardImage
+    const { default: html2canvas } = await import('html2canvas')
-    const canvas = await html2canvas(el, {
+    const overlay = document.querySelector('.modal-overlay')
-      backgroundColor: null,
+    if (!overlay) return
-      scale: 3,
+    const cardEl = overlay.querySelector('[style*="border-radius: 20px"], [style*="border-radius:20px"]') || overlay.children[0]
-      useCORS: true,
+    if (!cardEl) return
-      allowTaint: false,
+    // Hide close buttons during capture
-    })
+    const btns = cardEl.querySelectorAll('button')
-    imageUrlRef.value = canvas.toDataURL('image/png')
+    btns.forEach(b => b.style.display = 'none')
+    const canvas = await html2canvas(cardEl, { scale: 2, backgroundColor: '#ffffff', useCORS: true })
+    btns.forEach(b => b.style.display = '')
+    const url = canvas.toDataURL('image/png')
+    const a = document.createElement('a')
+    a.href = url
+    a.download = (name || '精油知识卡') + '.png'
+    a.click()
+    ui.showToast('图片已保存')
   } catch (e) {
-    console.error('generateImage failed:', e)
+    ui.showToast('保存失败')
   }
 }
 
-// When modal opens, pre-generate the image (so save button has instant dataUrl)
+function saveDilutionImage() { saveModalImage('精油稀释比例指南') }
-watch(showDilution, async (v) => {
+function saveContraImage() { saveModalImage('精油使用禁忌') }
-  if (v) {
+function saveCardImage(name) { saveModalImage(name + '_精油知识卡') }
-    dilutionImageUrl.value = null
-    await nextTick()
-    await new Promise(r => setTimeout(r, 300))
-    await generateImageFromRef(dilutionCardRef, dilutionImageUrl)
-  }
-})
-watch(showContra, async (v) => {
-  if (v) {
-    contraImageUrl.value = null
-    await nextTick()
-    await new Promise(r => setTimeout(r, 300))
-    await generateImageFromRef(contraCardRef, contraImageUrl)
-  }
-})
-
-// Save: dataUrl is already cached, navigator.share runs in fresh user gesture
-async function saveDilutionImage() {
-  if (!dilutionImageUrl.value) {
-    ui.showToast('图片生成中，请稍后再试')
-    return
-  }
-  const { saveImageFromUrl } = await import('../composables/useSaveImage')
-  await saveImageFromUrl(dilutionImageUrl.value, '精油稀释比例指南')
-  ui.showToast('已保存图片')
-}
-
-async function saveContraImage() {
-  if (!contraImageUrl.value) {
-    ui.showToast('图片生成中，请稍后再试')
-    return
-  }
-  const { saveImageFromUrl } = await import('../composables/useSaveImage')
-  await saveImageFromUrl(contraImageUrl.value, '精油使用禁忌')
-  ui.showToast('已保存图片')
-}
-
-async function saveCardImage(name) {
-  // Oil card: generate on demand since we don't know which card opens
-  const el = document.querySelector('.oil-card-modal')
-  if (!el) { ui.showToast('找不到卡片'); return }
-  if (!oilCardImageUrl.value) {
-    await generateImageFromRef({ value: el }, oilCardImageUrl)
-  }
-  if (!oilCardImageUrl.value) {
-    ui.showToast('图片生成失败')
-    return
-  }
-  const { saveImageFromUrl } = await import('../composables/useSaveImage')
-  await saveImageFromUrl(oilCardImageUrl.value, name + '_精油知识卡')
-  ui.showToast('已保存图片')
-}
 </script>
 
 <style scoped>
@@ -1060,12 +944,10 @@ async function saveCardImage(name) {
 
 .form-input {
   flex: 1;
-  width: 100%;
   min-width: 100px;
   padding: 8px 12px;
   border: 1.5px solid var(--border, #e0d4c0);
   border-radius: 8px;
-  box-sizing: border-box;
   font-size: 13px;
   font-family: inherit;
   outline: none;
@@ -1217,80 +1099,6 @@ async function saveCardImage(name) {
 .oil-chip:hover {
   box-shadow: 0 4px 16px rgba(90,60,30,0.12);
 }
-.oil-chip--inactive {
-  opacity: 0.7;
-  background: #f5f5f5 !important;
-  border: 1px solid #e0e0e0;
-}
-.oil-chip--incomplete {
-  background: #fff5f5 !important;
-}
-.oil-name-line {
-  font-size: 14px;
-  font-weight: 500;
-  color: var(--text-dark);
-  white-space: nowrap;
-}
-.oil-en-line {
-  font-size: 10px;
-  color: var(--text-light);
-  white-space: nowrap;
-}
-.oil-price-line {
-  font-size: 13px;
-  color: var(--sage-dark);
-  font-weight: 600;
-  white-space: nowrap;
-}
-.oil-price-unit {
-  font-size: 10px;
-  font-weight: 400;
-  color: var(--text-light);
-}
-.oil-retail-line {
-  font-size: 11px;
-  color: var(--text-light);
-  text-decoration: line-through;
-  white-space: nowrap;
-}
-/* Desktop: show text buttons, hide icon buttons */
-.toolbar-btn-text {
-  padding: 7px 14px;
-  border-radius: 8px;
-  font-size: 12px;
-  cursor: pointer;
-  font-family: inherit;
-  border: 1.5px solid var(--sage);
-  background: white;
-  color: var(--sage-dark);
-  white-space: nowrap;
-}
-.toolbar-btn-text:hover { background: var(--sage-mist); }
-.toolbar-btn-icon {
-  display: none;
-  background: white;
-  border: 1px solid var(--border);
-  border-radius: 8px;
-  font-size: 13px;
-  cursor: pointer;
-  padding: 4px 7px;
-  line-height: 1;
-}
-.toolbar-btn-icon:hover {
-  border-color: var(--sage);
-  background: var(--sage-mist);
-}
-
-@media (max-width: 480px) {
-  .oil-name-line { font-size: 13px; }
-  .oil-en-line { font-size: 9px; }
-  .oil-price-line { font-size: 12px; }
-  .oil-retail-line { font-size: 10px; }
-  .oils-grid { grid-template-columns: repeat(auto-fill, minmax(160px, 1fr)); gap: 8px; }
-  .oil-chip { padding: 10px 12px; }
-  .toolbar-btn-text { display: none; }
-  .toolbar-btn-icon { display: inline-block; }
-}
 
 .oil-chip-actions {
   position: absolute;

frontend/src/views/RecipeManager.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="recipe-manager">
     <!-- Review Bar (admin only) -->
-    <div v-if="auth.isAdmin && 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>
@@ -14,72 +14,61 @@
       </div>
     </div>
 
-    <!-- Search & Actions Bar (editor+) -->
+    <!-- Search & Actions Bar -->
-    <template v-if="auth.canEdit">
+    <div class="manage-toolbar">
-      <div class="manage-toolbar">
+      <div class="search-box">
-        <div class="search-box">
+        <input
-          <input
+          class="search-input"
-            class="search-input"
+          v-model="manageSearch"
-            v-model="manageSearch"
+          placeholder="搜索配方..."
-            placeholder="搜索配方..."
+        />
-          />
+        <button v-if="manageSearch" class="search-clear-btn" @click="manageSearch = ''">✕</button>
-          <button v-if="manageSearch" class="search-clear-btn" @click="manageSearch = ''">✕</button>
-        </div>
-        <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>
+      <button class="btn-primary" @click="showAddOverlay = true">+ 添加配方</button>
+      <button class="btn-outline" @click="exportExcel">📊 导出Excel</button>
+    </div>
 
-      <!-- Tag Filter Bar -->
+    <!-- Tag Filter Bar -->
-      <div class="tag-filter-bar">
+    <div class="tag-filter-bar">
-        <button class="tag-toggle-btn" @click="showTagFilter = !showTagFilter">
+      <button class="tag-toggle-btn" @click="showTagFilter = !showTagFilter">
-          🏷️ 标签筛选 {{ showTagFilter ? '▾' : '▸' }}
+        🏷️ 标签筛选 {{ showTagFilter ? '▾' : '▸' }}
-        </button>
+      </button>
-        <div v-if="showTagFilter" class="tag-list">
+      <div v-if="showTagFilter" class="tag-list">
-          <span
+        <span
-            v-for="tag in recipeStore.allTags"
+          v-for="tag in recipeStore.allTags"
-            :key="tag"
+          :key="tag"
-            class="tag-chip"
+          class="tag-chip"
-            :class="{ active: selectedTags.includes(tag) }"
+          :class="{ active: selectedTags.includes(tag) }"
-            @click="toggleTag(tag)"
+          @click="toggleTag(tag)"
-          >{{ tag }}</span>
+        >{{ tag }}</span>
-        </div>
       </div>
-    </template>
+    </div>
 
     <!-- Batch Operations -->
-    <div v-if="selectedIds.size > 0 || selectedDiaryIds.size > 0" class="batch-bar">
+    <div v-if="selectedIds.size > 0" class="batch-bar">
-      <span>已选 {{ selectedIds.size + selectedDiaryIds.size }} 项</span>
+      <span>已选 {{ selectedIds.size }} 项</span>
-      <button class="btn-sm btn-outline" @click="executeBatchAction('tag')">🏷 打标签</button>
+      <select v-model="batchAction" class="batch-select">
-      <button class="btn-sm btn-outline" @click="executeBatchAction('share_public')" v-if="selectedDiaryIds.size > 0">📤 分享到公共库</button>
+        <option value="">批量操作...</option>
-      <button class="btn-sm btn-outline" @click="executeBatchAction('export')">📷 导出卡片</button>
+        <option value="tag">添加标签</option>
-      <button class="btn-sm btn-danger-outline" @click="executeBatchAction('delete')">🗑 删除</button>
+        <option value="share">分享</option>
-      <button class="btn-sm btn-outline" @click="clearSelection">取消</button>
+        <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>
 
     <!-- My Recipes Section (from diary) -->
     <div class="recipe-section">
-      <h3 class="section-title">
+      <h3 class="section-title">📖 我的配方 ({{ myRecipes.length }})</h3>
-        <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"
+          class="recipe-row diary-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>
@@ -94,8 +83,8 @@
       </div>
     </div>
 
-    <!-- Public Recipes Section (editor+) -->
+    <!-- Public Recipes Section -->
-    <div v-if="auth.canEdit" class="recipe-section">
+    <div class="recipe-section">
       <h3 class="section-title">🌿 公共配方库 ({{ publicRecipes.length }})</h3>
       <div class="recipe-list">
         <div
@@ -135,22 +124,20 @@
           <button class="btn-close" @click="closeOverlay">✕</button>
         </div>
 
-        <!-- Smart Paste Section (only for new recipes) -->
+        <!-- Smart Paste Section -->
-        <template v-if="!editingRecipe">
+        <div class="paste-section">
-          <div class="paste-section">
+          <textarea
-            <textarea
+            v-model="smartPasteText"
-              v-model="smartPasteText"
+            class="paste-input"
-              class="paste-input"
+            placeholder="粘贴配方文本，支持智能识别...&#10;例如: 薰衣草3滴 茶树2滴"
-              placeholder="粘贴配方文本，支持智能识别...&#10;例如: 薰衣草3滴 茶树2滴"
+            rows="4"
-              rows="4"
+          ></textarea>
-            ></textarea>
+          <button class="btn-primary" @click="handleSmartPaste" :disabled="!smartPasteText.trim()">
-            <button class="btn-primary" @click="handleSmartPaste" :disabled="!smartPasteText.trim()">
+            智能识别
-              智能识别
+          </button>
-            </button>
+        </div>
-          </div>
 
-          <div class="divider-text">或手动输入</div>
+        <div class="divider-text">或手动输入</div>
-        </template>
 
         <!-- Manual Form -->
         <div class="form-group">
@@ -161,29 +148,14 @@
         <div class="form-group">
           <label>成分</label>
           <div v-for="(ing, i) in formIngredients" :key="i" class="ing-row">
-            <div class="oil-search-wrap">
+            <select v-model="ing.oil" class="form-select">
-              <input
+              <option value="">选择精油</option>
-                v-model="ing._search"
+              <option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
-                class="form-select"
+            </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, _search: '', _open: false })">+ 添加成分</button>
+          <button class="btn-outline btn-sm" @click="formIngredients.push({ oil: '', drops: 1 })">+ 添加成分</button>
         </div>
 
         <div class="form-group">
@@ -224,7 +196,7 @@
 </template>
 
 <script setup>
-import { ref, computed, reactive, onMounted, watch } from 'vue'
+import { ref, computed, reactive, onMounted } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useRecipesStore } from '../stores/recipes'
@@ -233,7 +205,6 @@ 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'
 
@@ -247,7 +218,7 @@ const manageSearch = ref('')
 const selectedTags = ref([])
 const showTagFilter = ref(false)
 const selectedIds = reactive(new Set())
-const selectedDiaryIds = reactive(new Set())
+const batchAction = ref('')
 const showAddOverlay = ref(false)
 const editingRecipe = ref(null)
 const showPending = ref(false)
@@ -288,7 +259,7 @@ function filterBySearchAndTags(list) {
       r.tags && selectedTags.value.every(t => r.tags.includes(t))
     )
   }
-  return result.slice().sort((a, b) => a.name.localeCompare(b.name, 'zh'))
+  return result
 }
 
 const myFilteredRecipes = computed(() => filterBySearchAndTags(myRecipes.value))
@@ -305,84 +276,47 @@ function toggleSelect(id) {
   else selectedIds.add(id)
 }
 
-function toggleDiarySelect(id) {
-  if (selectedDiaryIds.has(id)) selectedDiaryIds.delete(id)
-  else selectedDiaryIds.add(id)
-}
-
 function clearSelection() {
   selectedIds.clear()
-  selectedDiaryIds.clear()
+  batchAction.value = ''
 }
 
-function toggleSelectAllDiary() {
+async function executeBatch() {
-  if (selectedDiaryIds.size === myFilteredRecipes.value.length) {
+  const ids = [...selectedIds]
-    selectedDiaryIds.clear()
+  if (!ids.length || !batchAction.value) return
-  } else {
-    myFilteredRecipes.value.forEach(d => selectedDiaryIds.add(d.id))
-  }
-}
 
-async function executeBatchAction(action) {
+  if (batchAction.value === 'delete') {
-  const pubIds = [...selectedIds]
+    const ok = await showConfirm(`确定删除 ${ids.length} 个配方？`)
-  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 pubIds) {
+    for (const id of ids) {
       await recipeStore.deleteRecipe(id)
     }
-    for (const id of diaryIds) {
+    ui.showToast(`已删除 ${ids.length} 个配方`)
-      await diaryStore.deleteDiary(id)
+  } else if (batchAction.value === 'tag') {
-    }
-    ui.showToast(`已删除 ${totalCount} 个配方`)
-  } else if (action === 'tag') {
     const tagName = await showPrompt('输入要添加的标签:')
     if (!tagName) return
-    for (const id of pubIds) {
+    for (const id of ids) {
       const recipe = recipeStore.recipes.find(r => r._id === id)
       if (recipe && !recipe.tags.includes(tagName)) {
         recipe.tags.push(tagName)
         await recipeStore.saveRecipe(recipe)
       }
     }
-    for (const id of diaryIds) {
+    ui.showToast(`已为 ${ids.length} 个配方添加标签`)
-      const d = diaryStore.userDiary.find(r => r.id === id)
+  } else if (batchAction.value === 'share') {
-      if (d) {
+    const text = ids.map(id => {
-        const tags = [...(d.tags || [])]
+      const r = recipeStore.recipes.find(rec => rec._id === id)
-        if (!tags.includes(tagName)) {
+      if (!r) return ''
-          tags.push(tagName)
+      const ings = r.ingredients.map(ing => `${ing.oil} ${ing.drops}滴`).join('，')
-          await diaryStore.updateDiary(id, { ...d, tags })
+      return `${r.name}：${ings}`
-        }
+    }).filter(Boolean).join('\n\n')
-      }
+    try {
+      await navigator.clipboard.writeText(text)
+      ui.showToast('已复制到剪贴板')
+    } catch {
+      ui.showToast('复制失败')
     }
-    ui.showToast(`已为 ${totalCount} 个配方添加标签`)
+  } else if (batchAction.value === 'export') {
-  } 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()
@@ -391,7 +325,7 @@ async function executeBatchAction(action) {
 function editRecipe(recipe) {
   editingRecipe.value = recipe
   formName.value = recipe.name
-  formIngredients.value = recipe.ingredients.map(i => ({ ...i, _search: i.oil, _open: false }))
+  formIngredients.value = recipe.ingredients.map(i => ({ ...i }))
   formNote.value = recipe.note || ''
   formTags.value = [...(recipe.tags || [])]
   showAddOverlay.value = true
@@ -405,7 +339,7 @@ function closeOverlay() {
 
 function resetForm() {
   formName.value = ''
-  formIngredients.value = [{ oil: '', drops: 1, _search: '', _open: false }]
+  formIngredients.value = [{ oil: '', drops: 1 }]
   formNote.value = ''
   formTags.value = []
   smartPasteText.value = ''
@@ -422,28 +356,6 @@ 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)
@@ -468,18 +380,6 @@ 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
@@ -502,12 +402,9 @@ onMounted(async () => {
 })
 
 function editDiaryRecipe(diary) {
-  editingRecipe.value = { _diary_id: diary.id, name: diary.name }
+  // For now, navigate to MyDiary page to edit
-  formName.value = diary.name
+  // TODO: inline editing
-  formIngredients.value = (diary.ingredients || []).map(i => ({ ...i, _search: i.oil, _open: false }))
+  ui.showToast('请到「我的」页面编辑个人配方')
-  formNote.value = diary.note || ''
-  formTags.value = [...(diary.tags || [])]
-  showAddOverlay.value = true
 }
 
 async function removeDiaryRecipe(diary) {
@@ -534,8 +431,10 @@ async function removeRecipe(recipe) {
 
 async function approveRecipe(recipe) {
   try {
-    await api('/api/recipes/' + recipe._id + '/adopt', { method: 'POST' })
+    await api('/api/recipes/' + recipe._id + '/approve', { method: 'POST' })
-    ui.showToast('已采纳')
+    pendingRecipes.value = pendingRecipes.value.filter(r => r._id !== recipe._id)
+    pendingCount.value--
+    ui.showToast('已通过')
     await recipeStore.loadRecipes()
   } catch {
     ui.showToast('操作失败')
@@ -543,11 +442,11 @@ async function approveRecipe(recipe) {
 }
 
 async function rejectRecipe(recipe) {
-  const ok = await showConfirm(`确定删除「${recipe.name}」？`)
-  if (!ok) return
   try {
-    await recipeStore.deleteRecipe(recipe._id)
+    await api('/api/recipes/' + recipe._id + '/reject', { method: 'POST' })
-    ui.showToast('已删除')
+    pendingRecipes.value = pendingRecipes.value.filter(r => r._id !== recipe._id)
+    pendingCount.value--
+    ui.showToast('已拒绝')
   } catch {
     ui.showToast('操作失败')
   }
@@ -575,13 +474,16 @@ function onTagPickerSave(tags) {
   showTagPicker.value = false
 }
 
-watch(() => recipeStore.recipes, () => {
+// Load pending if admin
-  if (auth.isAdmin) {
+if (auth.isAdmin) {
-    const pending = recipeStore.recipes.filter(r => r._owner_id && r._owner_id !== auth.user.id)
+  api('/api/recipes/pending').then(async res => {
-    pendingRecipes.value = pending
+    if (res.ok) {
-    pendingCount.value = pending.length
+      const data = await res.json()
-  }
+      pendingRecipes.value = data
-}, { immediate: true })
+      pendingCount.value = data.length
+    }
+  }).catch(() => {})
+}
 </script>
 
 <style scoped>
@@ -985,44 +887,6 @@ 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;
@@ -1079,32 +943,6 @@ 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;

frontend/src/views/RecipeSearch.vue

@@ -49,91 +49,56 @@
 
     <!-- Personal Section (logged in) -->
     <div v-if="auth.isLoggedIn" class="personal-section">
-      <template v-if="!searchQuery || myDiaryRecipes.length > 0">
       <div class="section-header" @click="showMyRecipes = !showMyRecipes">
         <span>📖 我的配方 ({{ myDiaryRecipes.length }})</span>
-        <span v-if="!auth.isAdmin && sharedCount > 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="diary-card-wrap">
+        <div
-          <RecipeCard
+          v-for="d in myDiaryRecipes"
-            :recipe="diaryAsRecipe(d)"
+          :key="'diary-' + d.id"
-            :index="-1"
+          class="recipe-card diary-card"
-            @click="openDiaryDetail(d)"
+          @click="openDiaryDetail(d)"
-          />
+        >
-          <span v-if="getDiaryShareStatus(d) === 'shared'" class="share-status shared">已共享</span>
+          <div class="card-name">{{ d.name }}</div>
-          <span v-else-if="getDiaryShareStatus(d) === 'pending'" class="share-status pending">审核中</span>
+          <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>
+          </div>
         </div>
         <div v-if="myDiaryRecipes.length === 0" class="empty-hint">暂无个人配方</div>
       </div>
-      </template>
 
-      <template v-if="!searchQuery || favoritesPreview.length > 0">
+      <div class="section-header" @click="showFavorites = !showFavorites">
-        <div class="section-header" @click="showFavorites = !showFavorites">
+        <span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
-          <span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
+        <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
-          <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
+      </div>
-        </div>
+      <div v-if="showFavorites" class="recipe-grid">
-        <div v-if="showFavorites" class="recipe-grid">
+        <RecipeCard
-          <RecipeCard
+          v-for="r in favoritesPreview"
-            v-for="r in favoritesPreview"
+          :key="r._id"
-            :key="r._id"
+          :recipe="r"
-            :recipe="r"
+          :index="findGlobalIndex(r)"
-            :index="findGlobalIndex(r)"
+          @click="openDetail(findGlobalIndex(r))"
-            @click="openDetail(findGlobalIndex(r))"
+          @toggle-fav="handleToggleFav(r)"
-            @toggle-fav="handleToggleFav(r)"
+        />
-          />
+        <div v-if="favoritesPreview.length === 0" class="empty-hint">暂无收藏配方</div>
-          <div v-if="favoritesPreview.length === 0" class="empty-hint">暂无收藏配方</div>
+      </div>
-        </div>
-      </template>
     </div>
 
     <!-- Search Results (public recipes) -->
     <div v-if="searchQuery" class="search-results-section">
-      <!-- Exact matches -->
+      <div class="section-label">🔍 公共配方搜索结果 ({{ fuzzyResults.length }})</div>
-      <template v-if="exactResults.length > 0">
+      <div class="recipe-grid">
-        <div class="section-label">🔍 搜索结果 ({{ exactResults.length }})</div>
+        <RecipeCard
-        <div class="recipe-grid">
+          v-for="(r, i) in fuzzyResults"
-          <RecipeCard
+          :key="r._id"
-            v-for="r in exactResults"
+          :recipe="r"
-            :key="r._id"
+          :index="findGlobalIndex(r)"
-            :recipe="r"
+          @click="openDetail(findGlobalIndex(r))"
-            :index="findGlobalIndex(r)"
+          @toggle-fav="handleToggleFav(r)"
-            @click="openDetail(findGlobalIndex(r))"
+        />
-            @toggle-fav="handleToggleFav(r)"
+        <div v-if="fuzzyResults.length === 0" class="empty-hint">未找到匹配的公共配方</div>
-          />
-        </div>
-      </template>
-
-      <!-- Similar/related matches -->
-      <template v-if="similarResults.length > 0">
-        <div class="section-label similar-label">
-          {{ exactResults.length > 0 ? '💡 相关配方' : '💡 没有完全匹配，以下是相关配方' }}
-          ({{ similarResults.length }})
-        </div>
-        <div class="recipe-grid">
-          <RecipeCard
-            v-for="r in similarResults"
-            :key="'sim-' + r._id"
-            :recipe="r"
-            :index="findGlobalIndex(r)"
-            @click="openDetail(findGlobalIndex(r))"
-            @toggle-fav="handleToggleFav(r)"
-          />
-        </div>
-      </template>
-
-      <!-- No results at all -->
-      <div v-if="exactResults.length === 0 && similarResults.length === 0" class="no-match-box">
-        <div class="empty-hint">未找到「{{ searchQuery }}」相关配方</div>
-      </div>
-
-      <!-- Report missing button (always shown at bottom) -->
-      <div class="no-match-box" style="margin-top:12px">
-        <button v-if="!reportedMissing" class="btn-report-missing" @click="reportMissing">
-          📢 没找到想要的？通知编辑添加
-        </button>
-        <div v-else class="reported-hint">已通知编辑，感谢反馈！</div>
       </div>
     </div>
 
@@ -155,11 +120,9 @@
 
     <!-- Recipe Detail Overlay -->
     <RecipeDetailOverlay
-      v-if="selectedRecipeIndex !== null || selectedDiaryRecipe !== null"
+      v-if="selectedRecipeIndex !== null"
       :recipeIndex="selectedRecipeIndex"
-      :recipeData="selectedDiaryRecipe"
+      @close="selectedRecipeIndex = null"
-      :isDiary="selectedDiaryRecipe !== null"
-      @close="selectedRecipeIndex = null; selectedDiaryRecipe = null"
     />
   </div>
 </template>
@@ -188,11 +151,9 @@ 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 {
@@ -202,16 +163,9 @@ onMounted(async () => {
     }
   } catch {}
 
-  // Load personal diary recipes & contribution stats
+  // Load personal diary recipes
   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
@@ -219,7 +173,7 @@ onMounted(async () => {
   if (openRecipeId) {
     router.replace({ path: '/', query: {} })
     const tryOpen = () => {
-      const idx = recipeStore.recipes.findIndex(r => String(r._id) === String(openRecipeId))
+      const idx = recipeStore.recipes.findIndex(r => r._id === openRecipeId)
       if (idx >= 0) {
         openDetail(idx)
         return true
@@ -251,107 +205,21 @@ const filteredRecipes = computed(() => {
   if (selectedCategory.value) {
     list = list.filter(r => r.tags && r.tags.includes(selectedCategory.value))
   }
-  return list.slice().sort((a, b) => a.name.localeCompare(b.name, 'zh'))
+  return list
 })
 
-// Synonym groups for broader fuzzy matching
+// Search results from public recipes
-const synonymGroups = [
+const fuzzyResults = computed(() => {
-  ['胸', '乳腺', '乳房', '丰胸', '胸部'],
-  ['瘦', '减肥', '减脂', '消脂', '纤体', '塑形', '体重'],
-  ['痘', '痤疮', '粉刺', '暗疮', '长痘', '祛痘'],
-  ['斑', '色斑', '淡斑', '雀斑', '黑色素', '美白', '亮肤'],
-  ['皱', '抗皱', '皱纹', '紧致', '抗衰', '抗老'],
-  ['睡', '眠', '失眠', '助眠', '安眠', '好眠', '入睡'],
-  ['焦虑', '紧张', '压力', '情绪', '放松', '舒缓', '安神', '宁神'],
-  ['头', '头痛', '头疼', '偏头痛', '头晕'],
-  ['咳', '咳嗽', '止咳', '清咽'],
-  ['鼻', '鼻炎', '鼻塞', '过敏性鼻炎', '打喷嚏'],
-  ['感冒', '发烧', '发热', '流感', '风寒', '风热'],
-  ['胃', '消化', '肠胃', '胃痛', '胃胀', '积食', '便秘'],
-  ['肝', '护肝', '养肝', '肝脏', '排毒'],
-  ['肾', '补肾', '养肾', '肾虚'],
-  ['腰', '腰痛', '腰酸', '腰椎'],
-  ['肩', '肩颈', '颈椎', '肩周'],
-  ['关节', '骨骼', '骨质', '风湿', '类风湿'],
-  ['肌肉', '酸痛', '疼痛', '拉伤'],
-  ['月经', '痛经', '经期', '姨妈', '生理期', '调经'],
-  ['子宫', '卵巢', '生殖', '备孕', '怀孕', '孕'],
-  ['前列腺', '男性', '阳'],
-  ['湿', '祛湿', '排湿', '湿气', '化湿'],
-  ['免疫', '免疫力', '抵抗力'],
-  ['脱发', '掉发', '生发', '头发', '发际线', '秃'],
-  ['过敏', '敏感', '荨麻疹', '湿疹', '皮炎'],
-  ['血压', '高血压', '低血压', '血管', '循环'],
-  ['血糖', '糖尿病', '降糖'],
-  ['淋巴', '排毒', '水肿', '浮肿'],
-  ['呼吸', '肺', '支气管', '哮喘', '气管'],
-  ['眼', '眼睛', '视力', '近视', '干眼'],
-  ['耳', '耳鸣', '中耳炎', '耳朵'],
-  ['口', '口腔', '口臭', '牙', '牙龈', '牙疼'],
-  ['皮肤', '护肤', '保湿', '修复', '焕肤'],
-  ['疤', '疤痕', '伤疤', '妊娠纹'],
-  ['心', '心脏', '心悸', '养心'],
-  ['甲状腺', '甲亢', '甲减'],
-  ['高', '长高', '增高', '个子'],
-  ['静脉', '静脉曲张'],
-  ['痔', '痔疮'],
-]
-
-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 || tagMatch
+    return nameMatch || oilMatch || 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 []
@@ -391,24 +259,27 @@ function openDetail(index) {
   }
 }
 
-function getDiaryShareStatus(d) {
-  const pub = recipeStore.recipes.find(r => r.name === d.name && r._owner_id === auth.user?.id)
-  if (pub) return 'shared'
-  return null
-}
-
-function diaryAsRecipe(d) {
-  return {
-    _id: 'diary-' + d.id,
-    name: d.name,
-    note: d.note || '',
-    tags: d.tags || [],
-    ingredients: d.ingredients || [],
-  }
-}
-
 function openDiaryDetail(diary) {
-  selectedDiaryRecipe.value = diaryAsRecipe(diary)
+  // 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,
+  }
+  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()
+    }
+  })
 }
 
 async function handleToggleFav(recipe) {
@@ -419,39 +290,13 @@ async function handleToggleFav(recipe) {
   await recipeStore.toggleFavorite(recipe._id)
 }
 
-async function shareDiaryToPublic(diary) {
-  const { showConfirm } = await import('../composables/useDialog')
-  const ok = await showConfirm(`将「${diary.name}」共享到公共配方库？\n共享后所有用户都能看到。`)
-  if (!ok) return
-  try {
-    await api('/api/recipes', {
-      method: 'POST',
-      body: JSON.stringify({
-        name: diary.name,
-        note: diary.note || '',
-        ingredients: (diary.ingredients || []).map(i => ({ oil_name: i.oil, drops: i.drops })),
-        tags: diary.tags || [],
-      }),
-    })
-    if (auth.isAdmin) {
-      ui.showToast('已共享到公共配方库')
-    } else {
-      ui.showToast('已提交，等待管理员审核')
-    }
-    await recipeStore.loadRecipes()
-  } catch {
-    ui.showToast('共享失败')
-  }
-}
-
 function onSearch() {
-  reportedMissing.value = false
+  // fuzzyResults computed handles the filtering reactively
 }
 
 function clearSearch() {
   searchQuery.value = ''
   selectedCategory.value = null
-  reportedMissing.value = false
 }
 
 // Carousel swipe
@@ -664,40 +509,6 @@ 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;
@@ -725,40 +536,6 @@ function onCarouselTouchEnd(e) {
   padding: 24px 0;
 }
 
-.similar-label {
-  color: #e65100;
-  background: #fff8e1;
-  padding: 8px 14px;
-  border-radius: 10px;
-}
-
-.no-match-box {
-  text-align: center;
-  padding: 12px 0;
-}
-
-.btn-report-missing {
-  background: linear-gradient(135deg, #ffb74d, #e65100);
-  color: #fff;
-  border: none;
-  border-radius: 10px;
-  padding: 10px 20px;
-  font-size: 14px;
-  cursor: pointer;
-  font-family: inherit;
-  margin-top: 8px;
-}
-
-.btn-report-missing:hover {
-  opacity: 0.9;
-}
-
-.reported-hint {
-  color: #4a9d7e;
-  font-size: 13px;
-  font-weight: 500;
-}
-
 .diary-card {
   background: white;
   border-radius: 14px;
@@ -796,18 +573,6 @@ function onCarouselTouchEnd(e) {
   color: var(--sage-dark, #5a7d5e);
 }
 
-.share-btn {
-  background: none;
-  border: none;
-  cursor: pointer;
-  font-size: 16px;
-  padding: 2px 4px;
-  border-radius: 6px;
-  opacity: 0.5;
-  transition: opacity 0.2s;
-}
-.share-btn:hover { opacity: 1; }
-
 @media (max-width: 600px) {
   .recipe-grid {
     grid-template-columns: 1fr;

frontend/src/views/UserManagement.vue

@@ -38,7 +38,27 @@
       </div>
     </div>
 
-    <!-- User self-registers, admin assigns roles below -->
+    <!-- New User Creation -->
+    <div class="create-section">
+      <h4 class="section-title">➕ 创建新用户</h4>
+      <div class="create-form">
+        <input v-model="newUser.username" class="form-input" placeholder="用户名" />
+        <input v-model="newUser.display_name" class="form-input" placeholder="显示名称" />
+        <input v-model="newUser.password" class="form-input" type="password" placeholder="密码 (留空自动生成)" />
+        <select v-model="newUser.role" class="form-select">
+          <option value="viewer">查看者</option>
+          <option value="editor">编辑</option>
+          <option value="senior_editor">高级编辑</option>
+          <option value="admin">管理员</option>
+        </select>
+        <button class="btn-primary" @click="createUser" :disabled="!newUser.username.trim()">创建</button>
+      </div>
+      <div v-if="createdLink" class="created-link">
+        <span>登录链接:</span>
+        <code>{{ createdLink }}</code>
+        <button class="btn-sm btn-outline" @click="copyLink(createdLink)">复制</button>
+      </div>
+    </div>
 
     <!-- Search & Filter -->
     <div class="filter-toolbar">
@@ -80,12 +100,13 @@
             :value="u.role"
             class="role-select"
             @change="changeRole(u, $event.target.value)"
-            :disabled="u.role === 'admin'"
           >
             <option value="viewer">查看者</option>
             <option value="editor">编辑</option>
             <option value="senior_editor">高级编辑</option>
+            <option value="admin">管理员</option>
           </select>
+          <button class="btn-sm btn-outline" @click="copyUserLink(u)" title="复制登录链接">🔗</button>
           <button class="btn-sm btn-delete" @click="removeUser(u)" title="删除用户">🗑️</button>
         </div>
       </div>
@@ -97,7 +118,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted } from 'vue'
+import { ref, computed, reactive, onMounted } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
@@ -111,6 +132,15 @@ const searchQuery = ref('')
 const filterRole = ref('')
 const translations = ref([])
 const businessApps = ref([])
+const createdLink = ref('')
+
+const newUser = reactive({
+  username: '',
+  display_name: '',
+  password: '',
+  role: 'viewer',
+})
+
 const roles = [
   { value: 'admin', label: '管理员' },
   { value: 'senior_editor', label: '高级编辑' },
@@ -176,10 +206,43 @@ async function loadBusinessApps() {
   }
 }
 
+async function createUser() {
+  if (!newUser.username.trim()) return
+  try {
+    const res = await api('/api/users', {
+      method: 'POST',
+      body: JSON.stringify({
+        username: newUser.username.trim(),
+        display_name: newUser.display_name.trim() || newUser.username.trim(),
+        password: newUser.password || undefined,
+        role: newUser.role,
+      }),
+    })
+    if (res.ok) {
+      const data = await res.json()
+      if (data.token) {
+        const baseUrl = window.location.origin
+        createdLink.value = `${baseUrl}/?token=${data.token}`
+      }
+      newUser.username = ''
+      newUser.display_name = ''
+      newUser.password = ''
+      newUser.role = 'viewer'
+      await loadUsers()
+      ui.showToast('用户已创建')
+    } else {
+      const err = await res.json().catch(() => ({}))
+      ui.showToast('创建失败: ' + (err.error || err.message || ''))
+    }
+  } catch {
+    ui.showToast('创建失败')
+  }
+}
+
 async function changeRole(user, newRole) {
   const id = user._id || user.id
   try {
-    const res = await api(`/api/users/${id}`, {
+    const res = await api(`/api/users/${id}/role`, {
       method: 'PUT',
       body: JSON.stringify({ role: newRole }),
     })
@@ -207,6 +270,30 @@ async function removeUser(user) {
   }
 }
 
+async function copyUserLink(user) {
+  try {
+    const id = user._id || user.id
+    const res = await api(`/api/users/${id}/token`)
+    if (res.ok) {
+      const data = await res.json()
+      const link = `${window.location.origin}/?token=${data.token}`
+      await navigator.clipboard.writeText(link)
+      ui.showToast('链接已复制')
+    }
+  } catch {
+    ui.showToast('获取链接失败')
+  }
+}
+
+async function copyLink(link) {
+  try {
+    await navigator.clipboard.writeText(link)
+    ui.showToast('已复制')
+  } catch {
+    ui.showToast('复制失败')
+  }
+}
+
 async function approveTranslation(t) {
   const id = t._id || t.id
   try {