diff --git a/frontend/src/composables/useOilCards.js b/frontend/src/composables/useOilCards.js
index 451116c..9e10e67 100644
--- a/frontend/src/composables/useOilCards.js
+++ b/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]
+  }
+}
diff --git a/frontend/src/views/OilReference.vue b/frontend/src/views/OilReference.vue
index 2d8bc6a..ad4d0f2 100644
--- a/frontend/src/views/OilReference.vue
+++ b/frontend/src/views/OilReference.vue
@@ -1,168 +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="newOilEnName" class="form-input" placeholder="英文名 (English)" />
-        <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, 'oil-chip--active': activeChip === name }"
+        :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 @touchstart.stop="toggleChip(name)">
-          <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>
@@ -216,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>
@@ -232,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">
@@ -268,17 +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="editOilEnName" class="form-input" type="text" placeholder="English name" />
+            <label>精油名称</label>
+            <input v-model="editOilDisplayName" class="form-input" type="text" placeholder="精油名称" />
           </div>
           <div class="form-group">
-            <label>瓶价 (¥)</label>
-            <input v-model.number="editBottlePrice" class="form-input" type="number" />
+            <label>英文名</label>
+            <input v-model="editOilEnName" class="form-input" type="text" placeholder="English name" />
           </div>
           <div class="form-group">
             <label>容量</label>
@@ -295,10 +289,46 @@
             <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.bg + ';color:' + m.color + ';border-color:' + m.color : ''"
+                  style="padding:6px 14px;border-radius:16px;font-size:12px;border:1.5px solid var(--border);background:white;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>
@@ -316,7 +346,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()
@@ -327,9 +357,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
@@ -347,11 +379,59 @@ 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)
@@ -375,10 +455,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
@@ -501,6 +591,7 @@ 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
@@ -508,18 +599,51 @@ function editOil(name) {
   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,
       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) {
@@ -540,22 +664,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>`
   }
@@ -563,40 +691,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>
@@ -762,6 +915,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;
@@ -913,39 +1075,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;
@@ -1005,14 +1185,8 @@ function saveContraImage() {
 }
 
 .oil-chip:hover .oil-actions,
-.oil-chip--active .oil-actions {
-  opacity: 1;
-}
 
 /* When badge is present, push actions below */
-.oil-chip:hover .oil-badge {
-  display: none;
-}
 
 .btn-icon-sm {
   border: none;
@@ -1312,7 +1486,7 @@ function saveContraImage() {
 
 /* ===== Responsive ===== */
 @media (max-width: 600px) {
-  .oil-grid {
+  .oils-grid {
     grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
   }
   .form-row {