Raise LoginModal z-index above recipe overlay

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-07 22:19:48 +00:00
21 changed files with 528 additions and 1930 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ backups/
 # Frontend
 frontend/node_modules/
 frontend/dist/
-frontend/.vite/
--- a/backend/database.py
+++ b/backend/database.py
@@ -221,8 +221,6 @@ def init_db():
        c.execute("ALTER TABLE oils ADD COLUMN retail_price REAL")
    if "is_active" not in oil_cols:
        c.execute("ALTER TABLE oils ADD COLUMN is_active INTEGER DEFAULT 1")
-    if "en_name" not in oil_cols:
-        c.execute("ALTER TABLE oils ADD COLUMN en_name TEXT DEFAULT ''")

    # Migration: add new columns to category_modules if missing
    cat_cols = [row[1] for row in c.execute("PRAGMA table_info(category_modules)").fetchall()]
--- a/backend/main.py
+++ b/backend/main.py
@@ -79,8 +79,6 @@ class OilIn(BaseModel):
    bottle_price: float
    drop_count: int
    retail_price: Optional[float] = None
-    en_name: Optional[str] = None
-    is_active: Optional[int] = None


 class IngredientIn(BaseModel):
@@ -651,7 +649,7 @@ def impersonate(body: dict, user=Depends(require_role("admin"))):
@app.get("/api/oils")
 def list_oils():
    conn = get_db()
-    rows = conn.execute("SELECT name, bottle_price, drop_count, retail_price, is_active, en_name FROM oils ORDER BY name").fetchall()
+    rows = conn.execute("SELECT name, bottle_price, drop_count, retail_price, is_active FROM oils ORDER BY name").fetchall()
    conn.close()
    return [dict(r) for r in rows]

@@ -660,11 +658,9 @@ 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 (?, ?, ?, ?, ?, ?) "
-        "ON CONFLICT(name) DO UPDATE SET bottle_price=excluded.bottle_price, drop_count=excluded.drop_count, "
-        "retail_price=excluded.retail_price, en_name=COALESCE(excluded.en_name, oils.en_name), "
-        "is_active=COALESCE(excluded.is_active, oils.is_active)",
-        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, oil.en_name, oil.is_active),
+        "INSERT INTO oils (name, bottle_price, drop_count, retail_price) VALUES (?, ?, ?, ?) "
+        "ON CONFLICT(name) DO UPDATE SET bottle_price=excluded.bottle_price, drop_count=excluded.drop_count, retail_price=excluded.retail_price",
+        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price),
    )
    log_audit(conn, user["id"], "upsert_oil", "oil", oil.name, oil.name,
              json.dumps({"bottle_price": oil.bottle_price, "drop_count": oil.drop_count}))
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -2,23 +2,37 @@
  <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="header-inner">
-      <div class="header-left">
-        <div class="header-icon">🌿</div>
-        <div class="header-title">
-          <h1>doTERRA 配方计算器</h1>
-          <p>查询配方 · 计算成本 · 自制配方 · 导出卡片 · 精油知识</p>
-        </div>
-      </div>
-      <div class="header-right" @click="toggleUserMenu">
-        <template v-if="auth.isLoggedIn">
-          <span v-if="auth.isBusiness" class="biz-badge" title="商业认证用户">🏢</span>
-          <span class="user-name">{{ auth.user.display_name || auth.user.username }} ▾</span>
-        </template>
-        <template v-else>
-          <span class="login-btn">登录</span>
-        </template>
+  <div class="app-header" style="position:relative">
+    <div class="header-inner" style="padding-right:80px">
+      <div class="header-icon">🌿</div>
+      <div class="header-title" style="text-align:left;flex:1">
+        <h1 style="display:flex;justify-content:space-between;align-items:center;gap:8px;white-space:nowrap">
+          <span style="flex-shrink:0">doTERRA 配方计算器
+            <span v-if="auth.isAdmin" style="font-size:10px;font-weight:400;opacity:0.5;vertical-align:top">v2.2.0</span>
+          </span>
+          <span
+            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"
+            @click="toggleUserMenu"
+          >
+            <template v-if="auth.isLoggedIn">
+              👤 {{ auth.user.display_name || auth.user.username }} ▾
+            </template>
+            <template v-else>
+              <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>
@@ -27,7 +41,7 @@
  <UserMenu v-if="showUserMenu" @close="showUserMenu = false" />

  <!-- Nav tabs -->
-  <div class="nav-tabs" :style="isPreview ? { top: '36px' } : {}">
+  <div class="nav-tabs">
    <div class="nav-tab" :class="{ active: ui.currentSection === 'search' }" @click="goSection('search')">🔍 配方查询</div>
    <div class="nav-tab" :class="{ active: ui.currentSection === 'manage' }" @click="requireLogin('manage')">📋 管理配方</div>
    <div class="nav-tab" :class="{ active: ui.currentSection === 'inventory' }" @click="requireLogin('inventory')">📦 个人库存</div>
@@ -50,7 +64,7 @@
  <CustomDialog />

  <!-- Toast messages -->
-  <div v-for="toast in ui.toasts" :key="toast.id" class="toast">{{ toast.msg }}</div>
+  <div v-for="(toast, i) in ui.toasts" :key="i" class="toast">{{ toast }}</div>
 </template>

 <script setup>
@@ -126,66 +140,3 @@ onMounted(async () => {
  }, 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;
-}
-.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>
--- a/frontend/src/assets/styles.css
+++ b/frontend/src/assets/styles.css
@@ -445,7 +445,7 @@ body {
 .toast {
  position: fixed; bottom: 80px; left: 50%; transform: translateX(-50%);
  background: rgba(0,0,0,0.8); color: white; padding: 10px 24px;
-  border-radius: 20px; font-size: 14px; z-index: 9000;
+  border-radius: 20px; font-size: 14px; z-index: 999;
  pointer-events: none; transition: opacity 0.3s;
 }

--- a/frontend/src/components/CustomDialog.vue
+++ b/frontend/src/components/CustomDialog.vue
@@ -8,25 +8,22 @@
        type="text"
        style="width:100%;padding:10px 14px;border:1.5px solid #d4cfc7;border-radius:10px;font-size:14px;margin-bottom:16px;outline:none;font-family:inherit;box-sizing:border-box"
        @keydown.enter="submitPrompt"
-        @compositionstart="isComposing = true"
-        @compositionend="onCompositionEnd"
        ref="promptInput"
      />
      <div class="dialog-btn-row">
-        <button v-if="dialogState.type !== 'alert'" class="dialog-btn-outline" @click="cancel">{{ dialogState.cancelText || '取消' }}</button>
-        <button class="dialog-btn-primary" @click="ok">{{ dialogState.okText || '确定' }}</button>
+        <button v-if="dialogState.type !== 'alert'" class="dialog-btn-outline" @click="cancel">取消</button>
+        <button class="dialog-btn-primary" @click="ok">确定</button>
      </div>
    </div>
  </div>
 </template>

 <script setup>
-import { ref, watch, nextTick, shallowRef } from 'vue'
+import { ref, watch, nextTick } from 'vue'
 import { dialogState, closeDialog } from '../composables/useDialog'

 const inputValue = ref('')
 const promptInput = ref(null)
-const isComposing = shallowRef(false)

 watch(() => dialogState.visible, (v) => {
  if (v && dialogState.type === 'prompt') {
@@ -49,15 +46,7 @@ function cancel() {
  else closeDialog(null)
 }

-function onCompositionEnd(e) {
-  isComposing.value = false
-  // After compositionend, update the model value with the committed text
-  inputValue.value = e.target.value
-}
-
-function submitPrompt(e) {
-  // Ignore Enter during IME composition (e.g. Chinese input method confirming a character)
-  if (e.isComposing || isComposing.value) return
+function submitPrompt() {
  closeDialog(inputValue.value)
 }
 </script>
--- a/frontend/src/components/LoginModal.vue
+++ b/frontend/src/components/LoginModal.vue
@@ -104,11 +104,8 @@ async function submit() {
      ui.showToast('注册成功')
    }
    emit('close')
-    if (ui.pendingAction) {
-      ui.runPendingAction()
-    } else {
-      window.location.reload()
-    }
+    // Reload page data after auth change
+    window.location.reload()
  } catch (e) {
    errorMsg.value = e?.message || (mode.value === 'login' ? '登录失败，请检查用户名和密码' : '注册失败，请重试')
  } finally {
--- a/frontend/src/components/RecipeDetailOverlay.vue
+++ b/frontend/src/components/RecipeDetailOverlay.vue
@@ -19,7 +19,7 @@
            class="action-btn action-btn-sm"
            @click="viewMode = 'editor'"
          >编辑</button>
-          <button class="detail-close-btn" @click="handleClose">✕</button>
+          <button class="detail-close-btn" @click="$emit('close')">✕</button>
        </div>

        <!-- Language toggle -->
@@ -36,57 +36,78 @@
          >English</button>
        </div>

-        <!-- Volume selector (only in editor mode) -->
-        <div v-if="viewMode === 'editor'" class="card-volume-toggle">
-          <button
-            v-for="(drops, ml) in VOLUME_DROPS"
-            :key="ml"
-            class="volume-btn"
-            :class="{ active: selectedCardVolume === ml }"
-            @click="onCardVolumeChange(ml)"
-          >{{ ml === '单次' ? '单次' : ml + 'ml' }}</button>
-        </div>
-
        <!-- Card image (rendered by html2canvas) -->
        <div v-show="!cardImageUrl" ref="cardRef" class="export-card">
-          <!-- Background image overlay -->
-          <div v-if="brand.brand_bg" style="position:absolute;inset:0;width:100%;height:100%;background-size:cover;background-position:center;opacity:0.12;pointer-events:none;z-index:0" :style="{ backgroundImage: `url('${brand.brand_bg}')` }"></div>
-          <!-- QR: top-right -->
-          <div v-if="brand.qr_code" style="position:absolute;top:20px;right:16px;display:flex;flex-direction:column;align-items:center;gap:3px;z-index:3">
-            <img :src="brand.qr_code" crossorigin="anonymous" style="width:54px;height:54px;object-fit:cover;border-radius:6px;box-shadow:0 2px 6px rgba(0,0,0,0.1)" />
-            <div v-if="brand.brand_name" :style="{ textAlign: brand.brand_align || 'center' }" style="font-size:7px;color:var(--text-light);line-height:1.3;max-width:68px;white-space:pre-line">{{ brand.brand_name }}</div>
-          </div>
-          <!-- Card content -->
-          <div style="position:relative;z-index:2">
-            <div class="ec-subtitle">
+          <!-- Brand overlay layers -->
+          <img
+            v-if="brand.brand_bg"
+            :src="brand.brand_bg"
+            class="card-brand-bg"
+            crossorigin="anonymous"
+          />
+          <img
+            v-if="brand.qr_code"
+            :src="brand.qr_code"
+            class="card-qr"
+            crossorigin="anonymous"
+          />
+          <img
+            v-if="brand.brand_logo"
+            :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 style="width:80px;height:2px;background:linear-gradient(90deg,var(--sage),var(--gold));border-radius:2px;margin:14px 0"></div>
+            <div class="card-title">
+              {{ getCardRecipeName() }}
+            </div>
+            <div class="card-divider"></div>

-            <ul style="list-style:none;margin-bottom:20px;padding:0">
-              <li v-for="(ing, i) in cardIngredients" :key="i" class="ec-ing">
-                <span class="ec-oil-name">{{ getCardOilName(ing.oil) }}</span>
-                <span class="ec-drops">{{ ing.drops }} {{ cardLang === 'en' ? 'drops' : '滴' }}</span>
-                <span class="ec-cost">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * ing.drops) }}</span>
-                <span v-if="hasRetailForOil(ing.oil) && retailPerDrop(ing.oil) > oilsStore.pricePerDrop(ing.oil)" class="ec-retail">{{ oilsStore.fmtPrice(retailPerDrop(ing.oil) * ing.drops) }}</span>
+            <!-- Ingredients (excluding coconut oil) -->
+            <ul class="card-ingredients">
+              <li v-for="(ing, i) in cardIngredients" :key="i">
+                <span class="card-oil-name">
+                  {{ getCardOilName(ing.oil) }}
+                </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>
-
-            <div class="ec-total-bar">
-              <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>
+            <!-- Note -->
+            <div v-if="recipe.note" class="card-note">
+              {{ cardLang === 'en' ? '📝 ' + recipe.note : '📝 ' + recipe.note }}
            </div>

-            <!-- Logo left + Date right -->
-            <div class="ec-bottom">
-              <img v-if="brand.brand_logo" :src="brand.brand_logo" crossorigin="anonymous" class="ec-logo" />
-              <span v-else></span>
-              <span class="ec-date">{{ cardLang === 'en' ? 'Date: ' : '制作日期：' }}{{ todayStr }}</span>
+            <!-- Total cost bar -->
+            <div class="card-total">
+              <div class="card-total-label">
+                {{ cardLang === 'en' ? 'Total Cost' : '配方总成本' }}
+              </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,13 +124,8 @@
          <button
            v-if="cardLang === 'en' && authStore.canManage"
            class="action-btn"
-            @click="openTranslationEditor"
+            @click="showTranslationEditor = true"
          >✏️ 修改翻译</button>
-          <button
-            v-if="showBrandHint"
-            class="action-btn action-btn-qr"
-            @click="goUploadQr"
-          >📲 上传我的二维码</button>
        </div>

        <!-- Translation editor (inline) -->
@@ -140,7 +156,7 @@
          <div class="editor-header-actions">
            <button class="action-btn action-btn-primary action-btn-sm" @click="saveRecipe">💾 保存</button>
            <button class="action-btn action-btn-sm" @click="previewFromEditor">👁 预览</button>
-            <button class="detail-close-btn" @click="handleEditorClose">✕</button>
+            <button class="detail-close-btn" @click="$emit('close')">✕</button>
          </div>
        </div>

@@ -193,29 +209,10 @@

          <!-- Add ingredient row -->
          <div v-if="showAddRow" class="add-ingredient-row">
-            <div class="oil-autocomplete">
-              <input
-                v-model="oilSearchQuery"
-                @focus="showOilDropdown = true"
-                @blur="closeOilDropdown"
-                @input="newIngOil = ''"
-                class="editor-input oil-search-input"
-                placeholder="搜索精油名称或英文..."
-                autocomplete="off"
-              />
-              <div v-if="showOilDropdown && filteredOilsForAdd.length" class="oil-dropdown">
-                <div
-                  v-for="name in filteredOilsForAdd"
-                  :key="name"
-                  class="oil-dropdown-item"
-                  :class="{ 'is-selected': newIngOil === name }"
-                  @mousedown.prevent="selectNewOil(name)"
-                >
-                  <span>{{ name }}</span>
-                  <span class="oil-dropdown-en">{{ oilEn(name) }}</span>
-                </div>
-              </div>
-            </div>
+            <select v-model="newIngOil" class="editor-select">
+              <option value="">— 选择精油 —</option>
+              <option v-for="name in oilsStore.oilNames" :key="name" :value="name">{{ name }}</option>
+            </select>
            <input
              v-model.number="newIngDrops"
              type="number"
@@ -225,7 +222,7 @@
              class="editor-drops"
            />
            <button class="action-btn action-btn-primary action-btn-sm" @click="confirmAddIngredient">确认</button>
-            <button class="action-btn action-btn-sm" @click="cancelAddRow">取消</button>
+            <button class="action-btn action-btn-sm" @click="showAddRow = false">取消</button>
          </div>
          <button v-else class="add-row-btn" @click="showAddRow = true">+ 添加精油</button>
        </div>
@@ -345,7 +342,6 @@

 <script setup>
 import { ref, computed, onMounted, nextTick, watch } from 'vue'
-import { useRouter } from 'vue-router'
 import html2canvas from 'html2canvas'
 import { useOilsStore, DROPS_PER_ML, VOLUME_DROPS } from '../stores/oils'
 import { useRecipesStore } from '../stores/recipes'
@@ -353,7 +349,6 @@ import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
 import { useDiaryStore } from '../stores/diary'
 import { api } from '../composables/useApi'
-import { showConfirm, showPrompt } from '../composables/useDialog'
 import { oilEn, recipeNameEn } from '../composables/useOilTranslation'
 // TagPicker replaced with inline tag editing

@@ -368,33 +363,22 @@ const recipesStore = useRecipesStore()
 const authStore = useAuthStore()
 const ui = useUiStore()
 const diaryStore = useDiaryStore()
-const router = useRouter()

 // ---- View state ----
 const viewMode = ref('card')
 const cardRef = ref(null)
 const cardImageUrl = ref(null)
 const cardLang = ref('zh')
-const selectedCardVolume = ref('单次')
 const showTranslationEditor = ref(false)
 const customRecipeNameEn = ref('')
 const customOilNameEn = ref({})
 const generatingImage = ref(false)

-// ---- Preview override: holds unsaved editor state when user clicks "预览" ----
-const previewOverride = ref(null)
-
 // ---- Source recipe ----
 const recipe = computed(() =>
  recipesStore.recipes[props.recipeIndex] || { name: '', ingredients: [], tags: [], note: '' }
 )

-// ---- Display recipe: previewOverride when in preview mode, otherwise saved recipe ----
-const displayRecipe = computed(() => {
-  if (!previewOverride.value) return recipe.value
-  return { ...recipe.value, ...previewOverride.value }
-})
-
 const canEditThisRecipe = computed(() => {
  if (authStore.canEdit) return true
  if (authStore.isLoggedIn && recipe.value._owner_id === authStore.user.id) return true
@@ -403,30 +387,14 @@ const canEditThisRecipe = computed(() => {

 const isFav = computed(() => recipesStore.isFavorite(recipe.value))

-// Scale ingredients proportionally to target volume; '单次' = no scaling
-function scaleIngredients(ingredients, volume) {
-  const targetDrops = VOLUME_DROPS[volume]
-  if (!targetDrops) return ingredients  // 单次：不缩放
-  const totalDrops = ingredients.reduce((sum, ing) => sum + (ing.drops || 0), 0)
-  if (totalDrops === 0) return ingredients
-  return ingredients.map(ing => ({
-    ...ing,
-    drops: Math.round(ing.drops * targetDrops / totalDrops),
-  }))
-}
-
-// Card ingredients: scaled to selected volume, coconut oil excluded from display
-const scaledCardIngredients = computed(() =>
-  scaleIngredients(displayRecipe.value.ingredients, selectedCardVolume.value)
-)
-
+// Card ingredients: exclude coconut oil
 const cardIngredients = computed(() =>
-  scaledCardIngredients.value.filter(ing => ing.oil !== '椰子油')
+  recipe.value.ingredients.filter(ing => ing.oil !== '椰子油')
 )

-// Coconut oil drops (from scaled set)
+// Coconut oil drops
 const coconutDrops = computed(() => {
-  const coco = scaledCardIngredients.value.find(ing => ing.oil === '椰子油')
+  const coco = recipe.value.ingredients.find(ing => ing.oil === '椰子油')
  return coco ? coco.drops : 0
 })

@@ -452,7 +420,7 @@ const dilutionDesc = computed(() => {
    : `该配方适用于单次用量（共${totalDrops}滴），其中纯精油 ${totalEoDrops.value} 滴，椰子油 ${coconutDrops.value} 滴，稀释比例为 1:${ratio}`
 })

-const priceInfo = computed(() => oilsStore.fmtCostWithRetail(scaledCardIngredients.value))
+const priceInfo = computed(() => oilsStore.fmtCostWithRetail(recipe.value.ingredients))

 // Today string
 const todayStr = computed(() => {
@@ -483,42 +451,6 @@ async function loadBrand() {
  } catch {
    brand.value = {}
  }
-  // Prompt QR upload: logged-in users once per month, anonymous every time
-  if (showBrandHint.value) {
-    let shouldPrompt = true
-    if (authStore.isLoggedIn) {
-      const lastPrompt = localStorage.getItem('qr_upload_prompt_time')
-      const oneMonth = 30 * 24 * 60 * 60 * 1000
-      if (lastPrompt && Date.now() - Number(lastPrompt) < oneMonth) {
-        shouldPrompt = false
-      } else {
-        localStorage.setItem('qr_upload_prompt_time', String(Date.now()))
-      }
-    }
-    if (shouldPrompt) {
-      const ok = await showConfirm(
-        '上传你的专属二维码，让配方卡片更专业 ✨',
-        { okText: '去上传', cancelText: '下次再说' }
-      )
-      if (ok) goUploadQr()
-    }
-  }
-}
-
-// Whether to show the brand/QR upload hint (show to all users who haven't set up brand assets)
-const showBrandHint = computed(() =>
-  !!brand.value && !brand.value.qr_code && !brand.value.brand_bg
-)
-
-function goUploadQr() {
-  if (!authStore.isLoggedIn) {
-    ui.openLogin(() => goUploadQr())
-    return
-  }
-  if (recipe.value._id) {
-    localStorage.setItem('oil_return_recipe_id', recipe.value._id)
-  }
-  router.push('/mydiary')
 }

 // ---- Card image generation ----
@@ -551,25 +483,16 @@ function switchLang(lang) {
  nextTick(() => generateCardImage())
 }

-function onCardVolumeChange(ml) {
-  selectedCardVolume.value = ml
-  cardImageUrl.value = null
-  nextTick(() => generateCardImage())
-}
-
 async function saveImage() {
  if (!cardImageUrl.value) {
    await generateCardImage()
  }
  if (!cardImageUrl.value) return
-  const filename = `${recipe.value.name || '配方'}_配方卡`
-  try {
-    const { saveImageFromUrl } = await import('../composables/useSaveImage')
-    await saveImageFromUrl(cardImageUrl.value, filename)
-    ui.showToast('已保存图片')
-  } catch {
-    ui.showToast('保存失败')
-  }
+  const link = document.createElement('a')
+  link.download = `${recipe.value.name || '配方'}_配方卡.png`
+  link.href = cardImageUrl.value
+  link.click()
+  ui.showToast('已保存图片')
 }

 function copyText() {
@@ -580,113 +503,58 @@ function copyText() {
  })
  const total = priceInfo.value.cost
  const text = [
-    displayRecipe.value.name,
+    recipe.value.name,
    '---',
    ...lines,
    '---',
    `总成本: ${total}`,
-    displayRecipe.value.note ? `备注: ${displayRecipe.value.note}` : '',
+    recipe.value.note ? `备注: ${recipe.value.note}` : '',
  ].filter(Boolean).join('\n')

  navigator.clipboard.writeText(text).then(() => {
-    ui.showToast('已复制')
+    ui.showToast('已复制到剪贴板')
  }).catch(() => {
    ui.showToast('复制失败')
  })
 }

-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
-  let failed = 0
-
-  // 1. Save recipe English name to recipes table
-  if (recipe.value._id && customRecipeNameEn.value.trim()) {
+  // Persist en_name to backend
+  if (recipe.value._id && customRecipeNameEn.value) {
    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)
-      failed++
+      ui.showToast('翻译保存失败')
    }
  }
-
-  // 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)
-    if (showTranslationEditor.value && customOilNameEn.value[name]) {
-      return customOilNameEn.value[name]
-    }
-    return getOilEnglish(name) || name
+    return customOilNameEn.value[name] || oilEn(name) || name
  }
  return name
 }

 function getCardRecipeName() {
  if (cardLang.value === 'en') {
-    return customRecipeNameEn.value || displayRecipe.value.en_name || recipeNameEn(displayRecipe.value.name)
+    return customRecipeNameEn.value || recipe.value.en_name || recipeNameEn(recipe.value.name)
  }
-  return displayRecipe.value.name
+  return recipe.value.name
 }

 // ---- Favorite ----
 async function handleToggleFavorite() {
  if (!authStore.isLoggedIn) {
-    ui.openLogin(() => handleToggleFavorite())
+    ui.openLogin()
    return
  }
  if (!recipe.value._id) {
@@ -705,30 +573,21 @@ async function handleToggleFavorite() {
 // ---- Save to diary ----
 async function saveToDiary() {
  if (!authStore.isLoggedIn) {
-    ui.openLogin(() => 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('请输入配方名称')
+    ui.openLogin()
    return
  }
+  const name = prompt('保存为我的配方，名称：', recipe.value.name)
+  if (!name) return
  try {
-    const payload = {
-      name: name.trim(),
+    await api.post('/api/diary', {
+      name,
+      source_recipe_id: recipe.value._id || null,
+      ingredients: recipe.value.ingredients.map(i => ({ oil: i.oil, drops: i.drops })),
      note: recipe.value.note || '',
-      ingredients: recipe.value.ingredients.map(i => ({ oil_name: i.oil, drops: i.drops })),
-      tags: recipe.value.tags || [],
-    }
-    console.log('[saveToDiary] saving recipe:', payload)
-    await recipesStore.saveRecipe(payload)
-    ui.showToast('已保存！可在「配方查询 → 我的配方」查看')
+    })
+    ui.showToast('已保存到「我的配方日记」')
  } catch (e) {
-    console.error('[saveToDiary] failed:', e)
-    ui.showToast('保存失败：' + (e?.message || e?.status || '未知错误'), 3000)
+    ui.showToast('保存失败: ' + (e?.message || '未知错误'))
  }
 }

@@ -742,36 +601,6 @@ const newIngOil = ref('')
 const newIngDrops = ref(1)
 const newTagInput = ref('')

-// Oil autocomplete for add-ingredient row
-const oilSearchQuery = ref('')
-const showOilDropdown = ref(false)
-
-const filteredOilsForAdd = computed(() => {
-  const q = oilSearchQuery.value.trim().toLowerCase()
-  if (!q) return oilsStore.oilNames
-  return oilsStore.oilNames.filter(n => {
-    const en = oilEn(n).toLowerCase()
-    return n.includes(q) || en.startsWith(q) || en.includes(q)
-  })
-})
-
-function selectNewOil(name) {
-  newIngOil.value = name
-  oilSearchQuery.value = name
-  showOilDropdown.value = false
-}
-
-function closeOilDropdown() {
-  setTimeout(() => { showOilDropdown.value = false }, 150)
-}
-
-function cancelAddRow() {
-  showAddRow.value = false
-  newIngOil.value = ''
-  oilSearchQuery.value = ''
-  newIngDrops.value = 1
-}
-
 // Volume & dilution
 const selectedVolume = ref('single')
 const customVolumeValue = ref(100)
@@ -852,7 +681,6 @@ function confirmAddIngredient() {
  }
  editIngredients.value.push({ oil: newIngOil.value, drops: newIngDrops.value })
  newIngOil.value = ''
-  oilSearchQuery.value = ''
  newIngDrops.value = 1
  showAddRow.value = false
 }
@@ -945,44 +773,9 @@ function setCoconutDrops(drops) {
  }
 }

-// Handle close from card view — if previewing unsaved data, ask user
-async function handleClose() {
-  if (previewOverride.value !== null) {
-    const save = await showConfirm('还有未保存的修改，是否保存？', { okText: '保存', cancelText: '不保存' })
-    if (save) {
-      viewMode.value = 'editor'
-      await nextTick()
-      await saveRecipe()
-      return
-    }
-    previewOverride.value = null
-  }
-  emit('close')
-}
-
-// Handle close from editor view
-async function handleEditorClose() {
-  if (previewOverride.value !== null) {
-    // Came from preview, back to preview without saving
-    previewOverride.value = null
-    viewMode.value = 'card'
-    cardImageUrl.value = null
-    nextTick(() => generateCardImage())
-    return
-  }
-  emit('close')
-}
-
 function previewFromEditor() {
-  // Capture current editor state and show it in card view
-  previewOverride.value = {
-    name: editName.value.trim() || recipe.value.name,
-    note: editNote.value.trim(),
-    tags: [...editTags.value],
-    ingredients: editIngredients.value
-      .filter(i => i.oil && i.drops > 0)
-      .map(i => ({ oil: i.oil, drops: i.drops })),
-  }
+  // Temporarily update recipe view with editor data, switch to card
+  // We just switch to card mode; the card shows the saved recipe
  viewMode.value = 'card'
  cardImageUrl.value = null
  nextTick(() => generateCardImage())
@@ -1008,14 +801,9 @@ async function saveRecipe() {
      ingredients: ingredients.map(i => ({ oil_name: i.oil, drops: i.drops })),
    }
    await recipesStore.saveRecipe(payload)
-    // Reload recipes so the data is fresh when re-opened
    await recipesStore.loadRecipes()
    ui.showToast('保存成功')
-    // Go to card view instead of closing
-    previewOverride.value = null
-    viewMode.value = 'card'
-    cardImageUrl.value = null
-    nextTick(() => generateCardImage())
+    emit('close')
  } catch (e) {
    ui.showToast('保存失败: ' + (e?.message || '未知错误'))
  }
@@ -1142,106 +930,9 @@ async function saveRecipe() {
  border-radius: 50%;
 }

-/* ===== Export Card Content (responsive) ===== */
-.ec-subtitle {
-  font-size: 11px;
-  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; }
+.card-content {
+  position: relative;
+  z-index: 2;
 }

 /* Brand overlays */
@@ -1250,57 +941,32 @@ async function saveRecipe() {
  inset: 0;
  width: 100%;
  height: 100%;
-  background-size: cover;
-  background-position: center;
-  background-repeat: no-repeat;
-  opacity: 0.12;
+  object-fit: cover;
+  opacity: 0.06;
  z-index: 0;
  pointer-events: none;
 }

-.card-qr-wrapper {
-  position: absolute;
-  top: 36px;
-  right: 36px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 3px;
-  z-index: 3;
-}
-
 .card-qr {
-  width: 54px;
-  height: 54px;
-  object-fit: cover;
-  border-radius: 6px;
-  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-}
-
-.card-qr-name {
-  font-size: 7px;
-  color: var(--text-light, #8a7a6a);
-  text-align: center;
-  line-height: 1.3;
-  max-width: 68px;
-  white-space: pre-line;
+  position: absolute;
+  top: 16px;
+  right: 16px;
+  width: 64px;
+  height: 64px;
+  object-fit: contain;
+  z-index: 3;
+  opacity: 0.85;
 }

 .card-logo {
+  position: absolute;
+  bottom: 16px;
+  left: 50%;
+  transform: translateX(-50%);
  height: 28px;
  object-fit: contain;
-  opacity: 0.6;
-}
-.card-logo-placeholder {
-  /* 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;
+  z-index: 3;
+  opacity: 0.3;
 }

 .card-brand-text {
@@ -1399,7 +1065,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 {
@@ -1424,7 +1089,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;
@@ -1480,42 +1146,6 @@ async function saveRecipe() {
  background: var(--sage-mist, #eef4ee);
 }

-/* Brand upload hint banner */
-.brand-upload-hint {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  background: linear-gradient(135deg, #eef4ee, #f5f0e8);
-  border: 1.5px dashed var(--sage-light, #c8ddc9);
-  border-radius: 10px;
-  padding: 10px 16px;
-  margin-bottom: 14px;
-  font-size: 13px;
-  color: var(--sage-dark, #5a7d5e);
-  font-weight: 500;
-  animation: hint-pop 0.3s ease;
-}
-
-.hint-icon {
-  font-size: 18px;
-  flex-shrink: 0;
-}
-
-@keyframes hint-pop {
-  from { opacity: 0; transform: translateY(-6px); }
-  to   { opacity: 1; transform: translateY(0); }
-}
-
-.action-btn-qr {
-  background: linear-gradient(135deg, #c8ddc9, var(--sage, #7a9e7e));
-  color: #fff;
-  border-color: transparent;
-}
-
-.action-btn-qr:hover {
-  opacity: 0.88;
-}
-
 /* Card bottom actions */
 .card-bottom-actions {
  display: flex;
@@ -1773,10 +1403,6 @@ async function saveRecipe() {
  margin-bottom: 10px;
 }

-.card-volume-controls {
-  margin: 8px 0 12px;
-}
-
 .volume-btn {
  padding: 7px 16px;
  border: 1.5px solid var(--border, #e0d4c0);
@@ -1940,70 +1566,6 @@ async function saveRecipe() {
  cursor: not-allowed;
 }

-/* Card volume toggle */
-.card-volume-toggle {
-  display: flex;
-  gap: 6px;
-  flex-wrap: wrap;
-  justify-content: center;
-  margin-bottom: 12px;
-}
-
-/* Oil autocomplete */
-.oil-autocomplete {
-  position: relative;
-  flex: 1;
-  min-width: 140px;
-}
-
-.oil-search-input {
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.oil-dropdown {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  right: 0;
-  background: #fff;
-  border: 1.5px solid var(--sage, #7a9e7e);
-  border-radius: 10px;
-  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.1);
-  max-height: 220px;
-  overflow-y: auto;
-  z-index: 100;
-  margin-top: 4px;
-}
-
-.oil-dropdown-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 9px 14px;
-  cursor: pointer;
-  font-size: 13px;
-  color: var(--text-dark, #2c2416);
-  border-bottom: 1px solid var(--border, #e0d4c0);
-  transition: background 0.1s;
-}
-
-.oil-dropdown-item:last-child {
-  border-bottom: none;
-}
-
-.oil-dropdown-item:hover,
-.oil-dropdown-item.is-selected {
-  background: var(--sage-mist, #eef4ee);
-}
-
-.oil-dropdown-en {
-  font-size: 11px;
-  color: var(--text-light, #9a8570);
-  margin-left: 8px;
-  white-space: nowrap;
-}
-
 /* Responsive */
@media (max-width: 600px) {
  .detail-panel {
--- a/frontend/src/components/UserMenu.vue
+++ b/frontend/src/components/UserMenu.vue
@@ -2,6 +2,9 @@
  <div class="usermenu-overlay" @click.self="$emit('close')">
    <div class="usermenu-card">
      <div class="usermenu-name">{{ auth.user.display_name || auth.user.username }}</div>
+      <div class="usermenu-role">
+        <span class="role-badge">{{ roleLabel }}</span>
+      </div>

      <div class="usermenu-actions">
        <button class="usermenu-btn" @click="goMyDiary">
@@ -68,6 +71,16 @@ const bugContent = ref('')

 const unreadCount = computed(() => notifications.value.filter(n => !n.is_read).length)

+const roleLabel = computed(() => {
+  const map = {
+    admin: '管理员',
+    senior_editor: '高级编辑',
+    editor: '编辑',
+    viewer: '查看者',
+  }
+  return map[auth.user.role] || auth.user.role
+})
+
 function formatTime(d) {
  if (!d) return ''
  return new Date(d + 'Z').toLocaleString('zh-CN', { month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' })
@@ -123,11 +136,7 @@ function handleLogout() {
  auth.logout()
  ui.showToast('已退出登录')
  emit('close')
-  if (router.currentRoute.value.meta.requiresAuth) {
-    router.push('/')
-  } else {
-    window.location.reload()
-  }
+  window.location.reload()
 }

 onMounted(loadNotifications)
@@ -153,7 +162,13 @@ onMounted(loadNotifications)
  z-index: 4001;
 }

-.usermenu-name { font-size: 16px; font-weight: 600; color: #3e3a44; margin-bottom: 14px; }
+.usermenu-name { font-size: 16px; font-weight: 600; color: #3e3a44; margin-bottom: 4px; }
+.usermenu-role { margin-bottom: 14px; }
+.role-badge {
+  display: inline-block; font-size: 11px; padding: 2px 10px;
+  border-radius: 8px; background: linear-gradient(135deg, #e8f5e9, #c8e6c9);
+  color: #4a9d7e; font-weight: 500;
+}

 .usermenu-actions { display: flex; flex-direction: column; gap: 4px; }
 .usermenu-btn {
--- a/frontend/src/composables/useDialog.js
+++ b/frontend/src/composables/useDialog.js
@@ -5,8 +5,6 @@ export const dialogState = reactive({
  type: 'alert', // 'alert', 'confirm', 'prompt'
  message: '',
  defaultValue: '',
-  okText: '',
-  cancelText: '',
  resolve: null
 })

@@ -15,19 +13,15 @@ export function showAlert(msg) {
    dialogState.visible = true
    dialogState.type = 'alert'
    dialogState.message = msg
-    dialogState.okText = ''
-    dialogState.cancelText = ''
    dialogState.resolve = resolve
  })
 }

-export function showConfirm(msg, opts = {}) {
+export function showConfirm(msg) {
  return new Promise(resolve => {
    dialogState.visible = true
    dialogState.type = 'confirm'
    dialogState.message = msg
-    dialogState.okText = opts.okText || ''
-    dialogState.cancelText = opts.cancelText || ''
    dialogState.resolve = resolve
  })
 }
--- a/frontend/src/composables/useOilCards.js
+++ b/frontend/src/composables/useOilCards.js
@@ -39,11 +39,3 @@ export function getOilCard(name) {
  if (base !== name && OIL_CARDS[base]) return OIL_CARDS[base]
  return null
 }
-
-export function setOilCard(name, card) {
-  if (card && (card.effects || card.usage)) {
-    OIL_CARDS[name] = card
-  } else {
-    delete OIL_CARDS[name]
-  }
-}
--- a/frontend/src/composables/useOilTranslation.js
+++ b/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',
-  '乐活复方': 'Balance', '乐活': 'DigestZen',
-  '舒缓复方': 'Past Tense', '舒缓': 'Deep Blue',
-  '净化复方': 'Purify', '净化清新': 'Purify',
-  '呼吸复方': 'Breathe', '顺畅呼吸': 'Breathe',
-  '舒压复方': 'Adaptiv', '安定情绪': 'Balance',
-  '安宁神气': 'Serenity', '多特瑞': 'doTERRA',
-  '野橘': 'Wild Orange', '柑橘清新': 'Citrus Bliss',
-  '新瑞活力': 'MetaPWR', '元气': 'Zendocrine',
-  '温柔呵护': 'ClaryCalm', '西洋蓍草': 'Yarrow|Pom',
-  '西班牙牛至': 'Oregano',
+  '芳香调理': 'AromaTouch', '保卫复方': 'On Guard',
+  '乐活复方': 'Balance', '舒缓复方': 'Past Tense',
+  '净化复方': 'Purify', '呼吸复方': 'Breathe',
+  '舒压复方': 'Adaptiv', '多特瑞': 'doTERRA',
 }

 export function oilEn(name) {
-  if (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 ''
+  return OIL_EN[name] || ''
 }

 export function recipeNameEn(name) {
--- a/frontend/src/composables/useSaveImage.js
+++ b/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'
-}
--- a/frontend/src/router/index.js
+++ b/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 },
  },
 ]

--- a/frontend/src/stores/oils.js
+++ b/frontend/src/stores/oils.js
@@ -5,7 +5,6 @@ import { api } from '../composables/useApi'
 export const DROPS_PER_ML = 18.6

 export const VOLUME_DROPS = {
-  '单次': null,
  '2.5': 46,
  '5': 93,
  '10': 186,
@@ -68,21 +67,19 @@ export const useOilsStore = defineStore('oils', () => {
        bottlePrice: oil.bottle_price,
        dropCount: oil.drop_count,
        retailPrice: oil.retail_price ?? null,
-        isActive: oil.is_active !== 0,
-        enName: oil.en_name ?? null,
+        isActive: oil.is_active ?? true,
      }
    }
    oils.value = newOils
    oilsMeta.value = newMeta
  }

-  async function saveOil(name, bottlePrice, dropCount, retailPrice, enName = null) {
+  async function saveOil(name, bottlePrice, dropCount, retailPrice) {
    await api.post('/api/oils', {
      name,
      bottle_price: bottlePrice,
      drop_count: dropCount,
      retail_price: retailPrice,
-      en_name: enName,
    })
    await loadOils()
  }
--- a/frontend/src/stores/recipes.js
+++ b/frontend/src/stores/recipes.js
@@ -53,12 +53,7 @@ export const useRecipesStore = defineStore('recipes', () => {
      return data
    } else {
      const data = await api.post('/api/recipes', recipe)
-      // Refresh list; if refresh fails, still return success (recipe was saved)
-      try {
-        await loadRecipes()
-      } catch (e) {
-        console.warn('[saveRecipe] loadRecipes failed after save:', e)
-      }
+      await loadRecipes()
      return data
    }
  }
--- a/frontend/src/stores/ui.js
+++ b/frontend/src/stores/ui.js
@@ -5,7 +5,6 @@ export const useUiStore = defineStore('ui', () => {
  const currentSection = ref('search')
  const showLoginModal = ref(false)
  const toasts = ref([])
-  const pendingAction = ref(null)

  let toastId = 0

@@ -21,10 +20,7 @@ export const useUiStore = defineStore('ui', () => {
    }, duration)
  }

-  function openLogin(afterLogin) {
-    if (afterLogin) {
-      pendingAction.value = afterLogin
-    }
+  function openLogin() {
    showLoginModal.value = true
  }

@@ -32,23 +28,13 @@ export const useUiStore = defineStore('ui', () => {
    showLoginModal.value = false
  }

-  function runPendingAction() {
-    if (pendingAction.value) {
-      const action = pendingAction.value
-      pendingAction.value = null
-      action()
-    }
-  }
-
  return {
    currentSection,
    showLoginModal,
    toasts,
-    pendingAction,
    showSection,
    showToast,
    openLogin,
    closeLogin,
-    runPendingAction,
  }
 })
--- a/frontend/src/views/MyDiary.vue
+++ b/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 === 'account' }" @click="activeTab = 'account'">👤 我的账户</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'">👤 Account</button>
    </div>

    <!-- Diary Tab -->
@@ -107,100 +107,38 @@

    <!-- Brand Tab -->
    <div v-if="activeTab === 'brand'" class="tab-content">
-      <!-- Back to recipe card (when navigated from a recipe) -->
-      <div v-if="returnRecipeId" class="return-banner">
-        <span>📋 上传完成后可返回配方卡片</span>
-        <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>
-          <textarea v-model="brandName" class="form-control" rows="2" placeholder="扫码申请成为优惠顾客&#10;我的精油小屋" style="max-width:350px;font-size:13px" @blur="saveBrandSettings"></textarea>
-          <div style="display:flex;gap:6px;margin-top:6px">
-            <button class="btn-align" :class="{ active: brandAlign === 'left' }" @click="brandAlign='left'; saveBrandSettings()">靠左</button>
-            <button class="btn-align" :class="{ active: brandAlign === 'center' }" @click="brandAlign='center'; saveBrandSettings()">居中</button>
-            <button class="btn-align" :class="{ active: brandAlign === 'right' }" @click="brandAlign='right'; saveBrandSettings()">靠右</button>
+          <label>品牌名称</label>
+          <input v-model="brandName" class="form-input" placeholder="您的品牌名称" @blur="saveBrandSettings" />
+        </div>
+
+        <div class="form-group">
+          <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 style="margin-bottom:16px">
-          <label class="form-label">📋 配方卡片预览</label>
-          <div class="card-preview-mini">
-            <!-- Background overlay -->
-            <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 class="form-group">
+          <label>品牌Logo</label>
+          <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)" />
        </div>

-        <div style="display:flex;gap:8px;align-items:center">
-          <button class="btn btn-primary" @click="saveBrandSettings">💾 保存品牌设置</button>
-          <button v-if="returnRecipeId" class="btn btn-outline" @click="goBackToRecipe">← 返回配方卡片</button>
+        <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)" />
        </div>
      </div>
    </div>
@@ -221,6 +159,10 @@
          <div class="form-static">{{ auth.user.username }}</div>
        </div>

+        <div class="form-group">
+          <label>角色</label>
+          <div class="form-static role-badge">{{ roleLabel }}</div>
+        </div>
      </div>

      <div class="section-card">
@@ -259,8 +201,7 @@
 </template>

 <script setup>
-import { ref, onMounted, watch } from 'vue'
-import { useRouter } from 'vue-router'
+import { ref, computed, onMounted, watch } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useDiaryStore } from '../stores/diary'
@@ -273,25 +214,20 @@ const auth = useAuthStore()
 const oils = useOilsStore()
 const diaryStore = useDiaryStore()
 const ui = useUiStore()
-const router = useRouter()

 const activeTab = ref('brand')
 const pasteText = ref('')
 const selectedDiaryId = ref(null)
-const returnRecipeId = ref(null)
 const selectedDiary = ref(null)
 const newEntryText = ref('')

 // Brand settings
 const brandName = ref('')
 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)

 // Account settings
 const displayName = ref('')
@@ -300,20 +236,22 @@ const newPassword = ref('')
 const confirmPassword = ref('')
 const businessReason = ref('')

+const roleLabel = computed(() => {
+  const roles = {
+    admin: '管理员',
+    senior_editor: '高级编辑',
+    editor: '编辑',
+    viewer: '查看者',
+  }
+  return roles[auth.user.role] || auth.user.role
+})
+
 onMounted(async () => {
  await diaryStore.loadDiary()
  displayName.value = auth.user.display_name || ''
  await loadBrandSettings()
-  returnRecipeId.value = localStorage.getItem('oil_return_recipe_id') || null
 })

-function goBackToRecipe() {
-  if (returnRecipeId.value) {
-    localStorage.removeItem('oil_return_recipe_id')
-    router.push('/?openRecipe=' + encodeURIComponent(returnRecipeId.value))
-  }
-}
-
 function selectDiary(d) {
  const id = d._id || d.id
  selectedDiaryId.value = id
@@ -407,10 +345,8 @@ async function loadBrandSettings() {
      const data = await res.json()
      brandName.value = data.brand_name || ''
      brandQrUrl.value = data.qr_url || ''
-      brandQrImage.value = data.qr_code || ''
-      brandLogo.value = data.brand_logo || ''
-      brandBg.value = data.brand_bg || ''
-      brandAlign.value = data.brand_align || 'center'
+      brandLogo.value = data.logo_url || ''
+      brandBg.value = data.bg_url || ''
    }
  } catch {
    // no brand settings yet
@@ -419,158 +355,44 @@ 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
  }
 }

 function triggerUpload(type) {
  if (type === 'logo') logoInput.value?.click()
-  else if (type === 'bg') bgInput.value?.click()
-  else if (type === 'qr') qrInput.value?.click()
-}
-
-function readFileAsBase64(file) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader()
-    reader.onload = e => resolve(e.target.result)
-    reader.onerror = reject
-    reader.readAsDataURL(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
-  })
+  else bgInput.value?.click()
 }

 async function handleUpload(type, event) {
  const file = event.target.files[0]
  if (!file) return
+  const formData = new FormData()
+  formData.append('file', file)
+  formData.append('type', type)
  try {
-    let 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 }),
+    const token = localStorage.getItem('oil_auth_token') || ''
+    const res = await fetch('/api/brand-upload', {
+      method: 'POST',
+      headers: token ? { Authorization: 'Bearer ' + token } : {},
+      body: formData,
    })
    if (res.ok) {
-      if (type === 'logo') brandLogo.value = base64
-      else if (type === 'bg') brandBg.value = base64
-      else if (type === 'qr') brandQrImage.value = base64
-      ui.showToast('上传成功 ✓')
-    } else {
-      const err = await res.json().catch(() => ({}))
-      ui.showToast('上传失败: ' + (err.detail || res.status))
+      const data = await res.json()
+      if (type === 'logo') brandLogo.value = data.url
+      else brandBg.value = data.url
+      ui.showToast('上传成功')
    }
-  } catch (e) {
-    ui.showToast('上传出错: ' + (e.message || '网络错误'))
-  }
-  // 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]
-  try {
-    await api('/api/brand', {
-      method: 'PUT',
-      body: JSON.stringify({ [field]: null }),
-    })
-    if (type === 'logo') brandLogo.value = ''
-    else if (type === 'bg') brandBg.value = ''
-    else if (type === 'qr') brandQrImage.value = ''
-    ui.showToast('已清除')
  } catch {
-    ui.showToast('清除失败')
+    ui.showToast('上传失败')
  }
 }

@@ -896,39 +718,6 @@ async function applyBusiness() {
  border-color: #7ec6a4;
 }

-/* Return banner */
-.return-banner {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background: #f0faf5;
-  border: 1.5px solid #7ec6a4;
-  border-radius: 12px;
-  padding: 10px 14px;
-  margin-bottom: 14px;
-  font-size: 13px;
-  color: #3e7d5a;
-  gap: 10px;
-}
-
-.btn-return {
-  background: linear-gradient(135deg, #7ec6a4 0%, #4a9d7e 100%);
-  color: #fff;
-  border: none;
-  border-radius: 8px;
-  padding: 6px 14px;
-  font-size: 12px;
-  cursor: pointer;
-  font-family: inherit;
-  font-weight: 500;
-  white-space: nowrap;
-  flex-shrink: 0;
-}
-
-.btn-return:hover {
-  opacity: 0.9;
-}
-
 /* Brand */
 .form-group {
  margin-bottom: 14px;
@@ -950,6 +739,22 @@ async function applyBusiness() {
  color: #6b6375;
 }

+.role-badge {
+  display: inline-block;
+}
+
+.qr-preview {
+  margin-top: 10px;
+  text-align: center;
+}
+
+.qr-img {
+  width: 120px;
+  height: 120px;
+  border-radius: 8px;
+  border: 1.5px solid #e5e4e7;
+}
+
 .upload-area {
  width: 100%;
  min-height: 80px;
@@ -967,18 +772,6 @@ async function applyBusiness() {
  border-color: #7ec6a4;
 }

-.qr-preview {
-  margin-top: 10px;
-  text-align: center;
-}
-
-.qr-img {
-  width: 120px;
-  height: 120px;
-  border-radius: 8px;
-  border: 1.5px solid #e5e4e7;
-}
-
 .upload-preview {
  max-width: 80px;
  max-height: 80px;
@@ -990,78 +783,11 @@ async function applyBusiness() {
  max-height: 100px;
 }

-.qr-upload-preview {
-  max-width: 120px;
-  max-height: 120px;
-}
-
-.field-hint {
-  font-size: 12px;
-  color: #9b94a3;
-  margin-top: 4px;
-  padding-left: 2px;
-}
-
 .upload-hint {
  font-size: 13px;
  color: #b0aab5;
 }

-/* Upload box (matching initial commit style) */
-.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;
-  background: none;
-  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 {
  font-size: 13px;
  color: #6b6375;
--- a/frontend/src/views/OilReference.vue
+++ b/frontend/src/views/OilReference.vue
--- a/frontend/src/views/RecipeManager.vue
+++ b/frontend/src/views/RecipeManager.vue
@@ -58,33 +58,40 @@
      <button class="btn-sm btn-outline" @click="clearSelection">取消选择</button>
    </div>

-    <!-- My Recipes Section (from diary) -->
+    <!-- My Recipes Section -->
    <div class="recipe-section">
      <h3 class="section-title">📖 我的配方 ({{ myRecipes.length }})</h3>
      <div class="recipe-list">
        <div
-          v-for="d in myFilteredRecipes"
-          :key="'diary-' + d.id"
-          class="recipe-row diary-row"
+          v-for="r in myFilteredRecipes"
+          :key="r._id"
+          class="recipe-row"
+          :class="{ selected: selectedIds.has(r._id) }"
        >
-          <div class="row-info" @click="editDiaryRecipe(d)">
-            <span class="row-name">{{ d.name }}</span>
+          <input
+            type="checkbox"
+            :checked="selectedIds.has(r._id)"
+            @change="toggleSelect(r._id)"
+            class="row-check"
+          />
+          <div class="row-info" @click="editRecipe(r)">
+            <span class="row-name">{{ r.name }}</span>
            <span class="row-tags">
-              <span v-for="t in (d.tags || [])" :key="t" class="mini-tag">{{ t }}</span>
+              <span v-for="t in r.tags" :key="t" class="mini-tag">{{ t }}</span>
            </span>
-            <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
+            <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(r.ingredients)) }}</span>
          </div>
          <div class="row-actions">
-            <button class="btn-icon" @click="editDiaryRecipe(d)" title="编辑">✏️</button>
-            <button class="btn-icon" @click="removeDiaryRecipe(d)" title="删除">🗑️</button>
+            <button class="btn-icon" @click="editRecipe(r)" title="编辑">✏️</button>
+            <button class="btn-icon" @click="removeRecipe(r)" title="删除">🗑️</button>
          </div>
        </div>
        <div v-if="myFilteredRecipes.length === 0" class="empty-hint">暂无个人配方</div>
      </div>
    </div>

-    <!-- Public Recipes Section -->
-    <div class="recipe-section">
+    <!-- Public Recipes Section (admin/senior_editor only) -->
+    <div v-if="auth.canManage" class="recipe-section">
      <h3 class="section-title">🌿 公共配方库 ({{ publicRecipes.length }})</h3>
      <div class="recipe-list">
        <div
@@ -196,11 +203,10 @@
 </template>

 <script setup>
-import { ref, computed, reactive, onMounted, watch } from 'vue'
+import { ref, computed, reactive } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useRecipesStore } from '../stores/recipes'
-import { useDiaryStore } from '../stores/diary'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
 import { showConfirm, showPrompt } from '../composables/useDialog'
@@ -211,7 +217,6 @@ import TagPicker from '../components/TagPicker.vue'
 const auth = useAuthStore()
 const oils = useOilsStore()
 const recipeStore = useRecipesStore()
-const diaryStore = useDiaryStore()
 const ui = useUiStore()

 const manageSearch = ref('')
@@ -238,11 +243,13 @@ const tagPickerName = ref('')
 const tagPickerTags = ref([])

 // Computed lists
-// "我的配方" = diary (user_diary table), personal recipes
-const myRecipes = computed(() => diaryStore.userDiary)
+const myRecipes = computed(() =>
+  recipeStore.recipes.filter(r => r._owner_id === auth.user.id)
+)

-// "公共配方库" = all recipes in public library (recipes table)
-const publicRecipes = computed(() => recipeStore.recipes)
+const publicRecipes = computed(() =>
+  recipeStore.recipes.filter(r => r._owner_id !== auth.user.id)
+)

 function filterBySearchAndTags(list) {
  let result = list
@@ -250,7 +257,7 @@ function filterBySearchAndTags(list) {
  if (q) {
    result = result.filter(r =>
      r.name.toLowerCase().includes(q) ||
-      (r.ingredients || []).some(ing => (ing.oil || '').toLowerCase().includes(q)) ||
+      r.ingredients.some(ing => ing.oil.toLowerCase().includes(q)) ||
      (r.tags && r.tags.some(t => t.toLowerCase().includes(q)))
    )
  }
@@ -394,30 +401,6 @@ async function saveCurrentRecipe() {
  }
 }

-// Load diary on mount
-onMounted(async () => {
-  if (auth.isLoggedIn) {
-    await diaryStore.loadDiary()
-  }
-})
-
-function editDiaryRecipe(diary) {
-  // For now, navigate to MyDiary page to edit
-  // TODO: inline editing
-  ui.showToast('请到「我的」页面编辑个人配方')
-}
-
-async function removeDiaryRecipe(diary) {
-  const ok = await showConfirm(`确定删除个人配方 "${diary.name}"？`)
-  if (!ok) return
-  try {
-    await diaryStore.deleteDiary(diary.id)
-    ui.showToast('已删除')
-  } catch {
-    ui.showToast('删除失败')
-  }
-}
-
 async function removeRecipe(recipe) {
  const ok = await showConfirm(`确定删除配方 "${recipe.name}"？`)
  if (!ok) return
@@ -431,8 +414,10 @@ async function removeRecipe(recipe) {

 async function approveRecipe(recipe) {
  try {
-    await api('/api/recipes/' + recipe._id + '/adopt', { method: 'POST' })
-    ui.showToast('已采纳')
+    await api('/api/recipes/' + recipe._id + '/approve', { method: 'POST' })
+    pendingRecipes.value = pendingRecipes.value.filter(r => r._id !== recipe._id)
+    pendingCount.value--
+    ui.showToast('已通过')
    await recipeStore.loadRecipes()
  } catch {
    ui.showToast('操作失败')
@@ -440,11 +425,11 @@ async function approveRecipe(recipe) {
 }

 async function rejectRecipe(recipe) {
-  const ok = await showConfirm(`确定删除「${recipe.name}」？`)
-  if (!ok) return
  try {
-    await recipeStore.deleteRecipe(recipe._id)
-    ui.showToast('已删除')
+    await api('/api/recipes/' + recipe._id + '/reject', { method: 'POST' })
+    pendingRecipes.value = pendingRecipes.value.filter(r => r._id !== recipe._id)
+    pendingCount.value--
+    ui.showToast('已拒绝')
  } catch {
    ui.showToast('操作失败')
  }
@@ -472,13 +457,16 @@ function onTagPickerSave(tags) {
  showTagPicker.value = false
 }

-watch(() => recipeStore.recipes, () => {
-  if (auth.isAdmin) {
-    const pending = recipeStore.recipes.filter(r => r._owner_id && r._owner_id !== auth.user.id)
-    pendingRecipes.value = pending
-    pendingCount.value = pending.length
-  }
-}, { immediate: true })
+// Load pending if admin
+if (auth.isAdmin) {
+  api('/api/recipes/pending').then(async res => {
+    if (res.ok) {
+      const data = await res.json()
+      pendingRecipes.value = data
+      pendingCount.value = data.length
+    }
+  }).catch(() => {})
+}
 </script>

 <style scoped>
--- a/frontend/src/views/RecipeSearch.vue
+++ b/frontend/src/views/RecipeSearch.vue
@@ -50,33 +50,28 @@
    <!-- Personal Section (logged in) -->
    <div v-if="auth.isLoggedIn" class="personal-section">
      <div class="section-header" @click="showMyRecipes = !showMyRecipes">
-        <span>📖 我的配方 ({{ myDiaryRecipes.length }})</span>
+        <span>📖 我的配方</span>
        <span class="toggle-icon">{{ showMyRecipes ? '▾' : '▸' }}</span>
      </div>
      <div v-if="showMyRecipes" class="recipe-grid">
-        <div
-          v-for="d in myDiaryRecipes"
-          :key="'diary-' + d.id"
-          class="recipe-card diary-card"
-          @click="openDiaryDetail(d)"
-        >
-          <div class="card-name">{{ d.name }}</div>
-          <div class="card-oils">{{ (d.ingredients || []).map(i => i.oil).join('、') }}</div>
-          <div class="card-bottom">
-            <span class="card-price">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
-            <button class="share-btn" @click.stop="shareDiaryToPublic(d)" title="共享到公共配方库">📤</button>
-          </div>
-        </div>
-        <div v-if="myDiaryRecipes.length === 0" class="empty-hint">暂无个人配方</div>
+        <RecipeCard
+          v-for="(r, i) in myRecipesPreview"
+          :key="r._id"
+          :recipe="r"
+          :index="findGlobalIndex(r)"
+          @click="openDetail(findGlobalIndex(r))"
+          @toggle-fav="handleToggleFav(r)"
+        />
+        <div v-if="myRecipesPreview.length === 0" class="empty-hint">暂无个人配方</div>
      </div>

      <div class="section-header" @click="showFavorites = !showFavorites">
-        <span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
+        <span>⭐ 收藏配方</span>
        <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
      </div>
      <div v-if="showFavorites" class="recipe-grid">
        <RecipeCard
-          v-for="r in favoritesPreview"
+          v-for="(r, i) in favoritesPreview"
          :key="r._id"
          :recipe="r"
          :index="findGlobalIndex(r)"
@@ -87,9 +82,9 @@
      </div>
    </div>

-    <!-- Search Results (public recipes) -->
-    <div v-if="searchQuery" class="search-results-section">
-      <div class="section-label">🔍 公共配方搜索结果 ({{ fuzzyResults.length }})</div>
+    <!-- Fuzzy Search Results -->
+    <div v-if="searchQuery && fuzzyResults.length" class="search-results-section">
+      <div class="section-label">🔍 搜索结果 ({{ fuzzyResults.length }})</div>
      <div class="recipe-grid">
        <RecipeCard
          v-for="(r, i) in fuzzyResults"
@@ -99,12 +94,11 @@
          @click="openDetail(findGlobalIndex(r))"
          @toggle-fav="handleToggleFav(r)"
        />
-        <div v-if="fuzzyResults.length === 0" class="empty-hint">未找到匹配的公共配方</div>
      </div>
    </div>

    <!-- Public Recipe Grid -->
-    <div v-if="!searchQuery">
+    <div v-if="!searchQuery || fuzzyResults.length === 0">
      <div class="section-label">🌿 公共配方库 ({{ filteredRecipes.length }})</div>
      <div class="recipe-grid">
        <RecipeCard
@@ -129,12 +123,10 @@
 </template>

 <script setup>
-import { ref, computed, onMounted, nextTick, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { ref, computed, onMounted, nextTick } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useRecipesStore } from '../stores/recipes'
-import { useDiaryStore } from '../stores/diary'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
 import RecipeCard from '../components/RecipeCard.vue'
@@ -143,10 +135,7 @@ import RecipeDetailOverlay from '../components/RecipeDetailOverlay.vue'
 const auth = useAuthStore()
 const oils = useOilsStore()
 const recipeStore = useRecipesStore()
-const diaryStore = useDiaryStore()
 const ui = useUiStore()
-const route = useRoute()
-const router = useRouter()

 const searchQuery = ref('')
 const selectedCategory = ref(null)
@@ -162,32 +151,8 @@ onMounted(async () => {
    if (res.ok) {
      categories.value = await res.json()
    }
-  } catch {}
-
-  // Load personal diary recipes
-  if (auth.isLoggedIn) {
-    await diaryStore.loadDiary()
-  }
-
-  // Return to a recipe card after QR upload redirect
-  const openRecipeId = route.query.openRecipe
-  if (openRecipeId) {
-    router.replace({ path: '/', query: {} })
-    const tryOpen = () => {
-      const idx = recipeStore.recipes.findIndex(r => String(r._id) === String(openRecipeId))
-      if (idx >= 0) {
-        openDetail(idx)
-        return true
-      }
-      return false
-    }
-    if (!tryOpen()) {
-      // Recipes might not be loaded yet, watch until available
-      const stop = watch(
-        () => recipeStore.recipes.length,
-        () => { if (tryOpen()) stop() },
-      )
-    }
+  } catch {
+    // category modules are optional
  }
 })

@@ -200,7 +165,6 @@ function slideCat(dir) {
  catIdx.value = (catIdx.value + dir + len) % len
 }

-// Public recipes (all recipes in the public library)
 const filteredRecipes = computed(() => {
  let list = recipeStore.recipes
  if (selectedCategory.value) {
@@ -209,7 +173,6 @@ const filteredRecipes = computed(() => {
  return list
 })

-// Search results from public recipes
 const fuzzyResults = computed(() => {
  if (!searchQuery.value.trim()) return []
  const q = searchQuery.value.trim().toLowerCase()
@@ -221,18 +184,11 @@ const fuzzyResults = computed(() => {
  })
 })

-// Personal recipes from diary (separate from public recipes)
-const myDiaryRecipes = computed(() => {
+const myRecipesPreview = computed(() => {
  if (!auth.isLoggedIn) return []
-  let list = diaryStore.userDiary
-  if (searchQuery.value.trim()) {
-    const q = searchQuery.value.trim().toLowerCase()
-    list = list.filter(d => {
-      return d.name.toLowerCase().includes(q) ||
-        (d.ingredients || []).some(ing => ing.oil?.toLowerCase().includes(q))
-    })
-  }
-  return list
+  return recipeStore.recipes
+    .filter(r => r._owner_id === auth.user.id)
+    .slice(0, 6)
 })

 const favoritesPreview = computed(() => {
@@ -252,29 +208,6 @@ function openDetail(index) {
  }
 }

-function openDiaryDetail(diary) {
-  // Create a temporary recipe-like object from diary and open it
-  const tmpRecipe = {
-    _id: null,
-    _diary_id: diary.id,
-    name: diary.name,
-    note: diary.note || '',
-    tags: diary.tags || [],
-    ingredients: diary.ingredients || [],
-    _owner_id: auth.user.id,
-  }
-  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) {
  if (!auth.isLoggedIn) {
    ui.openLogin()
@@ -283,31 +216,6 @@ 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() {
  // fuzzyResults computed handles the filtering reactively
 }
@@ -542,55 +450,6 @@ function clearSearch() {
  padding: 24px 0;
 }

-.diary-card {
-  background: white;
-  border-radius: 14px;
-  padding: 16px;
-  cursor: pointer;
-  box-shadow: 0 2px 10px rgba(0,0,0,0.06);
-  border: 2px solid transparent;
-  border-left: 3px solid var(--sage, #7a9e7e);
-  transition: all 0.2s;
-}
-.diary-card:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 4px 16px rgba(0,0,0,0.1);
-}
-.diary-card .card-name {
-  font-family: 'Noto Serif SC', serif;
-  font-size: 15px;
-  font-weight: 600;
-  color: #2c2416;
-  margin-bottom: 6px;
-}
-.diary-card .card-oils {
-  font-size: 12px;
-  color: #9a8570;
-  line-height: 1.6;
-}
-.diary-card .card-bottom {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 8px;
-}
-.diary-card .card-price {
-  font-size: 13px;
-  font-weight: 600;
-  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;