Merge pull request 'feat: 配方卡片加入上传个人二维码功能' (#5) from feature/qr-upload-hint into main

Reviewed-on: #5

backend/database.py

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

backend/main.py

@@ -79,6 +79,7 @@ class OilIn(BaseModel):
     bottle_price: float
     drop_count: int
     retail_price: Optional[float] = None
+    en_name: Optional[str] = None
 
 
 class IngredientIn(BaseModel):
@@ -649,7 +650,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 FROM oils ORDER BY name").fetchall()
+    rows = conn.execute("SELECT name, bottle_price, drop_count, retail_price, is_active, en_name FROM oils ORDER BY name").fetchall()
     conn.close()
     return [dict(r) for r in rows]
 
@@ -658,9 +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) 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),
+        "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)",
+        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, oil.en_name),
     )
     log_audit(conn, user["id"], "upsert_oil", "oil", oil.name, oil.name,
               json.dumps({"bottle_price": oil.bottle_price, "drop_count": oil.drop_count}))

frontend/src/App.vue

@@ -15,7 +15,8 @@
             @click="toggleUserMenu"
           >
             <template v-if="auth.isLoggedIn">
-              👤 {{ auth.user.display_name || auth.user.username }} ▾
+              👤 {{ 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>
@@ -41,7 +42,7 @@
   <UserMenu v-if="showUserMenu" @close="showUserMenu = false" />
 
   <!-- Nav tabs -->
-  <div class="nav-tabs">
+  <div class="nav-tabs" :style="isPreview ? { top: '36px' } : {}">
     <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>
@@ -64,7 +65,7 @@
   <CustomDialog />
 
   <!-- Toast messages -->
-  <div v-for="(toast, i) in ui.toasts" :key="i" class="toast">{{ toast }}</div>
+  <div v-for="toast in ui.toasts" :key="toast.id" class="toast">{{ toast.msg }}</div>
 </template>
 
 <script setup>

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: 999;
+  border-radius: 20px; font-size: 14px; z-index: 9000;
   pointer-events: none; transition: opacity 0.3s;
 }
 

frontend/src/components/CustomDialog.vue

@@ -8,22 +8,25 @@
         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">取消</button>
-        <button class="dialog-btn-primary" @click="ok">确定</button>
+        <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>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, watch, nextTick } from 'vue'
+import { ref, watch, nextTick, shallowRef } 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') {
@@ -46,7 +49,15 @@ function cancel() {
   else closeDialog(null)
 }
 
-function submitPrompt() {
+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
   closeDialog(inputValue.value)
 }
 </script>

frontend/src/components/LoginModal.vue

@@ -104,8 +104,11 @@ async function submit() {
       ui.showToast('注册成功')
     }
     emit('close')
-    // Reload page data after auth change
-    window.location.reload()
+    if (ui.pendingAction) {
+      ui.runPendingAction()
+    } else {
+      window.location.reload()
+    }
   } catch (e) {
     errorMsg.value = e?.message || (mode.value === 'login' ? '登录失败，请检查用户名和密码' : '注册失败，请重试')
   } finally {
@@ -119,7 +122,7 @@ async function submit() {
   position: fixed;
   inset: 0;
   background: rgba(0, 0, 0, 0.35);
-  z-index: 5000;
+  z-index: 6000;
   display: flex;
   align-items: center;
   justify-content: center;

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="$emit('close')">✕</button>
+          <button class="detail-close-btn" @click="handleClose">✕</button>
         </div>
 
         <!-- Language toggle -->
@@ -36,21 +36,33 @@
           >English</button>
         </div>
 
+        <!-- Volume selector -->
+        <div 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">
           <!-- Brand overlay layers -->
-          <img
+          <div
             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"
+            :style="{ backgroundImage: `url('${brand.brand_bg}')` }"
           />
+          <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>
           <img
             v-if="brand.brand_logo"
             :src="brand.brand_logo"
@@ -90,8 +102,8 @@
             <div v-if="dilutionDesc" class="card-dilution">{{ dilutionDesc }}</div>
 
             <!-- Note -->
-            <div v-if="recipe.note" class="card-note">
-              {{ cardLang === 'en' ? '📝 ' + recipe.note : '📝 ' + recipe.note }}
+            <div v-if="displayRecipe.note" class="card-note">
+              {{ '📝 ' + displayRecipe.note }}
             </div>
 
             <!-- Total cost bar -->
@@ -126,6 +138,11 @@
             class="action-btn"
             @click="showTranslationEditor = true"
           >✏️ 修改翻译</button>
+          <button
+            v-if="showBrandHint"
+            class="action-btn action-btn-qr"
+            @click="goUploadQr"
+          >📲 上传我的二维码</button>
         </div>
 
         <!-- Translation editor (inline) -->
@@ -156,7 +173,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="$emit('close')">✕</button>
+            <button class="detail-close-btn" @click="handleEditorClose">✕</button>
           </div>
         </div>
 
@@ -209,10 +226,29 @@
 
           <!-- Add ingredient row -->
           <div v-if="showAddRow" class="add-ingredient-row">
-            <select v-model="newIngOil" class="editor-select">
-              <option value="">— 选择精油 —</option>
-              <option v-for="name in oilsStore.oilNames" :key="name" :value="name">{{ name }}</option>
-            </select>
+            <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>
             <input
               v-model.number="newIngDrops"
               type="number"
@@ -222,7 +258,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="showAddRow = false">取消</button>
+            <button class="action-btn action-btn-sm" @click="cancelAddRow">取消</button>
           </div>
           <button v-else class="add-row-btn" @click="showAddRow = true">+ 添加精油</button>
         </div>
@@ -342,6 +378,7 @@
 
 <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'
@@ -349,6 +386,7 @@ 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
 
@@ -363,22 +401,33 @@ 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
@@ -387,14 +436,30 @@ const canEditThisRecipe = computed(() => {
 
 const isFav = computed(() => recipesStore.isFavorite(recipe.value))
 
-// Card ingredients: exclude coconut oil
-const cardIngredients = computed(() =>
-  recipe.value.ingredients.filter(ing => ing.oil !== '椰子油')
+// 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)
 )
 
-// Coconut oil drops
+const cardIngredients = computed(() =>
+  scaledCardIngredients.value.filter(ing => ing.oil !== '椰子油')
+)
+
+// Coconut oil drops (from scaled set)
 const coconutDrops = computed(() => {
-  const coco = recipe.value.ingredients.find(ing => ing.oil === '椰子油')
+  const coco = scaledCardIngredients.value.find(ing => ing.oil === '椰子油')
   return coco ? coco.drops : 0
 })
 
@@ -420,7 +485,7 @@ const dilutionDesc = computed(() => {
     : `该配方适用于单次用量（共${totalDrops}滴），其中纯精油 ${totalEoDrops.value} 滴，椰子油 ${coconutDrops.value} 滴，稀释比例为 1:${ratio}`
 })
 
-const priceInfo = computed(() => oilsStore.fmtCostWithRetail(recipe.value.ingredients))
+const priceInfo = computed(() => oilsStore.fmtCostWithRetail(scaledCardIngredients.value))
 
 // Today string
 const todayStr = computed(() => {
@@ -451,6 +516,30 @@ async function loadBrand() {
   } catch {
     brand.value = {}
   }
+  // Show upload prompt if user hasn't set up brand assets yet
+  if (showBrandHint.value) {
+    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 ----
@@ -483,6 +572,12 @@ function switchLang(lang) {
   nextTick(() => generateCardImage())
 }
 
+function onCardVolumeChange(ml) {
+  selectedCardVolume.value = ml
+  cardImageUrl.value = null
+  nextTick(() => generateCardImage())
+}
+
 async function saveImage() {
   if (!cardImageUrl.value) {
     await generateCardImage()
@@ -503,16 +598,16 @@ function copyText() {
   })
   const total = priceInfo.value.cost
   const text = [
-    recipe.value.name,
+    displayRecipe.value.name,
     '---',
     ...lines,
     '---',
     `总成本: ${total}`,
-    recipe.value.note ? `备注: ${recipe.value.note}` : '',
+    displayRecipe.value.note ? `备注: ${displayRecipe.value.note}` : '',
   ].filter(Boolean).join('\n')
 
   navigator.clipboard.writeText(text).then(() => {
-    ui.showToast('已复制到剪贴板')
+    ui.showToast('已复制')
   }).catch(() => {
     ui.showToast('复制失败')
   })
@@ -546,15 +641,15 @@ function getCardOilName(name) {
 
 function getCardRecipeName() {
   if (cardLang.value === 'en') {
-    return customRecipeNameEn.value || recipe.value.en_name || recipeNameEn(recipe.value.name)
+    return customRecipeNameEn.value || displayRecipe.value.en_name || recipeNameEn(displayRecipe.value.name)
   }
-  return recipe.value.name
+  return displayRecipe.value.name
 }
 
 // ---- Favorite ----
 async function handleToggleFavorite() {
   if (!authStore.isLoggedIn) {
-    ui.openLogin()
+    ui.openLogin(() => handleToggleFavorite())
     return
   }
   if (!recipe.value._id) {
@@ -573,21 +668,30 @@ async function handleToggleFavorite() {
 // ---- Save to diary ----
 async function saveToDiary() {
   if (!authStore.isLoggedIn) {
-    ui.openLogin()
+    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('请输入配方名称')
     return
   }
-  const name = prompt('保存为我的配方，名称：', recipe.value.name)
-  if (!name) return
   try {
-    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 })),
+    const payload = {
+      name: name.trim(),
       note: recipe.value.note || '',
-    })
-    ui.showToast('已保存到「我的配方日记」')
+      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('已保存！可在「配方查询 → 我的配方」查看')
   } catch (e) {
-    ui.showToast('保存失败: ' + (e?.message || '未知错误'))
+    console.error('[saveToDiary] failed:', e)
+    ui.showToast('保存失败：' + (e?.message || e?.status || '未知错误'), 3000)
   }
 }
 
@@ -601,6 +705,36 @@ 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)
@@ -681,6 +815,7 @@ function confirmAddIngredient() {
   }
   editIngredients.value.push({ oil: newIngOil.value, drops: newIngDrops.value })
   newIngOil.value = ''
+  oilSearchQuery.value = ''
   newIngDrops.value = 1
   showAddRow.value = false
 }
@@ -773,9 +908,44 @@ 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() {
-  // Temporarily update recipe view with editor data, switch to card
-  // We just switch to card mode; the card shows the saved recipe
+  // 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 })),
+  }
   viewMode.value = 'card'
   cardImageUrl.value = null
   nextTick(() => generateCardImage())
@@ -801,9 +971,14 @@ 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('保存成功')
-    emit('close')
+    // Go to card view instead of closing
+    previewOverride.value = null
+    viewMode.value = 'card'
+    cardImageUrl.value = null
+    nextTick(() => generateCardImage())
   } catch (e) {
     ui.showToast('保存失败: ' + (e?.message || '未知错误'))
   }
@@ -941,32 +1116,52 @@ async function saveRecipe() {
   inset: 0;
   width: 100%;
   height: 100%;
-  object-fit: cover;
-  opacity: 0.06;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  opacity: 0.12;
   z-index: 0;
   pointer-events: none;
 }
 
-.card-qr {
+.card-qr-wrapper {
   position: absolute;
-  top: 16px;
-  right: 16px;
-  width: 64px;
-  height: 64px;
-  object-fit: contain;
-  z-index: 3;
-  opacity: 0.85;
+  top: 36px;
+  right: 24px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 3px;
+  z-index: 2;
+}
+
+.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;
 }
 
 .card-logo {
   position: absolute;
-  bottom: 16px;
+  bottom: 60px;
   left: 50%;
   transform: translateX(-50%);
-  height: 28px;
+  height: 60px;
   object-fit: contain;
-  z-index: 3;
-  opacity: 0.3;
+  z-index: 1;
+  opacity: 0.2;
+  pointer-events: none;
 }
 
 .card-brand-text {
@@ -1146,6 +1341,42 @@ 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;
@@ -1403,6 +1634,10 @@ 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);
@@ -1566,6 +1801,70 @@ 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 {

frontend/src/components/UserMenu.vue

@@ -2,9 +2,6 @@
   <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">
@@ -71,16 +68,6 @@ 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' })
@@ -136,7 +123,7 @@ function handleLogout() {
   auth.logout()
   ui.showToast('已退出登录')
   emit('close')
-  window.location.reload()
+  router.push('/')
 }
 
 onMounted(loadNotifications)
@@ -162,13 +149,7 @@ onMounted(loadNotifications)
   z-index: 4001;
 }
 
-.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-name { font-size: 16px; font-weight: 600; color: #3e3a44; margin-bottom: 14px; }
 
 .usermenu-actions { display: flex; flex-direction: column; gap: 4px; }
 .usermenu-btn {

frontend/src/composables/useDialog.js

@@ -5,6 +5,8 @@ export const dialogState = reactive({
   type: 'alert', // 'alert', 'confirm', 'prompt'
   message: '',
   defaultValue: '',
+  okText: '',
+  cancelText: '',
   resolve: null
 })
 
@@ -13,15 +15,19 @@ export function showAlert(msg) {
     dialogState.visible = true
     dialogState.type = 'alert'
     dialogState.message = msg
+    dialogState.okText = ''
+    dialogState.cancelText = ''
     dialogState.resolve = resolve
   })
 }
 
-export function showConfirm(msg) {
+export function showConfirm(msg, opts = {}) {
   return new Promise(resolve => {
     dialogState.visible = true
     dialogState.type = 'confirm'
     dialogState.message = msg
+    dialogState.okText = opts.okText || ''
+    dialogState.cancelText = opts.cancelText || ''
     dialogState.resolve = resolve
   })
 }

frontend/src/composables/useOilCards.js

@@ -39,3 +39,11 @@ 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]
+  }
+}

frontend/src/stores/oils.js

@@ -5,6 +5,7 @@ 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,18 +69,20 @@ export const useOilsStore = defineStore('oils', () => {
         dropCount: oil.drop_count,
         retailPrice: oil.retail_price ?? null,
         isActive: oil.is_active ?? true,
+        enName: oil.en_name ?? null,
       }
     }
     oils.value = newOils
     oilsMeta.value = newMeta
   }
 
-  async function saveOil(name, bottlePrice, dropCount, retailPrice) {
+  async function saveOil(name, bottlePrice, dropCount, retailPrice, enName = null) {
     await api.post('/api/oils', {
       name,
       bottle_price: bottlePrice,
       drop_count: dropCount,
       retail_price: retailPrice,
+      en_name: enName,
     })
     await loadOils()
   }

frontend/src/stores/recipes.js

@@ -53,7 +53,12 @@ export const useRecipesStore = defineStore('recipes', () => {
       return data
     } else {
       const data = await api.post('/api/recipes', recipe)
-      await loadRecipes()
+      // Refresh list; if refresh fails, still return success (recipe was saved)
+      try {
+        await loadRecipes()
+      } catch (e) {
+        console.warn('[saveRecipe] loadRecipes failed after save:', e)
+      }
       return data
     }
   }

frontend/src/stores/ui.js

@@ -5,6 +5,7 @@ export const useUiStore = defineStore('ui', () => {
   const currentSection = ref('search')
   const showLoginModal = ref(false)
   const toasts = ref([])
+  const pendingAction = ref(null)
 
   let toastId = 0
 
@@ -20,7 +21,10 @@ export const useUiStore = defineStore('ui', () => {
     }, duration)
   }
 
-  function openLogin() {
+  function openLogin(afterLogin) {
+    if (afterLogin) {
+      pendingAction.value = afterLogin
+    }
     showLoginModal.value = true
   }
 
@@ -28,13 +32,23 @@ 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,
   }
 })

frontend/src/views/MyDiary.vue

@@ -107,6 +107,11 @@
 
     <!-- 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">
         <h4>🏷️ 品牌设置</h4>
 
@@ -123,6 +128,16 @@
           </div>
         </div>
 
+        <div class="form-group">
+          <label>我的二维码图片</label>
+          <div class="upload-area" @click="triggerUpload('qr')">
+            <img v-if="brandQrImage" :src="brandQrImage" class="upload-preview qr-upload-preview" />
+            <span v-else class="upload-hint">📲 点击上传二维码图片</span>
+          </div>
+          <input ref="qrInput" type="file" accept="image/*" style="display:none" @change="handleUpload('qr', $event)" />
+          <div class="field-hint">上传后将显示在配方卡片右下角</div>
+        </div>
+
         <div class="form-group">
           <label>品牌Logo</label>
           <div class="upload-area" @click="triggerUpload('logo')">
@@ -159,10 +174,6 @@
           <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">
@@ -201,7 +212,8 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, watch } from 'vue'
+import { ref, onMounted, watch } from 'vue'
+import { useRouter } from 'vue-router'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useDiaryStore } from '../stores/diary'
@@ -214,20 +226,24 @@ 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 logoInput = ref(null)
 const bgInput = ref(null)
+const qrInput = ref(null)
 
 // Account settings
 const displayName = ref('')
@@ -236,22 +252,20 @@ 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
@@ -345,8 +359,9 @@ async function loadBrandSettings() {
       const data = await res.json()
       brandName.value = data.brand_name || ''
       brandQrUrl.value = data.qr_url || ''
-      brandLogo.value = data.logo_url || ''
-      brandBg.value = data.bg_url || ''
+      brandQrImage.value = data.qr_code || ''
+      brandLogo.value = data.brand_logo || ''
+      brandBg.value = data.brand_bg || ''
     }
   } catch {
     // no brand settings yet
@@ -369,26 +384,35 @@ async function saveBrandSettings() {
 
 function triggerUpload(type) {
   if (type === 'logo') logoInput.value?.click()
-  else bgInput.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)
+  })
 }
 
 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 {
-    const token = localStorage.getItem('oil_auth_token') || ''
-    const res = await fetch('/api/brand-upload', {
-      method: 'POST',
-      headers: token ? { Authorization: 'Bearer ' + token } : {},
-      body: formData,
+    const base64 = await readFileAsBase64(file)
+    const fieldMap = { logo: 'brand_logo', bg: 'brand_bg', qr: 'qr_code' }
+    const field = fieldMap[type]
+    if (!field) return
+    const res = await api('/api/brand', {
+      method: 'PUT',
+      body: JSON.stringify({ [field]: base64 }),
     })
     if (res.ok) {
-      const data = await res.json()
-      if (type === 'logo') brandLogo.value = data.url
-      else brandBg.value = data.url
+      if (type === 'logo') brandLogo.value = base64
+      else if (type === 'bg') brandBg.value = base64
+      else if (type === 'qr') brandQrImage.value = base64
       ui.showToast('上传成功')
     }
   } catch {
@@ -718,6 +742,39 @@ 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;
@@ -739,22 +796,6 @@ 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;
@@ -772,6 +813,18 @@ 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;
@@ -783,6 +836,18 @@ 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;

frontend/src/views/OilReference.vue

@@ -1,167 +1,159 @@
 <template>
   <div class="oil-reference">
     <!-- Knowledge Cards at Top -->
-    <div class="knowledge-cards">
-      <div class="kcard" @click="showDilution = true">
-        <span class="kcard-icon">💧</span>
-        <span class="kcard-title">稀释比例</span>
-        <span class="kcard-arrow">›</span>
+    <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:14px;padding:16px;cursor:pointer;transition:transform 0.2s" @mouseover="$event.target.style.transform='translateY(-2px)'" @mouseout="$event.target.style.transform=''">
+        <div style="font-size:24px;margin-bottom:6px">💧</div>
+        <div style="font-size:14px;font-weight:600;color:#2e7d32">稀释比例</div>
+        <div style="font-size:11px;color:#558b2f;margin-top:4px">不同年龄段的稀释指南</div>
       </div>
-      <div class="kcard" @click="showContra = true">
-        <span class="kcard-icon">⚠️</span>
-        <span class="kcard-title">使用禁忌</span>
-        <span class="kcard-arrow">›</span>
+      <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=''">
+        <div style="font-size:24px;margin-bottom:6px">⚠️</div>
+        <div style="font-size:14px;font-weight:600;color:#f57f17">使用禁忌</div>
+        <div style="font-size:11px;color:#ff8f00;margin-top:4px">安全使用精油的注意事项</div>
       </div>
     </div>
 
     <!-- Dilution Ratio Modal -->
     <div v-if="showDilution" class="modal-overlay" @click.self="showDilution = false">
-      <div class="modal-panel">
-        <div class="modal-header">
-          <h3>💧 稀释比例参考</h3>
-          <button class="btn-close" @click="showDilution = false">✕</button>
+      <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>
+          <div style="font-family:'Noto Serif SC',serif;font-size:22px;font-weight:700">精油稀释比例指南</div>
+          <div style="font-size:13px;opacity:0.85;margin-top:4px">安全使用，科学稀释</div>
         </div>
-        <div class="modal-body">
-          <table class="info-table">
-            <thead>
-              <tr><th>用途</th><th>比例</th><th>每10ml基底油</th></tr>
-            </thead>
-            <tbody>
-              <tr><td>面部护肤</td><td>1%</td><td>2滴精油</td></tr>
-              <tr><td>身体按摩</td><td>2-3%</td><td>4-6滴精油</td></tr>
-              <tr><td>局部疼痛</td><td>3-5%</td><td>6-10滴精油</td></tr>
-              <tr><td>急救用途</td><td>5-10%</td><td>10-20滴精油</td></tr>
-              <tr><td>儿童(2-6岁)</td><td>0.5-1%</td><td>1-2滴精油</td></tr>
-              <tr><td>婴儿(&lt;2岁)</td><td>0.25%</td><td>0.5滴精油</td></tr>
-            </tbody>
+        <div style="padding:24px">
+          <table style="width:100%;border-collapse:collapse;font-size:14px">
+            <tr style="border-bottom:2px solid #e8f5e9"><th style="text-align:left;padding:10px 8px;color:#2e7d32">适用人群</th><th style="text-align:right;padding:10px 8px;color:#2e7d32">精油 : 椰子油</th></tr>
+            <tr style="border-bottom:1px solid #f0f0f0"><td style="padding:10px 8px">👶 1岁以下</td><td style="text-align:right;padding:10px 8px;font-weight:600">1 : 200</td></tr>
+            <tr style="border-bottom:1px solid #f0f0f0"><td style="padding:10px 8px">🧒 1 至 2 岁</td><td style="text-align:right;padding:10px 8px;font-weight:600">1 : 100</td></tr>
+            <tr style="border-bottom:1px solid #f0f0f0"><td style="padding:10px 8px">👦 2 至 6 岁</td><td style="text-align:right;padding:10px 8px;font-weight:600">1 : 50</td></tr>
+            <tr style="border-bottom:1px solid #f0f0f0"><td style="padding:10px 8px">🧑 6 至 12 岁</td><td style="text-align:right;padding:10px 8px;font-weight:600">1 : 10</td></tr>
+            <tr style="border-bottom:1px solid #f0f0f0"><td style="padding:10px 8px">🧴 成人敏感肌</td><td style="text-align:right;padding:10px 8px;font-weight:600">1 : 5~10</td></tr>
+            <tr><td style="padding:10px 8px">🔥 强刺激精油<br><span style="font-size:11px;color:var(--text-light)">牛至/肉桂/丁香/桂皮等</span></td><td style="text-align:right;padding:10px 8px;font-weight:600">1 : 6~10</td></tr>
           </table>
-          <p class="info-note">* 1ml 约等于 {{ DROPS_PER_ML }} 滴</p>
-          <button class="btn-save-img" @click="saveDilutionImage">💾 保存图片</button>
+          <div style="margin-top:16px;padding:12px;background:#e8f5e9;border-radius:10px;font-size:12px;color:#2e7d32;text-align:center">
+            💡 稀释比例 = 1滴精油 : N滴椰子油<br>比例越大越温和，新手建议从高稀释比例开始
+          </div>
+          <div style="text-align:center;margin-top:12px">
+            <button @click="saveDilutionImage" style="padding:8px 16px;border-radius:10px;border:1.5px solid var(--sage);background:white;color:var(--sage-dark);cursor:pointer;font-size:13px;font-family:inherit">💾 保存图片</button>
+          </div>
         </div>
       </div>
     </div>
 
     <!-- Safety Cautions Modal -->
     <div v-if="showContra" class="modal-overlay" @click.self="showContra = false">
-      <div class="modal-panel">
-        <div class="modal-header">
-          <h3>⚠️ 使用禁忌</h3>
-          <button class="btn-close" @click="showContra = false">✕</button>
+      <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>
+          <div style="font-family:'Noto Serif SC',serif;font-size:22px;font-weight:700">精油使用禁忌</div>
+          <div style="font-size:13px;opacity:0.85;margin-top:4px">安全第一，正确使用</div>
         </div>
-        <div class="modal-body">
-          <div class="contra-section">
-            <h4>光敏性精油（涂抹后12小时内避免阳光直射）</h4>
-            <p>柠檬、佛手柑、葡萄柚、莱姆、甜橙、野橘</p>
+        <div style="padding:24px;display:flex;flex-direction:column;gap:12px">
+          <div style="display:flex;gap:10px;align-items:flex-start">
+            <span style="font-size:20px;flex-shrink:0">🚫</span>
+            <div><div style="font-weight:600;color:var(--text-dark)">不得入眼、耳、鼻腔</div><div style="font-size:12px;color:var(--text-light);margin-top:2px">精油不可直接接触眼睛、耳道和鼻腔内部</div></div>
           </div>
-          <div class="contra-section">
-            <h4>孕妇慎用</h4>
-            <p>快乐鼠尾草、迷迭香、肉桂、丁香、百里香、牛至、冬青</p>
+          <div style="display:flex;gap:10px;align-items:flex-start">
+            <span style="font-size:20px;flex-shrink:0">🥥</span>
+            <div><div style="font-weight:600;color:var(--text-dark)">误触或刺激 → 用椰子油稀释</div><div style="font-size:12px;color:var(--text-light);margin-top:2px">不可用水冲洗，水会加剧刺激，用椰子油涂抹稀释</div></div>
           </div>
-          <div class="contra-section">
-            <h4>儿童慎用</h4>
-            <p>椒样薄荷（6岁以下避免）、尤加利（10岁以下慎用）、冬青、肉桂</p>
+          <div style="display:flex;gap:10px;align-items:flex-start">
+            <span style="font-size:20px;flex-shrink:0">🌙</span>
+            <div><div style="font-weight:600;color:var(--text-dark)">柠檬等光敏性精油仅夜间涂抹</div><div style="font-size:12px;color:var(--text-light);margin-top:2px">涂抹后 12 小时内避免阳光直射</div></div>
           </div>
-          <div class="contra-section">
-            <h4>宠物禁用</h4>
-            <p>茶树、尤加利、肉桂、丁香、百里香、冬青（对猫有毒）</p>
+          <div style="display:flex;gap:10px;align-items:flex-start">
+            <span style="font-size:20px;flex-shrink:0">🌡️</span>
+            <div><div style="font-weight:600;color:var(--text-dark)">阴凉避光保存，远离儿童</div><div style="font-size:12px;color:var(--text-light);margin-top:2px">避免高温和阳光直射，放在儿童够不到的地方</div></div>
+          </div>
+          <div style="display:flex;gap:10px;align-items:flex-start">
+            <span style="font-size:20px;flex-shrink:0">🧴</span>
+            <div><div style="font-weight:600;color:var(--text-dark)">避免和塑料制品接触</div><div style="font-size:12px;color:var(--text-light);margin-top:2px">精油会腐蚀塑料，请使用玻璃或不锈钢容器</div></div>
+          </div>
+          <div style="display:flex;gap:10px;align-items:flex-start">
+            <span style="font-size:20px;flex-shrink:0">💧</span>
+            <div><div style="font-weight:600;color:var(--text-dark)">少量多次，多喝水</div><div style="font-size:12px;color:var(--text-light);margin-top:2px">使用精油后多补充水分，帮助身体代谢</div></div>
+          </div>
+          <div style="text-align:center;margin-top:12px">
+            <button @click="saveContraImage" style="padding:8px 16px;border-radius:10px;border:1.5px solid #e65100;background:white;color:#e65100;cursor:pointer;font-size:13px;font-family:inherit">💾 保存图片</button>
           </div>
-          <button class="btn-save-img" @click="saveContraImage">💾 保存图片</button>
         </div>
       </div>
     </div>
 
-    <!-- Add Oil Form (admin/senior_editor only) -->
-    <div v-if="auth.canEdit" class="add-oil-form">
-      <h3 class="section-title">添加精油</h3>
+    <!-- Search + View Toggle + Add + PDF -->
+    <div style="display:flex;gap:8px;align-items:center;margin-bottom:12px;flex-wrap:wrap">
+      <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>
+      <button v-if="auth.canEdit" class="btn btn-primary btn-sm" @click="showAddForm = !showAddForm">{{ showAddForm ? '收起' : '＋ 新增' }}</button>
+      <button v-if="auth.isAdmin" class="btn btn-gold btn-sm" @click="exportPDF" style="font-size:12px">📥 导出PDF</button>
+    </div>
+
+    <!-- Add Oil Form (toggleable) -->
+    <div v-if="showAddForm && auth.canEdit" class="add-oil-form">
       <div class="form-row">
-        <input v-model="newOilName" class="form-input" placeholder="精油名称" />
-        <input v-model.number="newBottlePrice" class="form-input-sm" type="number" placeholder="瓶价 ¥" />
-        <select v-model="newVolume" class="form-select">
+        <input v-model="newOilName" style="flex:1;min-width:120px" placeholder="精油名称" class="form-input-sm" />
+        <input v-model="newOilEnName" style="flex:1;min-width:100px" placeholder="英文名" class="form-input-sm" />
+        <input v-model.number="newBottlePrice" style="width:100px" type="number" step="0.01" min="0" placeholder="会员价 ¥" class="form-input-sm" />
+        <select v-model="newVolume" class="form-input-sm" style="width:110px">
+          <option value="">容量</option>
           <option value="2.5">2.5ml (46滴)</option>
           <option value="5">5ml (93滴)</option>
           <option value="10">10ml (186滴)</option>
           <option value="15">15ml (280滴)</option>
           <option value="115">115ml (2146滴)</option>
-          <option value="custom">自定义</option>
+          <option value="custom">自定义滴数</option>
         </select>
-        <input
-          v-if="newVolume === 'custom'"
-          v-model.number="newCustomDrops"
-          class="form-input-sm"
-          type="number"
-          placeholder="滴数"
-        />
-        <input v-model.number="newRetailPrice" class="form-input-sm" type="number" placeholder="零售价 ¥" />
-        <button class="btn-primary" @click="addOil" :disabled="!newOilName.trim()">添加</button>
+        <input v-if="newVolume === 'custom'" v-model.number="newCustomDrops" style="width:80px" type="number" step="1" min="1" placeholder="滴数" class="form-input-sm" />
+        <input v-model.number="newRetailPrice" style="width:100px" type="number" step="0.01" min="0" placeholder="零售价 ¥" class="form-input-sm" />
+        <button class="btn btn-primary btn-sm" @click="addOil" :disabled="!newOilName.trim()">➕ 添加</button>
       </div>
     </div>
 
-    <!-- Search + View Toggle + PDF -->
-    <div class="toolbar">
-      <div class="search-box">
-        <input
-          class="search-input"
-          v-model="searchQuery"
-          placeholder="搜索精油..."
-        />
-        <button v-if="searchQuery" class="search-clear-btn" @click="searchQuery = ''">✕</button>
-      </div>
-      <div class="view-toggle">
-        <button
-          class="toggle-btn"
-          :class="{ active: viewMode === 'bottle' }"
-          @click="viewMode = 'bottle'"
-        >瓶价</button>
-        <button
-          class="toggle-btn"
-          :class="{ active: viewMode === 'drop' }"
-          @click="viewMode = 'drop'"
-        >滴价</button>
-      </div>
-      <button v-if="auth.canManage" class="btn-pdf" @click="exportPDF" title="导出PDF">
-        📄
-      </button>
-    </div>
-
     <!-- Oil Grid -->
-    <div class="oil-grid">
+    <div class="oils-grid">
       <div
         v-for="name in filteredOilNames"
-        :key="name"
+        :key="name + '-' + cardVersion"
         class="oil-chip"
-        :class="{ 'oil-chip--inactive': getMeta(name)?.isActive === false }"
+        :style="chipStyle(name)"
         @click="openOilDetail(name)"
       >
-        <span v-if="getOilCard(name)" class="oil-badge" title="有知识卡片">📖</span>
-        <div class="oil-chip-name">{{ name }}</div>
-        <div class="oil-chip-en">{{ getEnglishName(name) }}</div>
-        <div class="oil-chip-price" v-if="viewMode === 'bottle'">
-          <template v-if="getMeta(name)?.bottlePrice != null">
-            ¥ {{ getMeta(name).bottlePrice.toFixed(2) }}
+        <div style="flex:1;min-width:0">
+          <span class="oil-chip-name">{{ name }}
+            <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 style="font-size:13px;color:var(--sage-dark);font-weight:600">
+              ¥{{ (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>--</template>
-        </div>
-        <div class="oil-chip-price" v-else>
-          <template v-if="oils.pricePerDrop(name)">
-            ¥ {{ oils.pricePerDrop(name).toFixed(4) }}<span class="oil-unit">/滴</span>
+          <template v-else>
+            <div style="font-size:13px;color:var(--sage-dark);font-weight:600">
+              ¥{{ 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>
-          <template v-else>--</template>
         </div>
-        <div
-          v-if="getMeta(name)?.retailPrice && getMeta(name).retailPrice !== getMeta(name).bottlePrice"
-          class="oil-chip-retail"
-        >
-          <s>零售 ¥ {{ getMeta(name).retailPrice.toFixed(2) }}</s>
-        </div>
-        <div v-else-if="getMeta(name)?.retailPrice" class="oil-chip-retail">
-          零售 ¥ {{ getMeta(name).retailPrice.toFixed(2) }}
-        </div>
-        <div class="oil-chip-volume" v-if="getMeta(name)?.dropCount">
-          {{ volumeLabel(getMeta(name).dropCount) }}
-        </div>
-        <div class="oil-actions" v-if="auth.canManage" @click.stop>
-          <button class="btn-icon-sm" @click="editOil(name)" title="编辑">✏️</button>
-          <button class="btn-icon-sm" @click="removeOil(name)" title="删除">🗑️</button>
+        <div v-if="auth.canEdit" class="oil-chip-actions" @click.stop>
+          <button @click="editOil(name)" title="编辑">✏️</button>
+          <button @click="removeOil(name)" title="删除">🗑</button>
         </div>
       </div>
       <div v-if="filteredOilNames.length === 0" class="empty-hint">未找到精油</div>
@@ -215,6 +207,9 @@
             <h4 class="oil-card-caution-title">⚠️ 注意事项</h4>
             <p>{{ activeCard.caution }}</p>
           </div>
+          <div style="text-align:center;padding-top:12px">
+            <button class="btn btn-outline btn-sm" @click="saveCardImage(activeCardName)">💾 保存图片</button>
+          </div>
         </div>
       </div>
     </div>
@@ -231,7 +226,7 @@
         </div>
         <div class="detail-body">
           <div class="detail-row">
-            <span class="detail-label">瓶价</span>
+            <span class="detail-label">会员价</span>
             <span class="detail-value">{{ getMeta(selectedOilName)?.bottlePrice != null ? ('¥ ' + getMeta(selectedOilName).bottlePrice.toFixed(2)) : '--' }}</span>
           </div>
           <div class="detail-row">
@@ -267,13 +262,17 @@
     <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null">
       <div class="modal-panel" style="max-width:400px">
         <div class="modal-header">
-          <h3>编辑精油: {{ editingOilName }}</h3>
+          <h3>{{ editingOilName }}</h3>
           <button class="btn-close" @click="editingOilName = null">✕</button>
         </div>
         <div class="modal-body">
           <div class="form-group">
-            <label>瓶价 (¥)</label>
-            <input v-model.number="editBottlePrice" class="form-input" type="number" />
+            <label>精油名称</label>
+            <input v-model="editOilDisplayName" class="form-input" type="text" placeholder="精油名称" />
+          </div>
+          <div class="form-group">
+            <label>英文名</label>
+            <input v-model="editOilEnName" class="form-input" type="text" placeholder="English name" />
           </div>
           <div class="form-group">
             <label>容量</label>
@@ -290,10 +289,48 @@
             <label>自定义滴数</label>
             <input v-model.number="editDropCount" class="form-input" type="number" />
           </div>
+          <div class="form-group">
+            <label>会员价 (¥)</label>
+            <input v-model.number="editBottlePrice" class="form-input" type="number" />
+          </div>
           <div class="form-group">
             <label>零售价 (¥)</label>
             <input v-model.number="editRetailPrice" class="form-input" type="number" />
           </div>
+          <!-- Knowledge Card Editor -->
+          <div style="margin-top:16px;border-top:1px solid var(--border);padding-top:12px">
+            <div style="font-size:13px;font-weight:600;color:var(--text-mid);margin-bottom:8px">📖 知识卡片（选填，填写功效后自动生成）</div>
+            <div class="form-group">
+              <label>主要功效（每行一条）</label>
+              <textarea v-model="editCardEffects" class="form-input" rows="3" placeholder="镇静安神、改善睡眠&#10;舒缓压力、平衡情绪" @input="autoGenerateEmoji"></textarea>
+            </div>
+            <div class="form-group">
+              <label>使用方法（每行一条）</label>
+              <textarea v-model="editCardUsage" class="form-input" rows="3" placeholder="夜间香薰助眠&#10;加入护肤品中"></textarea>
+            </div>
+            <div class="form-group">
+              <label>使用方式</label>
+              <div style="display:flex;gap:6px;flex-wrap:wrap">
+                <button
+                  v-for="m in methodOptions" :key="m.value"
+                  :style="editCardMethodSet.has(m.value)
+                    ? 'background:' + m.color + ';color:white;border-color:' + m.color + ';font-weight:600;box-shadow:0 2px 8px rgba(0,0,0,0.15)'
+                    : 'background:white;color:#999;border-color:#ddd'"
+                  style="padding:7px 16px;border-radius:20px;font-size:13px;border:2px solid;cursor:pointer;font-family:inherit;transition:all 0.15s"
+                  @click="toggleMethod(m.value)"
+                >{{ m.label }}</button>
+              </div>
+            </div>
+            <div class="form-group">
+              <label>注意事项</label>
+              <input v-model="editCardCaution" class="form-input" placeholder="如：光敏性，白天避免涂抹" />
+            </div>
+            <div class="form-group">
+              <label>Emoji 图标</label>
+              <input v-model="editCardEmoji" class="form-input" placeholder="自动生成，也可手动修改" style="width:100px" />
+            </div>
+          </div>
+
           <div style="display:flex;gap:10px;justify-content:flex-end;margin-top:16px">
             <button class="btn-outline" @click="editingOilName = null">取消</button>
             <button class="btn-primary" @click="saveEditOil">保存</button>
@@ -311,7 +348,7 @@ import { useAuthStore } from '../stores/auth'
 import { useUiStore } from '../stores/ui'
 import { useRecipesStore } from '../stores/recipes'
 import { oilEn } from '../composables/useOilTranslation'
-import { getOilCard } from '../composables/useOilCards'
+import { getOilCard, setOilCard } from '../composables/useOilCards'
 import { showConfirm } from '../composables/useDialog'
 
 const auth = useAuthStore()
@@ -322,9 +359,11 @@ const ui = useUiStore()
 // Modal states
 const showDilution = ref(false)
 const showContra = ref(false)
+const showAddForm = ref(false)
 
 // Search & view
 const searchQuery = ref('')
+const cardVersion = ref(0) // bump to force re-render after card changes
 const viewMode = ref('bottle')
 
 // Oil detail
@@ -334,6 +373,7 @@ const activeCard = ref(null)
 
 // Add oil form
 const newOilName = ref('')
+const newOilEnName = ref('')
 const newBottlePrice = ref(null)
 const newVolume = ref('5')
 const newCustomDrops = ref(null)
@@ -341,10 +381,66 @@ const newRetailPrice = ref(null)
 
 // Edit oil
 const editingOilName = ref(null)
+const editOilDisplayName = ref('')
 const editBottlePrice = ref(0)
 const editVolume = ref('5')
 const editDropCount = ref(0)
 const editRetailPrice = ref(null)
+const editOilEnName = ref('')
+const editCardEmoji = ref('')
+const editCardEffects = ref('')
+const editCardUsage = ref('')
+const editCardMethod = ref('')
+const editCardCaution = ref('')
+const editCardMethodSet = ref(new Set())
+
+const methodOptions = [
+  { value: 'aroma', label: '🔹 香薰', bg: '#e3f2fd', color: '#1565c0' },
+  { value: 'internal', label: '🔸 内用', bg: '#fff3e0', color: '#e65100' },
+  { value: 'topical', label: '🔺 涂抹', bg: '#e8f5e9', color: '#2e7d32' },
+]
+
+function toggleMethod(value) {
+  const s = editCardMethodSet.value
+  if (s.has(value)) s.delete(value)
+  else s.add(value)
+  // Rebuild method string
+  const labels = { aroma: '🔹香薰', internal: '🔸内用', topical: '🔺涂抹' }
+  editCardMethod.value = [...s].map(k => labels[k]).join(' ｜ ')
+}
+
+// Emoji keywords map
+const EMOJI_MAP = {
+  '安神': '😴', '睡眠': '😴', '助眠': '😴', '安定': '🌳', '放松': '🌳',
+  '消化': '🍃', '肠胃': '🍃', '暖胃': '🫚',
+  '镇痛': '🌿', '酸痛': '🌿', '肌肉': '🌿',
+  '呼吸': '🌬', '鼻炎': '🌬', '咳嗽': '🌬',
+  '免疫': '🛡', '杀菌': '🛡', '抗菌': '🌱',
+  '护肤': '💜', '美白': '💜', '抗衰': '💜',
+  '提神': '🍊', '情绪': '🍊', '愉悦': '🍊',
+  '排毒': '🔥', '代谢': '🔥', '净化': '🔥',
+  '荷尔蒙': '🌸', '经期': '🌸', '女性': '🌸',
+  '伤口': '👑', '细胞': '👑', '再生': '👑',
+}
+
+function autoGenerateEmoji() {
+  if (editCardEmoji.value && editCardEmoji.value !== '🌿') return // don't override manual
+  const text = editCardEffects.value
+  for (const [keyword, emoji] of Object.entries(EMOJI_MAP)) {
+    if (text.includes(keyword)) {
+      editCardEmoji.value = emoji
+      return
+    }
+  }
+  if (text.trim()) editCardEmoji.value = '🌿'
+}
+
+// Active chip (for mobile hover)
+const activeChip = ref(null)
+
+function toggleChip(name) {
+  activeChip.value = activeChip.value === name ? null : name
+}
 
 // Volume-to-drops mapping
 const VOLUME_OPTIONS = {
@@ -361,10 +457,20 @@ for (const [ml, drops] of Object.entries(VOLUME_OPTIONS)) {
   DROPS_TO_VOLUME[drops] = ml + 'ml'
 }
 
-function volumeLabel(dropCount) {
+function volumeLabel(dropCount, name) {
+  if (dropCount === 160) return '160颗'
   return DROPS_TO_VOLUME[dropCount] || (dropCount + '滴')
 }
 
+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 getEffectiveDropCount() {
   if (newVolume.value === 'custom') return newCustomDrops.value || 0
   return VOLUME_OPTIONS[newVolume.value] || 0
@@ -407,9 +513,13 @@ function getMeta(name) {
 }
 
 function getEnglishName(name) {
-  // First check the oil card for English name
+  // 1. Oil card has priority
   const card = getOilCard(name)
   if (card && card.en) return card.en
+  // 2. Stored en_name in meta
+  const meta = oils.oilsMeta[name]
+  if (meta?.enName) return meta.enName
+  // 3. Static translation map
   return oilEn(name)
 }
 
@@ -466,10 +576,12 @@ async function addOil() {
       newOilName.value.trim(),
       newBottlePrice.value || 0,
       dropCount,
-      newRetailPrice.value || null
+      newRetailPrice.value || null,
+      newOilEnName.value.trim() || null
     )
     ui.showToast(`已添加: ${newOilName.value}`)
     newOilName.value = ''
+    newOilEnName.value = ''
     newBottlePrice.value = null
     newVolume.value = '5'
     newCustomDrops.value = null
@@ -481,23 +593,59 @@ async function addOil() {
 
 function editOil(name) {
   editingOilName.value = name
+  editOilDisplayName.value = name
   const meta = oils.oilsMeta[name]
   editBottlePrice.value = meta?.bottlePrice || 0
   const dc = meta?.dropCount || 0
   editVolume.value = dropCountToVolume(dc)
   editDropCount.value = dc
   editRetailPrice.value = meta?.retailPrice || null
+  editOilEnName.value = meta?.enName || getEnglishName(name) || ''
+  // Load knowledge card if exists
+  const card = getOilCard(name)
+  editCardEmoji.value = card?.emoji || ''
+  editCardEffects.value = card?.effects || ''
+  editCardUsage.value = card?.usage || ''
+  editCardMethod.value = card?.method || ''
+  editCardCaution.value = card?.caution || ''
+  // Parse method string back to set
+  const ms = new Set()
+  const methodStr = card?.method || ''
+  if (methodStr.includes('香薰') || methodStr.includes('熏香')) ms.add('aroma')
+  if (methodStr.includes('内用')) ms.add('internal')
+  if (methodStr.includes('涂抹')) ms.add('topical')
+  editCardMethodSet.value = ms
 }
 
 async function saveEditOil() {
   const dropCount = getEditDropCount()
+  const newName = editOilDisplayName.value.trim()
+  const oldName = editingOilName.value
   try {
+    // If name changed, delete old and create new
+    if (newName && newName !== oldName) {
+      await oils.deleteOil(oldName)
+    }
     await oils.saveOil(
-      editingOilName.value,
+      newName || oldName,
       editBottlePrice.value,
       dropCount,
-      editRetailPrice.value
+      editRetailPrice.value,
+      editOilEnName.value.trim() || null
     )
+    // Save knowledge card if any content provided
+    const finalName = newName || oldName
+    if (editCardEffects.value.trim() || editCardUsage.value.trim()) {
+      setOilCard(finalName, {
+        emoji: editCardEmoji.value || '🌿',
+        en: editOilEnName.value.trim() || '',
+        effects: editCardEffects.value.trim(),
+        usage: editCardUsage.value.trim(),
+        method: editCardMethod.value.trim(),
+        caution: editCardCaution.value.trim(),
+      })
+    }
+    cardVersion.value++ // trigger re-render for card badges
     ui.showToast('已更新')
     editingOilName.value = null
   } catch (e) {
@@ -518,22 +666,26 @@ async function removeOil(name) {
 
 // PDF Export
 function exportPDF() {
+  const today = new Date()
+  const dateStr = today.getFullYear() + String(today.getMonth()+1).padStart(2,'0') + String(today.getDate()).padStart(2,'0')
+  const title = '精油价目表' + dateStr
+
   const sortedNames = [...oils.oilNames].sort((a, b) => a.localeCompare(b, 'zh'))
   let rows = ''
   for (const name of sortedNames) {
     const meta = getMeta(name)
     if (!meta) continue
-    const bp = meta.bottlePrice != null ? '¥ ' + meta.bottlePrice.toFixed(2) : '--'
-    const rp = meta.retailPrice != null ? '¥ ' + meta.retailPrice.toFixed(2) : '--'
+    const en = getEnglishName(name)
+    const bp = meta.bottlePrice != null ? '¥' + meta.bottlePrice.toFixed(0) : '--'
+    const rp = meta.retailPrice != null ? '¥' + meta.retailPrice.toFixed(0) : '--'
     const vol = volumeLabel(meta.dropCount)
-    const dc = meta.dropCount || '--'
-    const ppd = oils.pricePerDrop(name) ? '¥ ' + oils.pricePerDrop(name).toFixed(4) : '--'
+    const ppd = oils.pricePerDrop(name) ? '¥' + oils.pricePerDrop(name).toFixed(2) : '--'
     rows += `<tr>
       <td>${name}</td>
+      <td>${en}</td>
       <td>${bp}</td>
       <td>${rp}</td>
       <td>${vol}</td>
-      <td>${dc}</td>
       <td>${ppd}</td>
     </tr>`
   }
@@ -541,40 +693,65 @@ function exportPDF() {
 <html>
 <head>
 <meta charset="utf-8">
-<title>精油价格表</title>
+<title>${title}</title>
 <style>
-  body { font-family: 'Noto Sans SC', sans-serif; padding: 20px; }
-  h1 { font-family: 'Noto Serif SC', serif; font-size: 20px; color: #2c2416; margin-bottom: 16px; }
-  table { width: 100%; border-collapse: collapse; font-size: 13px; }
-  th, td { padding: 8px 12px; text-align: left; border-bottom: 1px solid #e0d4c0; }
-  th { background: #eef4ee; color: #5a7d5e; font-weight: 600; }
-  tr:hover { background: #f9f7f4; }
-  @media print { body { padding: 0; } }
+  body { font-family: 'PingFang SC','Hiragino Sans GB','Microsoft YaHei',sans-serif; padding: 20px; font-size: 11px; color: #333; }
+  h1 { font-size: 18px; text-align: center; margin-bottom: 16px; }
+  table { width: 100%; border-collapse: collapse; }
+  th { background: #7a9e7e; color: white; padding: 6px 8px; text-align: center; font-size: 11px; font-weight: 600; }
+  td { padding: 5px 8px; border-bottom: 1px solid #e0e0e0; text-align: center; font-size: 11px; }
+  td:first-child, th:first-child { text-align: left; font-weight: 500; }
+  td:nth-child(2), th:nth-child(2) { text-align: left; }
+  tr:nth-child(even) { background: #f9f9f9; }
+  tr:hover { background: #e8f5e9; }
+  @media print { body { padding: 10px; } h1 { font-size: 16px; } }
 </style>
 </head>
 <body>
-<h1>精油价格表</h1>
+<h1>doTERRA 精油价目表 ${dateStr}</h1>
 <table>
   <thead>
-    <tr><th>精油</th><th>每瓶价格</th><th>零售价</th><th>容量</th><th>滴数</th><th>单价/滴</th></tr>
+    <tr><th>精油</th><th>英文名</th><th>会员价</th><th>零售价</th><th>容量</th><th>单价/滴</th></tr>
   </thead>
   <tbody>${rows}</tbody>
 </table>
+<p style="text-align:center;font-size:10px;color:#aaa;margin-top:12px">共 ${sortedNames.length} 种精油 · doTERRA 配方计算器导出</p>
 </body>
 </html>`
   const w = window.open('', '_blank')
   w.document.write(html)
   w.document.close()
-  w.onload = () => w.print()
+  w.document.title = title
+  setTimeout(() => w.print(), 500)
 }
 
-// Placeholder save image functions
-function saveDilutionImage() {
-  ui.showToast('保存图片功能开发中')
-}
-function saveContraImage() {
-  ui.showToast('保存图片功能开发中')
+// Save modal as image using html2canvas
+async function saveModalImage(name) {
+  try {
+    const { default: html2canvas } = await import('html2canvas')
+    const overlay = document.querySelector('.modal-overlay')
+    if (!overlay) return
+    const cardEl = overlay.querySelector('[style*="border-radius: 20px"], [style*="border-radius:20px"]') || overlay.children[0]
+    if (!cardEl) return
+    // Hide close buttons during capture
+    const btns = cardEl.querySelectorAll('button')
+    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) {
+    ui.showToast('保存失败')
+  }
 }
+
+function saveDilutionImage() { saveModalImage('精油稀释比例指南') }
+function saveContraImage() { saveModalImage('精油使用禁忌') }
+function saveCardImage(name) { saveModalImage(name + '_精油知识卡') }
 </script>
 
 <style scoped>
@@ -740,6 +917,15 @@ function saveContraImage() {
   border-radius: 12px;
   border: 1.5px solid var(--border, #e0d4c0);
 }
+/* Hide number input spinners in add form */
+.add-oil-form input[type="number"]::-webkit-inner-spin-button,
+.add-oil-form input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.add-oil-form input[type="number"] {
+  -moz-appearance: textfield;
+}
 
 .section-title {
   font-size: 14px;
@@ -891,39 +1077,57 @@ function saveContraImage() {
 }
 
 /* ===== Oil Grid ===== */
-.oil-grid {
+.oils-grid {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
-  gap: 8px;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 10px;
 }
 
 .oil-chip {
-  padding: 12px;
-  background: #fff;
-  border: 1.5px solid var(--border, #e0d4c0);
-  border-radius: 12px;
-  cursor: pointer;
+  background: white;
+  border-radius: 10px;
+  padding: 12px 16px;
+  box-shadow: 0 2px 8px rgba(90,60,30,0.06);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 8px;
   transition: all 0.15s;
   position: relative;
 }
 
 .oil-chip:hover {
-  border-color: var(--sage, #7a9e7e);
-  box-shadow: var(--shadow, 0 4px 20px rgba(90,60,30,0.08));
+  box-shadow: 0 4px 16px rgba(90,60,30,0.12);
 }
 
-.oil-chip--inactive {
-  opacity: 0.45;
-  filter: grayscale(0.6);
-}
-
-.oil-badge {
+.oil-chip-actions {
   position: absolute;
-  top: 8px;
   right: 8px;
-  font-size: 14px;
-  line-height: 1;
+  top: 50%;
+  transform: translateY(-50%);
+  display: none;
+  gap: 2px;
+  background: white;
+  border-radius: 6px;
+  padding: 2px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
 }
+.oil-chip-actions button {
+  background: none;
+  border: none;
+  cursor: pointer;
+  font-size: 11px;
+  padding: 4px 6px;
+  border-radius: 4px;
+  color: var(--text-light);
+}
+.oil-chip-actions button:hover {
+  background: var(--sage-mist);
+}
+.oil-chip:hover .oil-chip-actions {
+  display: flex;
+}
+
 
 .oil-chip-name {
   font-weight: 600;
@@ -982,14 +1186,9 @@ function saveContraImage() {
   transition: opacity 0.15s;
 }
 
-.oil-chip:hover .oil-actions {
-  opacity: 1;
-}
+.oil-chip:hover .oil-actions,
 
 /* When badge is present, push actions below */
-.oil-chip:hover .oil-badge {
-  display: none;
-}
 
 .btn-icon-sm {
   border: none;
@@ -1008,8 +1207,8 @@ function saveContraImage() {
 .oil-card-modal {
   background: #fff;
   border-radius: 16px;
-  max-width: 480px;
-  width: 100%;
+  max-width: 380px;
+  width: 92%;
   max-height: 85vh;
   overflow-y: auto;
   box-shadow: 0 8px 32px rgba(0, 0, 0, 0.22);
@@ -1289,7 +1488,7 @@ function saveContraImage() {
 
 /* ===== Responsive ===== */
 @media (max-width: 600px) {
-  .oil-grid {
+  .oils-grid {
     grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
   }
   .form-row {

frontend/src/views/RecipeManager.vue

@@ -58,40 +58,33 @@
       <button class="btn-sm btn-outline" @click="clearSelection">取消选择</button>
     </div>
 
-    <!-- My Recipes Section -->
+    <!-- My Recipes Section (from diary) -->
     <div class="recipe-section">
       <h3 class="section-title">📖 我的配方 ({{ myRecipes.length }})</h3>
       <div class="recipe-list">
         <div
-          v-for="r in myFilteredRecipes"
-          :key="r._id"
-          class="recipe-row"
-          :class="{ selected: selectedIds.has(r._id) }"
+          v-for="d in myFilteredRecipes"
+          :key="'diary-' + d.id"
+          class="recipe-row diary-row"
         >
-          <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>
+          <div class="row-info" @click="editDiaryRecipe(d)">
+            <span class="row-name">{{ d.name }}</span>
             <span class="row-tags">
-              <span v-for="t in r.tags" :key="t" class="mini-tag">{{ t }}</span>
+              <span v-for="t in (d.tags || [])" :key="t" class="mini-tag">{{ t }}</span>
             </span>
-            <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(r.ingredients)) }}</span>
+            <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
           </div>
           <div class="row-actions">
-            <button class="btn-icon" @click="editRecipe(r)" title="编辑">✏️</button>
-            <button class="btn-icon" @click="removeRecipe(r)" title="删除">🗑️</button>
+            <button class="btn-icon" @click="editDiaryRecipe(d)" title="编辑">✏️</button>
+            <button class="btn-icon" @click="removeDiaryRecipe(d)" title="删除">🗑️</button>
           </div>
         </div>
         <div v-if="myFilteredRecipes.length === 0" class="empty-hint">暂无个人配方</div>
       </div>
     </div>
 
-    <!-- Public Recipes Section (admin/senior_editor only) -->
-    <div v-if="auth.canManage" class="recipe-section">
+    <!-- Public Recipes Section -->
+    <div class="recipe-section">
       <h3 class="section-title">🌿 公共配方库 ({{ publicRecipes.length }})</h3>
       <div class="recipe-list">
         <div
@@ -203,10 +196,11 @@
 </template>
 
 <script setup>
-import { ref, computed, reactive } from 'vue'
+import { ref, computed, reactive, onMounted } 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'
@@ -217,6 +211,7 @@ import TagPicker from '../components/TagPicker.vue'
 const auth = useAuthStore()
 const oils = useOilsStore()
 const recipeStore = useRecipesStore()
+const diaryStore = useDiaryStore()
 const ui = useUiStore()
 
 const manageSearch = ref('')
@@ -243,13 +238,11 @@ const tagPickerName = ref('')
 const tagPickerTags = ref([])
 
 // Computed lists
-const myRecipes = computed(() =>
-  recipeStore.recipes.filter(r => r._owner_id === auth.user.id)
-)
+// "我的配方" = diary (user_diary table), personal recipes
+const myRecipes = computed(() => diaryStore.userDiary)
 
-const publicRecipes = computed(() =>
-  recipeStore.recipes.filter(r => r._owner_id !== auth.user.id)
-)
+// "公共配方库" = all recipes in public library (recipes table)
+const publicRecipes = computed(() => recipeStore.recipes)
 
 function filterBySearchAndTags(list) {
   let result = list
@@ -257,7 +250,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)))
     )
   }
@@ -401,6 +394,30 @@ 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

frontend/src/views/RecipeSearch.vue

@@ -50,28 +50,32 @@
     <!-- Personal Section (logged in) -->
     <div v-if="auth.isLoggedIn" class="personal-section">
       <div class="section-header" @click="showMyRecipes = !showMyRecipes">
-        <span>📖 我的配方</span>
+        <span>📖 我的配方 ({{ myDiaryRecipes.length }})</span>
         <span class="toggle-icon">{{ showMyRecipes ? '▾' : '▸' }}</span>
       </div>
       <div v-if="showMyRecipes" class="recipe-grid">
-        <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
+          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>
+          </div>
+        </div>
+        <div v-if="myDiaryRecipes.length === 0" class="empty-hint">暂无个人配方</div>
       </div>
 
       <div class="section-header" @click="showFavorites = !showFavorites">
-        <span>⭐ 收藏配方</span>
+        <span>⭐ 收藏配方 ({{ favoritesPreview.length }})</span>
         <span class="toggle-icon">{{ showFavorites ? '▾' : '▸' }}</span>
       </div>
       <div v-if="showFavorites" class="recipe-grid">
         <RecipeCard
-          v-for="(r, i) in favoritesPreview"
+          v-for="r in favoritesPreview"
           :key="r._id"
           :recipe="r"
           :index="findGlobalIndex(r)"
@@ -82,9 +86,9 @@
       </div>
     </div>
 
-    <!-- Fuzzy Search Results -->
-    <div v-if="searchQuery && fuzzyResults.length" class="search-results-section">
-      <div class="section-label">🔍 搜索结果 ({{ fuzzyResults.length }})</div>
+    <!-- Search Results (public recipes) -->
+    <div v-if="searchQuery" class="search-results-section">
+      <div class="section-label">🔍 公共配方搜索结果 ({{ fuzzyResults.length }})</div>
       <div class="recipe-grid">
         <RecipeCard
           v-for="(r, i) in fuzzyResults"
@@ -94,11 +98,12 @@
           @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 || fuzzyResults.length === 0">
+    <div v-if="!searchQuery">
       <div class="section-label">🌿 公共配方库 ({{ filteredRecipes.length }})</div>
       <div class="recipe-grid">
         <RecipeCard
@@ -123,10 +128,12 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, nextTick } from 'vue'
+import { ref, computed, onMounted, nextTick, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 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'
@@ -135,7 +142,10 @@ 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)
@@ -151,8 +161,32 @@ onMounted(async () => {
     if (res.ok) {
       categories.value = await res.json()
     }
-  } catch {
-    // category modules are optional
+  } 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 => r._id === 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() },
+      )
+    }
   }
 })
 
@@ -165,6 +199,7 @@ 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) {
@@ -173,6 +208,7 @@ const filteredRecipes = computed(() => {
   return list
 })
 
+// Search results from public recipes
 const fuzzyResults = computed(() => {
   if (!searchQuery.value.trim()) return []
   const q = searchQuery.value.trim().toLowerCase()
@@ -184,11 +220,18 @@ const fuzzyResults = computed(() => {
   })
 })
 
-const myRecipesPreview = computed(() => {
+// Personal recipes from diary (separate from public recipes)
+const myDiaryRecipes = computed(() => {
   if (!auth.isLoggedIn) return []
-  return recipeStore.recipes
-    .filter(r => r._owner_id === auth.user.id)
-    .slice(0, 6)
+  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
 })
 
 const favoritesPreview = computed(() => {
@@ -208,6 +251,29 @@ 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()
@@ -450,6 +516,43 @@ 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);
+}
+
 @media (max-width: 600px) {
   .recipe-grid {
     grid-template-columns: 1fr;