fix: 退出登录后在受保护页面跳转到配方查询页面

在 router/index.js 中为需要登录才能访问的路由（manage、inventory、
projects、mydiary、audit、bugs、users）添加 meta.requiresAuth 标记。

在 UserMenu.vue 的 handleLogout() 中检查当前路由是否需要登录，
如果是则 router.push('/') 跳回配方查询页，否则原地 reload。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitignore

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

backend/main.py

@@ -80,6 +80,7 @@ class OilIn(BaseModel):
     drop_count: int
     retail_price: Optional[float] = None
     en_name: Optional[str] = None
+    is_active: Optional[int] = None
 
 
 class IngredientIn(BaseModel):
@@ -659,10 +660,11 @@ 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) VALUES (?, ?, ?, ?, ?) "
+        "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)",
+        "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),
+        "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),
     )
     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

@@ -2,38 +2,23 @@
   <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" style="position:relative">
+  <div class="app-header">
-    <div class="header-inner" style="padding-right:80px">
+    <div class="header-inner">
-      <div class="header-icon">🌿</div>
+      <div class="header-left">
-      <div class="header-title" style="text-align:left;flex:1">
+        <div class="header-icon">🌿</div>
-        <h1 style="display:flex;justify-content:space-between;align-items:center;gap:8px;white-space:nowrap">
+        <div class="header-title">
-          <span style="flex-shrink:0">doTERRA 配方计算器
+          <h1>doTERRA 配方计算器</h1>
-            <span v-if="auth.isAdmin" style="font-size:10px;font-weight:400;opacity:0.5;vertical-align:top">v2.2.0</span>
+          <p>查询配方 · 计算成本 · 自制配方 · 导出卡片 · 精油知识</p>
-          </span>
+        </div>
-          <span
+      </div>
-            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"
+      <div class="header-right" @click="toggleUserMenu">
-            @click="toggleUserMenu"
+        <template v-if="auth.isLoggedIn">
-          >
+          <span v-if="auth.isBusiness" class="biz-badge" title="商业认证用户">🏢</span>
-            <template v-if="auth.isLoggedIn">
+          <span class="user-name">{{ auth.user.display_name || auth.user.username }} ▾</span>
-              👤 {{ auth.user.display_name || auth.user.username }}
+        </template>
-              ▾
+        <template v-else>
-            </template>
+          <span class="login-btn">登录</span>
-            <template v-else>
+        </template>
-              <span style="background:rgba(255,255,255,0.2);padding:4px 12px;border-radius:12px">登录</span>
-            </template>
-          </span>
-        </h1>
-        <p style="display:flex;flex-wrap:wrap;gap:4px 8px;margin:0">
-          <span style="white-space:nowrap">查询配方</span>
-          <span style="opacity:0.5">·</span>
-          <span style="white-space:nowrap">计算成本</span>
-          <span style="opacity:0.5">·</span>
-          <span style="white-space:nowrap">自制配方</span>
-          <span style="opacity:0.5">·</span>
-          <span style="white-space:nowrap">导出卡片</span>
-          <span style="opacity:0.5">·</span>
-          <span style="white-space:nowrap">精油知识</span>
-        </p>
       </div>
     </div>
   </div>
@@ -141,3 +126,66 @@ 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>

frontend/src/components/RecipeDetailOverlay.vue

@@ -36,8 +36,8 @@
           >English</button>
         </div>
 
-        <!-- Volume selector -->
+        <!-- Volume selector (only in editor mode) -->
-        <div class="card-volume-toggle">
+        <div v-if="viewMode === 'editor'" class="card-volume-toggle">
           <button
             v-for="(drops, ml) in VOLUME_DROPS"
             :key="ml"
@@ -49,77 +49,44 @@
 
         <!-- Card image (rendered by html2canvas) -->
         <div v-show="!cardImageUrl" ref="cardRef" class="export-card">
-          <!-- Brand overlay layers -->
+          <!-- Background image overlay -->
-          <div
+          <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>
-            v-if="brand.brand_bg"
+          <!-- QR: top-right -->
-            class="card-brand-bg"
+          <div v-if="brand.qr_code" style="position:absolute;top:20px;right:16px;display:flex;flex-direction:column;align-items:center;gap:3px;z-index:3">
-            :style="{ backgroundImage: `url('${brand.brand_bg}')` }"
+            <img :src="brand.qr_code" crossorigin="anonymous" style="width:54px;height:54px;object-fit:cover;border-radius:6px;box-shadow:0 2px 6px rgba(0,0,0,0.1)" />
-          />
+            <div v-if="brand.brand_name" :style="{ textAlign: brand.brand_align || 'center' }" style="font-size:7px;color:var(--text-light);line-height:1.3;max-width:68px;white-space:pre-line">{{ brand.brand_name }}</div>
-          <div v-if="brand.qr_code" class="card-qr-wrapper">
-            <img
-              :src="brand.qr_code"
-              class="card-qr"
-              crossorigin="anonymous"
-            />
-            <div v-if="brand.brand_name" class="card-qr-name">{{ brand.brand_name }}</div>
           </div>
-          <img
+          <!-- Card content -->
-            v-if="brand.brand_logo"
+          <div style="position:relative;z-index:2">
-            :src="brand.brand_logo"
+            <div class="ec-subtitle">
-            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="card-title">
+            <div class="ec-title">{{ getCardRecipeName() }}</div>
-              {{ getCardRecipeName() }}
+            <div style="width:80px;height:2px;background:linear-gradient(90deg,var(--sage),var(--gold));border-radius:2px;margin:14px 0"></div>
-            </div>
-            <div class="card-divider"></div>
 
-            <!-- Ingredients (excluding coconut oil) -->
+            <ul style="list-style:none;margin-bottom:20px;padding:0">
-            <ul class="card-ingredients">
+              <li v-for="(ing, i) in cardIngredients" :key="i" class="ec-ing">
-              <li v-for="(ing, i) in cardIngredients" :key="i">
+                <span class="ec-oil-name">{{ getCardOilName(ing.oil) }}</span>
-                <span class="card-oil-name">
+                <span class="ec-drops">{{ ing.drops }} {{ cardLang === 'en' ? 'drops' : '滴' }}</span>
-                  {{ getCardOilName(ing.oil) }}
+                <span class="ec-cost">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * ing.drops) }}</span>
-                </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>
-                <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>
 
-            <!-- Dilution description -->
+            <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>
-            <div v-if="dilutionDesc" class="card-dilution">{{ dilutionDesc }}</div>
 
-            <!-- Note -->
+            <div v-if="displayRecipe.note" style="font-size:12px;color:var(--brown-light);margin-bottom:12px;font-style:italic">📝 {{ displayRecipe.note }}</div>
-            <div v-if="displayRecipe.note" class="card-note">
+
-              {{ '📝 ' + displayRecipe.note }}
+            <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>
             </div>
 
-            <!-- Total cost bar -->
+            <!-- Logo left + Date right -->
-            <div class="card-total">
+            <div class="ec-bottom">
-              <div class="card-total-label">
+              <img v-if="brand.brand_logo" :src="brand.brand_logo" crossorigin="anonymous" class="ec-logo" />
-                {{ cardLang === 'en' ? 'Total Cost' : '配方总成本' }}
+              <span v-else></span>
-              </div>
+              <span class="ec-date">{{ cardLang === 'en' ? 'Date: ' : '制作日期：' }}{{ todayStr }}</span>
-              <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>
@@ -136,7 +103,7 @@
           <button
             v-if="cardLang === 'en' && authStore.canManage"
             class="action-btn"
-            @click="showTranslationEditor = true"
+            @click="openTranslationEditor"
           >✏️ 修改翻译</button>
           <button
             v-if="showBrandHint"
@@ -516,13 +483,25 @@ async function loadBrand() {
   } catch {
     brand.value = {}
   }
-  // Show upload prompt if user hasn't set up brand assets yet
+  // Prompt QR upload: logged-in users once per month, anonymous every time
   if (showBrandHint.value) {
-    const ok = await showConfirm(
+    let shouldPrompt = true
-      '上传你的专属二维码，让配方卡片更专业 ✨',
+    if (authStore.isLoggedIn) {
-      { okText: '去上传', cancelText: '取消' }
+      const lastPrompt = localStorage.getItem('qr_upload_prompt_time')
-    )
+      const oneMonth = 30 * 24 * 60 * 60 * 1000
-    if (ok) goUploadQr()
+      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()
+    }
   }
 }
 
@@ -583,11 +562,14 @@ async function saveImage() {
     await generateCardImage()
   }
   if (!cardImageUrl.value) return
-  const link = document.createElement('a')
+  const filename = `${recipe.value.name || '配方'}_配方卡`
-  link.download = `${recipe.value.name || '配方'}_配方卡.png`
+  try {
-  link.href = cardImageUrl.value
+    const { saveImageFromUrl } = await import('../composables/useSaveImage')
-  link.click()
+    await saveImageFromUrl(cardImageUrl.value, filename)
-  ui.showToast('已保存图片')
+    ui.showToast('已保存图片')
+  } catch {
+    ui.showToast('保存失败')
+  }
 }
 
 function copyText() {
@@ -613,28 +595,83 @@ function copyText() {
   })
 }
 
+function openTranslationEditor() {
+  // Pre-populate from single source of truth: oilsMeta.enName (DB)
+  const map = {}
+  for (const ing of cardIngredients.value) {
+    map[ing.oil] = getOilEnglish(ing.oil)
+  }
+  customOilNameEn.value = map
+  customRecipeNameEn.value = recipe.value.en_name || ''
+  showTranslationEditor.value = true
+}
+
 async function applyTranslation() {
   showTranslationEditor.value = false
-  // Persist en_name to backend
+  let saved = 0
-  if (recipe.value._id && customRecipeNameEn.value) {
+  let failed = 0
+
+  // 1. Save recipe English name to recipes table
+  if (recipe.value._id && customRecipeNameEn.value.trim()) {
     try {
       await api.put(`/api/recipes/${recipe.value._id}`, {
-        en_name: customRecipeNameEn.value,
+        en_name: customRecipeNameEn.value.trim(),
-        version: recipe.value._version,
       })
-      ui.showToast('翻译已保存')
+      saved++
     } catch (e) {
-      ui.showToast('翻译保存失败')
+      console.error('Save recipe en_name failed:', e)
+      failed++
     }
   }
+
+  // 2. Save each oil's English name to oils table
+  //    This is THE single source of truth — both oil reference page and recipe card read from here
+  for (const [oilName, enName] of Object.entries(customOilNameEn.value)) {
+    if (!enName?.trim()) continue
+    const meta = oilsStore.oilsMeta[oilName]
+    if (!meta) continue
+    if (meta.enName === enName.trim()) continue // no change
+    try {
+      await oilsStore.saveOil(oilName, meta.bottlePrice, meta.dropCount, meta.retailPrice, enName.trim())
+      saved++
+    } catch (e) {
+      console.error('Save oil en_name failed:', oilName, e)
+      failed++
+    }
+  }
+
+  // 3. Reload ALL data — this updates oilsMeta.enName and recipe.en_name
+  //    So the next render reads fresh data from the single source
+  await Promise.all([
+    oilsStore.loadOils(),
+    recipesStore.loadRecipes(),
+  ])
+
+  if (saved > 0) {
+    ui.showToast(`翻译已保存（${saved}项）` + (failed > 0 ? `，${failed}项失败` : ''))
+  } else if (failed > 0) {
+    ui.showToast(`保存失败 ${failed} 项`)
+  } else {
+    ui.showToast('没有修改')
+  }
+
+  // Regenerate card image with updated names from store
   cardImageUrl.value = null
   nextTick(() => generateCardImage())
 }
 
 // Override translation getters for card rendering
+function getOilEnglish(name) {
+  return oilsStore.oilsMeta[name]?.enName || oilEn(name) || ''
+}
+
 function getCardOilName(name) {
   if (cardLang.value === 'en') {
-    return customOilNameEn.value[name] || oilEn(name) || name
+    // 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 name
 }
@@ -1105,9 +1142,106 @@ async function saveRecipe() {
   border-radius: 50%;
 }
 
-.card-content {
+/* ===== Export Card Content (responsive) ===== */
-  position: relative;
+.ec-subtitle {
-  z-index: 2;
+  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; }
 }
 
 /* Brand overlays */
@@ -1127,12 +1261,12 @@ async function saveRecipe() {
 .card-qr-wrapper {
   position: absolute;
   top: 36px;
-  right: 24px;
+  right: 36px;
   display: flex;
   flex-direction: column;
   align-items: center;
   gap: 3px;
-  z-index: 2;
+  z-index: 3;
 }
 
 .card-qr {
@@ -1153,15 +1287,20 @@ async function saveRecipe() {
 }
 
 .card-logo {
-  position: absolute;
+  height: 28px;
-  bottom: 60px;
-  left: 50%;
-  transform: translateX(-50%);
-  height: 60px;
   object-fit: contain;
-  z-index: 1;
+  opacity: 0.6;
-  opacity: 0.2;
+}
-  pointer-events: none;
+.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;
 }
 
 .card-brand-text {
@@ -1260,6 +1399,7 @@ async function saveRecipe() {
   justify-content: space-between;
   align-items: center;
   margin-top: 8px;
+  margin-right: -80px; /* counteract card-content padding-right */
 }
 
 .card-total-label {
@@ -1284,8 +1424,7 @@ async function saveRecipe() {
 }
 
 .card-footer {
-  margin-top: 16px;
+  text-align: right;
-  text-align: center;
   font-size: 11px;
   color: var(--text-light, #9a8570);
   letter-spacing: 1px;

frontend/src/components/UserMenu.vue

@@ -123,7 +123,11 @@ function handleLogout() {
   auth.logout()
   ui.showToast('已退出登录')
   emit('close')
-  router.push('/')
+  if (router.currentRoute.value.meta.requiresAuth) {
+    router.push('/')
+  } else {
+    window.location.reload()
+  }
 }
 
 onMounted(loadNotifications)

frontend/src/composables/useOilTranslation.js

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

frontend/src/composables/useSaveImage.js

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

frontend/src/router/index.js

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

frontend/src/stores/oils.js

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

frontend/src/views/MyDiary.vue

@@ -2,8 +2,8 @@
   <div class="my-diary">
     <!-- Sub Tabs -->
     <div class="sub-tabs">
-      <button class="sub-tab" :class="{ active: activeTab === 'brand' }" @click="activeTab = 'brand'">🏷️ Brand</button>
+      <button class="sub-tab" :class="{ active: activeTab === 'brand' }" @click="activeTab = 'brand'">🏷 我的品牌</button>
-      <button class="sub-tab" :class="{ active: activeTab === 'account' }" @click="activeTab = 'account'">👤 Account</button>
+      <button class="sub-tab" :class="{ active: activeTab === 'account' }" @click="activeTab = 'account'">👤 我的账户</button>
     </div>
 
     <!-- Diary Tab -->
@@ -113,47 +113,94 @@
         <button class="btn-return" @click="goBackToRecipe">← 返回配方卡片</button>
       </div>
       <div class="section-card">
-        <h4>🏷️ 品牌设置</h4>
+        <p style="font-size:13px;color:var(--text-light);margin-bottom:16px">分享配方卡片时，二维码、背景图、Logo 会自动展示在卡片上</p>
 
-        <div class="form-group">
+        <!-- Three upload areas side by side -->
-          <label>品牌名称</label>
+        <div style="display:flex;gap:20px;flex-wrap:wrap;margin-bottom:16px">
-          <input v-model="brandName" class="form-input" placeholder="您的品牌名称" @blur="saveBrandSettings" />
+          <!-- QR Code -->
-        </div>
+          <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>
 
-        <div class="form-group">
+          <!-- Background -->
-          <label>二维码链接</label>
+          <div>
-          <input v-model="brandQrUrl" class="form-input" placeholder="https://..." @blur="saveBrandSettings" />
+            <label class="form-label">🖼 背景图</label>
-          <div v-if="brandQrUrl" class="qr-preview">
+            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">铺满整张卡片，半透明</p>
-            <img :src="'https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=' + encodeURIComponent(brandQrUrl)" alt="QR" class="qr-img" />
+            <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>我的二维码图片</label>
+          <label class="form-label">品牌名称或标语（显示在二维码下方）</label>
-          <div class="upload-area" @click="triggerUpload('qr')">
+          <textarea v-model="brandName" class="form-control" rows="2" placeholder="扫码申请成为优惠顾客&#10;我的精油小屋" style="max-width:350px;font-size:13px" @blur="saveBrandSettings"></textarea>
-            <img v-if="brandQrImage" :src="brandQrImage" class="upload-preview qr-upload-preview" />
+          <div style="display:flex;gap:6px;margin-top:6px">
-            <span v-else class="upload-hint">📲 点击上传二维码图片</span>
+            <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>
           </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">
+        <!-- Card Preview -->
-          <label>品牌Logo</label>
+        <div style="margin-bottom:16px">
-          <div class="upload-area" @click="triggerUpload('logo')">
+          <label class="form-label">📋 配方卡片预览</label>
-            <img v-if="brandLogo" :src="brandLogo" class="upload-preview" />
+          <div class="card-preview-mini">
-            <span v-else class="upload-hint">点击上传Logo</span>
+            <!-- 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>
-          <input ref="logoInput" type="file" accept="image/*" style="display:none" @change="handleUpload('logo', $event)" />
         </div>
 
-        <div class="form-group">
+        <div style="display:flex;gap:8px;align-items:center">
-          <label>卡片背景</label>
+          <button class="btn btn-primary" @click="saveBrandSettings">💾 保存品牌设置</button>
-          <div class="upload-area" @click="triggerUpload('bg')">
+          <button v-if="returnRecipeId" class="btn btn-outline" @click="goBackToRecipe">← 返回配方卡片</button>
-            <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>
@@ -241,6 +288,7 @@ 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)
@@ -362,6 +410,7 @@ async function loadBrandSettings() {
       brandQrImage.value = data.qr_code || ''
       brandLogo.value = data.brand_logo || ''
       brandBg.value = data.brand_bg || ''
+      brandAlign.value = data.brand_align || 'center'
     }
   } catch {
     // no brand settings yet
@@ -370,15 +419,16 @@ async function loadBrandSettings() {
 
 async function saveBrandSettings() {
   try {
-    await api('/api/brand', {
+    const res = await api('/api/brand', {
       method: 'PUT',
       body: JSON.stringify({
         brand_name: brandName.value,
-        qr_url: brandQrUrl.value,
+        brand_align: brandAlign.value,
       }),
     })
+    if (res.ok) ui.showToast('已保存')
   } catch {
-    // silent
+    ui.showToast('保存失败')
   }
 }
 
@@ -397,14 +447,96 @@ function readFileAsBase64(file) {
   })
 }
 
+// Compress image if too large (keeps PNG for small images, JPEG for large)
+function compressImage(base64, maxSize = 500000) {
+  return new Promise((resolve) => {
+    if (base64.length <= maxSize) { resolve(base64); return }
+    const img = new Image()
+    img.onload = () => {
+      const canvas = document.createElement('canvas')
+      let w = img.width, h = img.height
+      const maxDim = 600
+      if (w > maxDim || h > maxDim) {
+        const ratio = Math.min(maxDim / w, maxDim / h)
+        w = Math.round(w * ratio)
+        h = Math.round(h * ratio)
+      }
+      canvas.width = w
+      canvas.height = h
+      canvas.getContext('2d').drawImage(img, 0, 0, w, h)
+      // Try PNG first, then JPEG with decreasing quality
+      let result = canvas.toDataURL('image/png')
+      if (result.length > maxSize) {
+        let quality = 0.85
+        while (quality > 0.2) {
+          result = canvas.toDataURL('image/jpeg', quality)
+          if (result.length <= maxSize) break
+          quality -= 0.1
+        }
+      }
+      resolve(result)
+    }
+    img.onerror = () => resolve(base64) // fallback: return original
+    img.src = base64
+  })
+}
+
+// Crop image to square from center
+function cropToSquare(base64) {
+  return new Promise((resolve) => {
+    const img = new Image()
+    img.onload = () => {
+      const size = Math.min(img.width, img.height)
+      const x = (img.width - size) / 2
+      const y = (img.height - size) / 2
+      const canvas = document.createElement('canvas')
+      canvas.width = size
+      canvas.height = size
+      canvas.getContext('2d').drawImage(img, x, y, size, size, 0, 0, size, size)
+      resolve(canvas.toDataURL('image/png'))
+    }
+    img.onerror = () => resolve(base64)
+    img.src = base64
+  })
+}
+
+// Check if image is roughly square
+function checkSquare(base64) {
+  return new Promise((resolve) => {
+    const img = new Image()
+    img.onload = () => {
+      const ratio = img.width / img.height
+      resolve(ratio > 0.85 && ratio < 1.15) // within 15% of square
+    }
+    img.onerror = () => resolve(true)
+    img.src = base64
+  })
+}
+
 async function handleUpload(type, event) {
   const file = event.target.files[0]
   if (!file) return
   try {
-    const base64 = await readFileAsBase64(file)
+    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 }),
@@ -413,10 +545,32 @@ async function handleUpload(type, event) {
       if (type === 'logo') brandLogo.value = base64
       else if (type === 'bg') brandBg.value = base64
       else if (type === 'qr') brandQrImage.value = base64
-      ui.showToast('上传成功')
+      ui.showToast('上传成功 ✓')
+    } else {
+      const err = await res.json().catch(() => ({}))
+      ui.showToast('上传失败: ' + (err.detail || res.status))
     }
+  } catch (e) {
+    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('清除失败')
   }
 }
 
@@ -853,6 +1007,61 @@ async function applyBusiness() {
   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;

frontend/src/views/OilReference.vue

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

frontend/src/views/RecipeManager.vue

@@ -196,7 +196,7 @@
 </template>
 
 <script setup>
-import { ref, computed, reactive, onMounted } from 'vue'
+import { ref, computed, reactive, onMounted, watch } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
 import { useRecipesStore } from '../stores/recipes'
@@ -431,10 +431,8 @@ async function removeRecipe(recipe) {
 
 async function approveRecipe(recipe) {
   try {
-    await api('/api/recipes/' + recipe._id + '/approve', { method: 'POST' })
+    await api('/api/recipes/' + recipe._id + '/adopt', { method: 'POST' })
-    pendingRecipes.value = pendingRecipes.value.filter(r => r._id !== recipe._id)
+    ui.showToast('已采纳')
-    pendingCount.value--
-    ui.showToast('已通过')
     await recipeStore.loadRecipes()
   } catch {
     ui.showToast('操作失败')
@@ -442,11 +440,11 @@ async function approveRecipe(recipe) {
 }
 
 async function rejectRecipe(recipe) {
+  const ok = await showConfirm(`确定删除「${recipe.name}」？`)
+  if (!ok) return
   try {
-    await api('/api/recipes/' + recipe._id + '/reject', { method: 'POST' })
+    await recipeStore.deleteRecipe(recipe._id)
-    pendingRecipes.value = pendingRecipes.value.filter(r => r._id !== recipe._id)
+    ui.showToast('已删除')
-    pendingCount.value--
-    ui.showToast('已拒绝')
   } catch {
     ui.showToast('操作失败')
   }
@@ -474,16 +472,13 @@ function onTagPickerSave(tags) {
   showTagPicker.value = false
 }
 
-// Load pending if admin
+watch(() => recipeStore.recipes, () => {
-if (auth.isAdmin) {
+  if (auth.isAdmin) {
-  api('/api/recipes/pending').then(async res => {
+    const pending = recipeStore.recipes.filter(r => r._owner_id && r._owner_id !== auth.user.id)
-    if (res.ok) {
+    pendingRecipes.value = pending
-      const data = await res.json()
+    pendingCount.value = pending.length
-      pendingRecipes.value = data
+  }
-      pendingCount.value = data.length
+}, { immediate: true })
-    }
-  }).catch(() => {})
-}
 </script>
 
 <style scoped>

frontend/src/views/RecipeSearch.vue

@@ -64,6 +64,7 @@
           <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>
@@ -173,7 +174,7 @@ onMounted(async () => {
   if (openRecipeId) {
     router.replace({ path: '/', query: {} })
     const tryOpen = () => {
-      const idx = recipeStore.recipes.findIndex(r => r._id === openRecipeId)
+      const idx = recipeStore.recipes.findIndex(r => String(r._id) === String(openRecipeId))
       if (idx >= 0) {
         openDetail(idx)
         return true
@@ -282,6 +283,31 @@ 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
 }
@@ -553,6 +579,18 @@ function clearSearch() {
   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;