UI: 批量操作改为展开菜单，各区域独立全选

- 批量操作改为按钮点击展开菜单（打标签/导出卡片/共享/删除）
- 共享到公共库仅在全选我的配方且未选公共配方时显示
- 我的配方和公共配方库各有独立的✓全选按钮
- 两个区域都全选后，顶部全选按钮激活

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

backend/database.py

@@ -163,6 +163,8 @@ def init_db():
         c.execute("ALTER TABLE users ADD COLUMN brand_bg TEXT")
     if "brand_align" not in user_cols:
         c.execute("ALTER TABLE users ADD COLUMN brand_align TEXT DEFAULT 'center'")
+    if "role_changed_at" not in user_cols:
+        c.execute("ALTER TABLE users ADD COLUMN role_changed_at TEXT")
 
     # Migration: add tags to user_diary
     diary_cols = [row[1] for row in c.execute("PRAGMA table_info(user_diary)").fetchall()]

backend/main.py

@@ -501,7 +501,7 @@ def get_my_business_application(user=Depends(get_current_user)):
 def list_business_applications(user=Depends(require_role("admin"))):
     conn = get_db()
     rows = conn.execute(
-        "SELECT a.id, a.user_id, a.business_name, a.document, a.status, a.created_at, "
+        "SELECT a.id, a.user_id, a.business_name, a.document, a.status, a.reject_reason, a.created_at, "
         "u.display_name, u.username FROM business_applications a "
         "LEFT JOIN users u ON a.user_id = u.id ORDER BY a.id DESC"
     ).fetchall()
@@ -614,6 +614,21 @@ def reject_translation(sid: int, user=Depends(require_role("admin"))):
     return {"ok": True}
 
 
+@app.post("/api/business-grant/{user_id}")
+def grant_business(user_id: int, user=Depends(require_role("admin"))):
+    conn = get_db()
+    conn.execute("UPDATE users SET business_verified = 1 WHERE id = ?", (user_id,))
+    target = conn.execute("SELECT role, display_name, username FROM users WHERE id = ?", (user_id,)).fetchone()
+    if target:
+        conn.execute(
+            "INSERT INTO notifications (target_role, title, body, target_user_id) VALUES (?, ?, ?, ?)",
+            (target["role"], "🎉 商业认证已开通", "管理员已为你开通商业用户认证，现在可以使用商业核算等功能。", user_id)
+        )
+    conn.commit()
+    conn.close()
+    return {"ok": True}
+
+
 @app.post("/api/business-revoke/{user_id}")
 def revoke_business(user_id: int, body: dict = None, user=Depends(require_role("admin"))):
     conn = get_db()
@@ -1014,7 +1029,7 @@ def update_user(user_id: int, body: UserUpdate, user=Depends(require_role("admin
         if body.role == "admin":
             conn.close()
             raise HTTPException(403, "不能将用户设为管理员")
-        conn.execute("UPDATE users SET role = ? WHERE id = ?", (body.role, user_id))
+        conn.execute("UPDATE users SET role = ?, role_changed_at = datetime('now') WHERE id = ?", (body.role, user_id))
     if body.display_name is not None:
         conn.execute("UPDATE users SET display_name = ? WHERE id = ?", (body.display_name, user_id))
     log_audit(conn, user["id"], "update_user", "user", user_id, None,
@@ -1223,14 +1238,15 @@ def create_diary(body: dict, user=Depends(get_current_user)):
     name = body.get("name", "").strip()
     ingredients = body.get("ingredients", [])
     note = body.get("note", "")
+    tags = body.get("tags", [])
     source_id = body.get("source_recipe_id")
     if not name:
         raise HTTPException(400, "请输入配方名称")
     conn = get_db()
     c = conn.cursor()
     c.execute(
-        "INSERT INTO user_diary (user_id, source_recipe_id, name, ingredients, note) VALUES (?, ?, ?, ?, ?)",
+        "INSERT INTO user_diary (user_id, source_recipe_id, name, ingredients, note, tags) VALUES (?, ?, ?, ?, ?, ?)",
-        (user["id"], source_id, name, json.dumps(ingredients, ensure_ascii=False), note)
+        (user["id"], source_id, name, json.dumps(ingredients, ensure_ascii=False), note, json.dumps(tags, ensure_ascii=False))
     )
     conn.commit()
     did = c.lastrowid
@@ -1478,15 +1494,19 @@ def get_notifications(user=Depends(get_current_user)):
     if not user["id"]:
         return []
     conn = get_db()
-    # Only show notifications created after user registration
+    # Only show notifications after user registration or last role change (whichever is later)
-    user_created = conn.execute("SELECT created_at FROM users WHERE id = ?", (user["id"],)).fetchone()
+    user_row = conn.execute("SELECT created_at, role_changed_at FROM users WHERE id = ?", (user["id"],)).fetchone()
-    created_at = user_created["created_at"] if user_created else "2000-01-01"
+    cutoff = "2000-01-01"
+    if user_row:
+        cutoff = user_row["created_at"] or cutoff
+        if user_row["role_changed_at"] and user_row["role_changed_at"] > cutoff:
+            cutoff = user_row["role_changed_at"]
     rows = conn.execute(
         "SELECT id, title, body, is_read, created_at FROM notifications "
         "WHERE (target_user_id = ? OR (target_user_id IS NULL AND (target_role = ? OR target_role = 'all'))) "
         "AND created_at >= ? "
         "ORDER BY is_read ASC, id DESC LIMIT 200",
-        (user["id"], user["role"], created_at)
+        (user["id"], user["role"], cutoff)
     ).fetchall()
     conn.close()
     return [dict(r) for r in rows]

frontend/package-lock.json

@@ -12,7 +12,8 @@
         "html2canvas": "^1.4.1",
         "pinia": "^2.3.1",
         "vue": "^3.5.32",
-        "vue-router": "^4.6.4"
+        "vue-router": "^4.6.4",
+        "xlsx": "^0.18.5"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^6.0.5",
@@ -1179,6 +1180,15 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -1637,6 +1647,19 @@
       "dev": true,
       "license": "Apache-2.0"
     },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/chai": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
@@ -1761,6 +1784,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/codepage": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2571,6 +2603,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -4684,6 +4725,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
@@ -5490,6 +5543,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -5533,6 +5604,27 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "license": "ISC"
     },
+    "node_modules/xlsx": {
+      "version": "0.18.5",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
+        "codepage": "~1.15.0",
+        "crc-32": "~1.2.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/xml-name-validator": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",

frontend/package.json

@@ -18,7 +18,8 @@
     "html2canvas": "^1.4.1",
     "pinia": "^2.3.1",
     "vue": "^3.5.32",
-    "vue-router": "^4.6.4"
+    "vue-router": "^4.6.4",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^6.0.5",

frontend/src/App.vue

@@ -82,9 +82,6 @@ const allTabs = [
   { key: 'inventory', icon: '📦', label: '个人库存',  require: 'login' },
   { key: 'oils',      icon: '💧', label: '精油价目' },
   { key: 'projects',  icon: '💼', label: '商业核算',  require: 'login' },
-  { key: 'audit',     icon: '📜', label: '操作日志',  hide: 'admin' },
-  { key: 'bugs',      icon: '🐛', label: 'Bug',       hide: 'admin' },
-  { key: 'users',     icon: '👥', label: '用户管理',  hide: 'admin' },
 ]
 
 // 所有人都能看到大部分 tab，bug 和用户管理只有 admin 可见

frontend/src/components/RecipeCard.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="recipe-card" @click="$emit('click', index)">
-    <div class="recipe-card-name">{{ recipe.name }}</div>
+    <div class="recipe-card-name" :style="{ fontSize: recipe.name.length > 12 ? (recipe.name.length > 20 ? '12px' : '14px') : '16px' }">{{ recipe.name }}</div>
-    <div v-if="recipe.tags && recipe.tags.length" class="recipe-card-tags">
+    <div v-if="visibleTags.length" class="recipe-card-tags">
-      <span v-for="tag in recipe.tags" :key="tag" class="tag">{{ tag }}</span>
+      <span v-for="tag in visibleTags" :key="tag" class="tag" :class="{ 'tag-reviewed': tag === '已审核' }">{{ tag }}</span>
     </div>
     <div class="recipe-card-oils">{{ oilNames }}</div>
     <div class="recipe-card-bottom">
@@ -21,6 +21,9 @@
 import { computed } from 'vue'
 import { useOilsStore } from '../stores/oils'
 import { useRecipesStore } from '../stores/recipes'
+import { useAuthStore } from '../stores/auth'
+
+const EDITOR_ONLY_TAGS = ['已审核']
 
 const props = defineProps({
   recipe: { type: Object, required: true },
@@ -31,6 +34,13 @@ defineEmits(['click', 'toggle-fav'])
 
 const oilsStore = useOilsStore()
 const recipesStore = useRecipesStore()
+const auth = useAuthStore()
+
+const visibleTags = computed(() => {
+  if (!props.recipe.tags) return []
+  if (auth.canEdit) return props.recipe.tags
+  return props.recipe.tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+})
 
 const oilNames = computed(() =>
   props.recipe.ingredients.map(i => i.oil).join('、')
@@ -79,6 +89,11 @@ const isFav = computed(() => recipesStore.isFavorite(props.recipe))
   color: #5a7d5e;
 }
 
+.tag-reviewed {
+  background: #e3f2fd;
+  color: #1565c0;
+}
+
 .recipe-card-oils {
   font-size: 12px;
   color: #9a8570;

frontend/src/components/RecipeDetailOverlay.vue

@@ -17,7 +17,7 @@
           <button
             v-if="canEditThisRecipe"
             class="action-btn action-btn-sm"
-            @click="viewMode = 'editor'"
+            @click="goEditInManager"
           >编辑</button>
           <button class="detail-close-btn" @click="handleClose">✕</button>
         </div>
@@ -144,154 +144,72 @@
           </div>
         </div>
 
-        <!-- Tip -->
+        <!-- Volume selector -->
-        <div class="editor-tip">
+        <div class="editor-section">
-          💡 推荐按照单次用量（椰子油10~20滴）添加纯精油，系统会根据容量和稀释比例自动计算。
+          <label class="editor-label">容量</label>
+          <div class="volume-controls">
+            <button class="volume-btn" :class="{ active: selectedVolume === 'single' }" @click="selectedVolume = 'single'">单次</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '5' }" @click="selectedVolume = '5'">5ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '10' }" @click="selectedVolume = '10'">10ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '15' }" @click="selectedVolume = '15'">15ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '20' }" @click="selectedVolume = '20'">20ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === '30' }" @click="selectedVolume = '30'">30ml</button>
+            <button class="volume-btn" :class="{ active: selectedVolume === 'custom' }" @click="selectedVolume = 'custom'">自定义</button>
+          </div>
+          <div v-if="selectedVolume === 'custom'" class="custom-volume-row">
+            <input v-model.number="customVolumeValue" type="number" min="1" class="editor-drops" placeholder="ml" />
+            <span style="font-size:12px;color:#999">ml</span>
+          </div>
+          <div class="dilution-row">
+            <span class="dilution-label">参考比例 1:</span>
+            <select v-model.number="dilutionRatio" class="editor-select" style="width:60px">
+              <option v-for="n in [3,4,5,6,7,8,9,10,12,15,20]" :key="n" :value="n">{{ n }}</option>
+            </select>
+            <span class="ratio-hint">纯精油总数约为 {{ editorSuggestedEo }} 滴</span>
+          </div>
         </div>
 
-        <!-- Ingredients table -->
+        <!-- Ingredients table (EO only, coconut at bottom) -->
         <div class="editor-section">
           <table class="editor-table">
             <thead>
-              <tr>
+              <tr><th>精油</th><th>滴数</th><th>单价/滴</th><th>小计</th><th></th></tr>
-                <th>精油</th>
-                <th>滴数</th>
-                <th>单价/滴</th>
-                <th>小计</th>
-                <th></th>
-              </tr>
             </thead>
             <tbody>
-              <tr v-for="(ing, i) in editIngredients" :key="i">
+              <tr v-for="(ing, i) in editEoIngredients" :key="'eo-'+i">
                 <td>
                   <select v-model="ing.oil" class="editor-select">
                     <option value="">选择精油</option>
                     <option v-for="name in oilsStore.oilNames" :key="name" :value="name">{{ name }}</option>
                   </select>
                 </td>
+                <td><input v-model.number="ing.drops" type="number" min="0.5" step="0.5" class="editor-drops" /></td>
+                <td class="ing-ppd">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil)) : '-' }}</td>
+                <td class="ing-cost">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * (ing.drops || 0)) : '-' }}</td>
+                <td><button class="remove-row-btn" @click="editIngredients.splice(editIngredients.indexOf(ing), 1)">✕</button></td>
+              </tr>
+              <!-- Coconut oil row -->
+              <tr v-if="editCocoRow" class="coco-row">
+                <td><span class="coco-label">椰子油</span></td>
                 <td>
-                  <input
+                  <template v-if="selectedVolume === 'single'">
-                    v-model.number="ing.drops"
+                    <input v-model.number="editCocoRow.drops" type="number" min="0" class="editor-drops" />
-                    type="number"
+                  </template>
-                    min="0.5"
+                  <template v-else>
-                    step="0.5"
+                    <span class="coco-fill">填满 (约{{ editorCocoFillMl }}ml)</span>
-                    class="editor-drops"
+                  </template>
-                  />
-                </td>
-                <td class="ing-ppd">
-                  {{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil)) : '-' }}
-                </td>
-                <td class="ing-cost">
-                  {{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * (ing.drops || 0)) : '-' }}
-                </td>
-                <td>
-                  <button class="remove-row-btn" @click="removeIngredient(i)">✕</button>
                 </td>
+                <td class="ing-ppd">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop('椰子油')) }}</td>
+                <td class="ing-cost">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop('椰子油') * editorCocoActualDrops) }}</td>
+                <td><button class="remove-row-btn" @click="editCocoRow = null">✕</button></td>
               </tr>
             </tbody>
           </table>
-
+          <button class="add-row-btn" @click="addEoRow">+ 添加精油</button>
-          <!-- Add ingredient row -->
-          <div v-if="showAddRow" class="add-ingredient-row">
-            <div class="oil-autocomplete">
-              <input
-                v-model="oilSearchQuery"
-                @focus="showOilDropdown = true"
-                @blur="closeOilDropdown"
-                @input="newIngOil = ''"
-                class="editor-input oil-search-input"
-                placeholder="搜索精油名称或英文..."
-                autocomplete="off"
-              />
-              <div v-if="showOilDropdown && filteredOilsForAdd.length" class="oil-dropdown">
-                <div
-                  v-for="name in filteredOilsForAdd"
-                  :key="name"
-                  class="oil-dropdown-item"
-                  :class="{ 'is-selected': newIngOil === name }"
-                  @mousedown.prevent="selectNewOil(name)"
-                >
-                  <span>{{ name }}</span>
-                  <span class="oil-dropdown-en">{{ oilEn(name) }}</span>
-                </div>
-              </div>
-            </div>
-            <input
-              v-model.number="newIngDrops"
-              type="number"
-              placeholder="滴数"
-              min="0.5"
-              step="0.5"
-              class="editor-drops"
-            />
-            <button class="action-btn action-btn-primary action-btn-sm" @click="confirmAddIngredient">确认</button>
-            <button class="action-btn action-btn-sm" @click="cancelAddRow">取消</button>
-          </div>
-          <button v-else class="add-row-btn" @click="showAddRow = true">+ 添加精油</button>
         </div>
 
-        <!-- Volume & Dilution controls -->
+        <!-- Real-time summary -->
-        <div class="editor-section">
+        <div class="recipe-summary">{{ editorSummaryText }}</div>
-          <label class="editor-label">容量与稀释</label>
-          <div class="volume-controls">
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === 'single' }"
-              @click="selectedVolume = 'single'"
-            >单次</button>
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === '5' }"
-              @click="selectedVolume = '5'"
-            >5ml</button>
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === '10' }"
-              @click="selectedVolume = '10'"
-            >10ml</button>
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === '30' }"
-              @click="selectedVolume = '30'"
-            >30ml</button>
-            <button
-              class="volume-btn"
-              :class="{ active: selectedVolume === 'custom' }"
-              @click="selectedVolume = 'custom'"
-            >自定义</button>
-          </div>
-
-          <!-- Custom volume input -->
-          <div v-if="selectedVolume === 'custom'" class="custom-volume-row">
-            <input
-              v-model.number="customVolumeValue"
-              type="number"
-              min="1"
-              class="editor-drops"
-              placeholder="数量"
-            />
-            <select v-model="customVolumeUnit" class="editor-select" style="width:80px">
-              <option value="drops">滴</option>
-              <option value="ml">ml</option>
-            </select>
-          </div>
-
-          <!-- Dilution ratio -->
-          <div class="dilution-row">
-            <span class="dilution-label">稀释比例 1:</span>
-            <select v-model.number="dilutionRatio" class="editor-select" style="width:70px">
-              <option v-for="n in 20" :key="n" :value="n">{{ n }}</option>
-            </select>
-          </div>
-
-          <button class="action-btn action-btn-primary action-btn-sm" @click="applyVolumeDilution" style="margin-top:8px">
-            应用到配方
-          </button>
-
-          <div class="hint" style="margin-top:8px">
-            {{ dilutionHint }}
-          </div>
-        </div>
 
         <!-- Notes -->
         <div class="editor-section">
@@ -308,35 +226,18 @@
               <span class="tag-remove" @click="removeTag(tag)">×</span>
             </span>
           </div>
-          <!-- Candidate tags (from allTags, excluding already selected) -->
           <div class="candidate-tags" v-if="candidateTags.length">
-            <span
+            <span v-for="tag in candidateTags" :key="tag" class="candidate-tag" @click="addTag(tag)">+ {{ tag }}</span>
-              v-for="tag in candidateTags"
-              :key="tag"
-              class="candidate-tag"
-              @click="addTag(tag)"
-            >+ {{ tag }}</span>
           </div>
-          <!-- Manual tag input -->
           <div class="tag-input-row">
-            <input
+            <input v-model="newTagInput" type="text" class="editor-input" placeholder="添加新标签..." @keydown.enter="addNewTag" style="flex:1" />
-              v-model="newTagInput"
-              type="text"
-              class="editor-input"
-              placeholder="添加新标签..."
-              @keydown.enter="addNewTag"
-              style="flex:1"
-            />
             <button class="action-btn action-btn-sm" @click="addNewTag" :disabled="!newTagInput.trim()">+</button>
           </div>
         </div>
 
         <!-- Total cost -->
         <div class="editor-total">
-          总计: {{ editPriceInfo.cost }}
+          总计: {{ editorTotalCost }}
-          <span v-if="editPriceInfo.hasRetail" class="editor-retail">
-            零售 {{ editPriceInfo.retail }}
-          </span>
         </div>
       </div>
     </div>
@@ -789,7 +690,62 @@ function cancelAddRow() {
 const selectedVolume = ref('single')
 const customVolumeValue = ref(100)
 const customVolumeUnit = ref('drops')
-const dilutionRatio = ref(3)
+const dilutionRatio = ref(6)
+const editCocoRow = ref({ oil: '椰子油', drops: 10 })
+
+const editEoIngredients = computed(() =>
+  editIngredients.value.filter(i => i.oil !== '椰子油')
+)
+const editorEoDrops = computed(() =>
+  editEoIngredients.value.filter(i => i.oil && i.drops > 0).reduce((s, i) => s + i.drops, 0)
+)
+const editorTargetDrops = computed(() => {
+  if (selectedVolume.value === 'single') return null
+  if (selectedVolume.value === 'custom') return Math.round((customVolumeValue.value || 0) * DROPS_PER_ML)
+  return Math.round(Number(selectedVolume.value) * DROPS_PER_ML)
+})
+const editorCocoActualDrops = computed(() => {
+  if (!editCocoRow.value) return 0
+  if (selectedVolume.value === 'single') return editCocoRow.value.drops || 0
+  if (!editorTargetDrops.value) return 0
+  return Math.max(0, editorTargetDrops.value - editorEoDrops.value)
+})
+const editorCocoFillMl = computed(() => Math.round(editorCocoActualDrops.value / DROPS_PER_ML))
+const editorSuggestedEo = computed(() => {
+  if (selectedVolume.value === 'single') {
+    const coco = editCocoRow.value ? (editCocoRow.value.drops || 10) : 10
+    return Math.round(coco / dilutionRatio.value)
+  }
+  return Math.round((editorTargetDrops.value || 0) / (1 + dilutionRatio.value))
+})
+const editorSummaryText = computed(() => {
+  const eo = editorEoDrops.value
+  const coco = editorCocoActualDrops.value
+  const ratio = eo > 0 ? Math.round(coco / eo) : 0
+  if (selectedVolume.value === 'single') {
+    return `该配方为单次用量，纯精油 ${eo} 滴，椰子油 ${coco} 滴，稀释比例 1:${ratio}`
+  }
+  const vol = selectedVolume.value === 'custom' ? (customVolumeValue.value || 0) : Number(selectedVolume.value)
+  return `该配方总容量 ${vol}ml，纯精油 ${eo} 滴，剩余用椰子油填满，稀释比例 1:${ratio}`
+})
+const editorTotalCost = computed(() => {
+  let cost = editEoIngredients.value.filter(i => i.oil && i.drops > 0)
+    .reduce((s, i) => s + oilsStore.pricePerDrop(i.oil) * i.drops, 0)
+  cost += oilsStore.pricePerDrop('椰子油') * editorCocoActualDrops.value
+  return oilsStore.fmtPrice(cost)
+})
+
+function addEoRow() {
+  editIngredients.value.push({ oil: '', drops: 1 })
+}
+
+function goEditInManager() {
+  const r = recipe.value
+  // Store recipe id for manager to pick up
+  localStorage.setItem('oil_edit_recipe_id', String(r._id))
+  emit('close')
+  router.push('/manage')
+}
 
 const editPriceInfo = computed(() =>
   oilsStore.fmtCostWithRetail(editIngredients.value.filter(i => i.oil))
@@ -833,7 +789,10 @@ onMounted(() => {
   editName.value = r.name
   editNote.value = r.note || ''
   editTags.value = [...(r.tags || [])]
-  editIngredients.value = (r.ingredients || []).map(i => ({ oil: i.oil, drops: i.drops }))
+  const allIngs = (r.ingredients || [])
+  editIngredients.value = allIngs.filter(i => i.oil !== '椰子油').map(i => ({ oil: i.oil, drops: i.drops }))
+  const coco = allIngs.find(i => i.oil === '椰子油')
+  editCocoRow.value = coco ? { oil: '椰子油', drops: coco.drops } : { oil: '椰子油', drops: 10 }
   // Init translation defaults
   customRecipeNameEn.value = r.en_name || recipeNameEn(r.name)
   const enMap = {}
@@ -842,6 +801,23 @@ onMounted(() => {
   })
   customOilNameEn.value = enMap
 
+  // Calculate current dilution ratio and volume from ingredients
+  const cocoIng = allIngs.find(i => i.oil === '椰子油')
+  const eoTotal = allIngs.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
+  const cocoTotal = cocoIng ? (cocoIng.drops || 0) : 0
+  const totalDrops = eoTotal + cocoTotal
+  if (eoTotal > 0 && cocoTotal > 0) {
+    dilutionRatio.value = Math.round(cocoTotal / eoTotal)
+  }
+  const ml = totalDrops / DROPS_PER_ML
+  if (ml <= 1.5) selectedVolume.value = 'single'
+  else if (Math.abs(ml - 5) < 1.5) selectedVolume.value = '5'
+  else if (Math.abs(ml - 10) < 3) selectedVolume.value = '10'
+  else if (Math.abs(ml - 15) < 3) selectedVolume.value = '15'
+  else if (Math.abs(ml - 20) < 4) selectedVolume.value = '20'
+  else if (Math.abs(ml - 30) < 8) selectedVolume.value = '30'
+  else { selectedVolume.value = 'custom'; customVolumeValue.value = Math.round(ml) }
+
   loadBrand()
   nextTick(() => generateCardImage())
 })
@@ -1002,23 +978,28 @@ function previewFromEditor() {
 }
 
 async function saveRecipe() {
-  const ingredients = editIngredients.value.filter(i => i.oil && i.drops > 0)
+  const eoIngs = editIngredients.value.filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
   if (!editName.value.trim()) {
     ui.showToast('请输入配方名称')
     return
   }
-  if (ingredients.length === 0) {
+  if (eoIngs.length === 0) {
     ui.showToast('请至少添加一种精油')
     return
   }
 
+  const allIngs = eoIngs.map(i => ({ oil_name: i.oil, drops: i.drops }))
+  if (editCocoRow.value && editorCocoActualDrops.value > 0) {
+    allIngs.push({ oil_name: '椰子油', drops: editorCocoActualDrops.value })
+  }
+
   try {
     const payload = {
       ...recipe.value,
       name: editName.value.trim(),
       note: editNote.value.trim(),
       tags: editTags.value,
-      ingredients: ingredients.map(i => ({ oil_name: i.oil, drops: i.drops })),
+      ingredients: allIngs,
     }
     await recipesStore.saveRecipe(payload)
     // Reload recipes so the data is fresh when re-opened
@@ -1778,6 +1759,15 @@ async function saveRecipe() {
   color: var(--sage-dark, #5a7d5e);
 }
 
+.coco-row { background: #f8faf8; }
+.coco-label { font-weight: 600; color: #4a9d7e; font-size: 13px; }
+.coco-fill { font-size: 12px; color: #4a9d7e; font-weight: 500; }
+.recipe-summary {
+  padding: 10px 14px; background: #f0faf5; border-radius: 10px; border-left: 3px solid #7ec6a4;
+  font-size: 13px; color: #2e7d5a; margin-bottom: 12px; line-height: 1.6;
+}
+.ratio-hint { font-size: 12px; color: #4a9d7e; font-weight: 500; white-space: nowrap; }
+
 /* Volume controls */
 .volume-controls {
   display: flex;

frontend/src/components/UserMenu.vue

@@ -14,6 +14,11 @@
         <button class="usermenu-btn" @click="showBugReport">
           🐛 反馈问题
         </button>
+        <template v-if="auth.isAdmin">
+          <button class="usermenu-btn" @click="goAdmin('audit')">📜 操作日志</button>
+          <button class="usermenu-btn" @click="goAdmin('bugs')">🐛 Bug管理</button>
+          <button class="usermenu-btn" @click="goAdmin('users')">👥 用户管理</button>
+        </template>
         <button class="usermenu-btn usermenu-btn-logout" @click="handleLogout">
           🚪 退出登录
         </button>
@@ -88,6 +93,11 @@ function goMyDiary() {
   router.push('/mydiary')
 }
 
+function goAdmin(section) {
+  emit('close')
+  router.push('/' + section)
+}
+
 function toggleNotifications() {
   showNotifPanel.value = !showNotifPanel.value
   showBugForm.value = false

frontend/src/composables/usePinyinMatch.js

@@ -43,6 +43,20 @@ const PINYIN_MAP = {
   '丽': 'l', '清': 'q', '新': 'x', '自': 'z', '然': 'r',
   '植': 'z', '物': 'w', '芳': 'f', '疗': 'l', '复': 'f',
   '方': 'f', '单': 'd', '配': 'p', '调': 'd',
+  '忍': 'r', '圆': 'y', '侧': 'c', '呵': 'h', '铠': 'k',
+  '浆': 'j', '萸': 'y', '瑞': 'r', '芙': 'f', '蓉': 'r',
+  '桃': 't', '梅': 'm', '兰': 'l', '竹': 'z', '荆': 'j',
+  '藏': 'z', '蒿': 'h', '艾': 'a', '牡': 'm', '丹': 'd',
+  '参': 's', '芝': 'z', '灵': 'l', '芍': 's', '药': 'y',
+  '枫': 'f', '桦': 'h', '柳': 'l', '榉': 'j', '楠': 'n',
+  '海': 'h', '滨': 'b', '泽': 'z', '湖': 'h', '溪': 'x',
+  '威': 'w', '夷': 'y', '亚': 'y', '欧': 'o', '非': 'f',
+  '印': 'y', '澳': 'a', '美': 'm', '德': 'd', '法': 'f',
+  '意': 'y', '英': 'y', '日': 'r', '韩': 'h', '泰': 't',
+  '醒': 'x', '提': 't', '振': 'z', '镇': 'z', '抚': 'f',
+  '触': 'c', '修': 'x', '养': 'y', '滋': 'z', '润': 'r',
+  '呼': 'h', '吸': 'x', '消': 'x', '化': 'h', '排': 'p',
+  '毒': 'd', '净': 'j', '纤': 'x', '体': 't', '塑': 's',
 }
 
 /**
@@ -69,5 +83,5 @@ export function matchesPinyinInitials(name, query) {
   const initials = getPinyinInitials(name)
   if (!initials) return false
   const q = query.toLowerCase()
-  return initials.includes(q)
+  return initials.startsWith(q)
 }

frontend/src/views/AuditLog.vue

@@ -4,7 +4,7 @@
 
     <!-- Action Type Filters -->
     <div class="filter-row">
-      <span class="filter-label">操作类型:</span>
+      <span class="filter-label">操作:</span>
       <button
         v-for="action in actionTypes"
         :key="action.value"
@@ -15,7 +15,7 @@
     </div>
 
     <!-- User Filters -->
-    <div class="filter-row" v-if="uniqueUsers.length > 0">
+    <div class="filter-row" v-if="uniqueUsers.length > 1">
       <span class="filter-label">用户:</span>
       <button
         v-for="u in uniqueUsers"
@@ -26,26 +26,30 @@
       >{{ u }}</button>
     </div>
 
+    <!-- Target Type Filters -->
+    <div class="filter-row">
+      <span class="filter-label">对象:</span>
+      <button
+        v-for="t in targetTypes"
+        :key="t.value"
+        class="filter-btn"
+        :class="{ active: selectedTarget === t.value }"
+        @click="selectedTarget = selectedTarget === t.value ? '' : t.value"
+      >{{ t.label }}</button>
+    </div>
+
     <!-- Log List -->
     <div class="log-list">
-      <div v-for="log in filteredLogs" :key="log._id || log.id" class="log-item">
+      <div v-for="log in filteredLogs" :key="log.id" class="log-item">
         <div class="log-header">
-          <span class="log-action" :class="actionClass(log.action)">{{ actionLabel(log.action) }}</span>
+          <span class="log-action" :class="actionColorClass(log.action)">{{ actionLabel(log.action) }}</span>
           <span class="log-user">{{ log.user_name || log.username || '系统' }}</span>
           <span class="log-time">{{ formatTime(log.created_at) }}</span>
         </div>
         <div class="log-detail">
-          <span v-if="log.target_type" class="log-target">{{ log.target_type }}: </span>
+          <span v-if="log.target_name" class="log-target-name">{{ log.target_name }}</span>
-          <span class="log-desc">{{ log.description || log.detail || formatDetail(log) }}</span>
+          <span v-if="parsedDetail(log)" class="log-extra">{{ parsedDetail(log) }}</span>
         </div>
-        <div v-if="log.changes" class="log-changes">
-          <pre class="changes-pre">{{ typeof log.changes === 'string' ? log.changes : JSON.stringify(log.changes, null, 2) }}</pre>
-        </div>
-        <button
-          v-if="log.undoable"
-          class="btn-undo"
-          @click="undoLog(log)"
-        >↩ 撤销</button>
       </div>
       <div v-if="filteredLogs.length === 0" class="empty-hint">暂无日志记录</div>
     </div>
@@ -61,29 +65,46 @@
 
 <script setup>
 import { ref, computed, onMounted } from 'vue'
-import { useAuthStore } from '../stores/auth'
-import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
-import { showConfirm } from '../composables/useDialog'
-
-const auth = useAuthStore()
-const ui = useUiStore()
 
 const logs = ref([])
 const loading = ref(false)
 const hasMore = ref(true)
 const page = ref(0)
-const pageSize = 50
+const pageSize = 100
 const selectedAction = ref('')
 const selectedUser = ref('')
+const selectedTarget = ref('')
+
+const ACTION_MAP = {
+  create_recipe: '新增配方',
+  update_recipe: '编辑配方',
+  delete_recipe: '删除配方',
+  adopt_recipe: '采纳配方',
+  reject_recipe: '拒绝配方',
+  undo_delete_recipe: '恢复配方',
+  upsert_oil: '编辑精油',
+  delete_oil: '删除精油',
+  create_tag: '新增标签',
+  delete_tag: '删除标签',
+  create_user: '创建用户',
+  update_user: '修改用户',
+  delete_user: '删除用户',
+  undo_delete_user: '恢复用户',
+}
 
 const actionTypes = [
-  { value: 'create', label: '创建' },
+  { value: 'recipe', label: '配方' },
-  { value: 'update', label: '更新' },
+  { value: 'oil', label: '精油' },
-  { value: 'delete', label: '删除' },
+  { value: 'user', label: '用户' },
-  { value: 'login', label: '登录' },
+  { value: 'tag', label: '标签' },
-  { value: 'approve', label: '审核' },
+  { value: 'adopt', label: '审核' },
-  { value: 'export', label: '导出' },
+]
+
+const targetTypes = [
+  { value: 'recipe', label: '配方' },
+  { value: 'oil', label: '精油' },
+  { value: 'user', label: '用户' },
 ]
 
 const uniqueUsers = computed(() => {
@@ -98,59 +119,55 @@ const uniqueUsers = computed(() => {
 const filteredLogs = computed(() => {
   let result = logs.value
   if (selectedAction.value) {
-    result = result.filter(l => l.action === selectedAction.value)
+    result = result.filter(l => l.action.includes(selectedAction.value))
   }
   if (selectedUser.value) {
-    result = result.filter(l =>
+    result = result.filter(l => (l.user_name || l.username) === selectedUser.value)
-      (l.user_name || l.username) === selectedUser.value
+  }
-    )
+  if (selectedTarget.value) {
+    result = result.filter(l => l.target_type === selectedTarget.value)
   }
   return result
 })
 
 function actionLabel(action) {
-  const map = {
+  return ACTION_MAP[action] || action
-    create: '创建',
-    update: '更新',
-    delete: '删除',
-    login: '登录',
-    approve: '审核',
-    reject: '拒绝',
-    export: '导出',
-    undo: '撤销',
-  }
-  return map[action] || action
 }
 
-function actionClass(action) {
+function actionColorClass(action) {
-  return {
+  if (action.includes('create') || action.includes('upsert')) return 'color-create'
-    'action-create': action === 'create',
+  if (action.includes('update')) return 'color-update'
-    'action-update': action === 'update',
+  if (action.includes('delete') || action.includes('reject')) return 'color-delete'
-    'action-delete': action === 'delete' || action === 'reject',
+  if (action.includes('adopt') || action.includes('undo')) return 'color-approve'
-    'action-login': action === 'login',
+  return ''
-    'action-approve': action === 'approve',
+}
+
+function parsedDetail(log) {
+  if (!log.detail) return ''
+  try {
+    const d = JSON.parse(log.detail)
+    const parts = []
+    if (d.from_user) parts.push(`来自: ${d.from_user}`)
+    if (d.reason) parts.push(`原因: ${d.reason}`)
+    if (d.role) parts.push(`角色: ${d.role}`)
+    if (d.display_name) parts.push(`显示名: ${d.display_name}`)
+    if (d.original_log_id) parts.push(`恢复自 #${d.original_log_id}`)
+    if (parts.length) return parts.join(' · ')
+    // For deleted users, show username
+    if (d.username) return `用户名: ${d.username}`
+    return ''
+  } catch {
+    return log.detail.length > 100 ? log.detail.substring(0, 100) + '...' : log.detail
   }
 }
 
 function formatTime(t) {
   if (!t) return ''
-  const d = new Date(t)
+  return new Date(t + 'Z').toLocaleString('zh-CN', {
-  return d.toLocaleString('zh-CN', {
+    month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
   })
 }
 
-function formatDetail(log) {
-  if (log.target_name) return log.target_name
-  if (log.recipe_name) return log.recipe_name
-  if (log.oil_name) return log.oil_name
-  return ''
-}
-
 async function fetchLogs() {
   loading.value = true
   try {
@@ -158,9 +175,7 @@ async function fetchLogs() {
     if (res.ok) {
       const data = await res.json()
       const items = Array.isArray(data) ? data : data.logs || data.items || []
-      if (items.length < pageSize) {
+      if (items.length < pageSize) hasMore.value = false
-        hasMore.value = false
-      }
       logs.value.push(...items)
     }
   } catch {
@@ -174,207 +189,52 @@ function loadMore() {
   fetchLogs()
 }
 
-async function undoLog(log) {
+onMounted(() => fetchLogs())
-  const ok = await showConfirm('确定撤销此操作？')
-  if (!ok) return
-  try {
-    const id = log._id || log.id
-    const res = await api(`/api/audit-log/${id}/undo`, { method: 'POST' })
-    if (res.ok) {
-      ui.showToast('已撤销')
-      // Refresh
-      logs.value = []
-      page.value = 0
-      hasMore.value = true
-      await fetchLogs()
-    } else {
-      ui.showToast('撤销失败')
-    }
-  } catch {
-    ui.showToast('撤销失败')
-  }
-}
-
-onMounted(() => {
-  fetchLogs()
-})
 </script>
 
 <style scoped>
-.audit-log {
+.audit-log { padding: 0 12px 24px; }
-  padding: 0 12px 24px;
+.page-title { margin: 0 0 16px; font-size: 16px; color: #3e3a44; }
-}
-
-.page-title {
-  margin: 0 0 16px;
-  font-size: 16px;
-  color: #3e3a44;
-}
 
 .filter-row {
-  display: flex;
+  display: flex; align-items: center; gap: 6px; margin-bottom: 8px; flex-wrap: wrap;
-  align-items: center;
-  gap: 6px;
-  margin-bottom: 10px;
-  flex-wrap: wrap;
 }
-
+.filter-label { font-size: 13px; color: #6b6375; font-weight: 500; white-space: nowrap; }
-.filter-label {
-  font-size: 13px;
-  color: #6b6375;
-  font-weight: 500;
-  white-space: nowrap;
-}
-
 .filter-btn {
-  padding: 5px 14px;
+  padding: 4px 12px; border-radius: 16px; border: 1.5px solid #e5e4e7;
-  border-radius: 16px;
+  background: #fff; font-size: 12px; cursor: pointer; font-family: inherit; color: #6b6375;
-  border: 1.5px solid #e5e4e7;
-  background: #fff;
-  font-size: 12px;
-  cursor: pointer;
-  font-family: inherit;
-  color: #6b6375;
-  transition: all 0.15s;
-}
-
-.filter-btn.active {
-  background: #e8f5e9;
-  border-color: #7ec6a4;
-  color: #2e7d5a;
-  font-weight: 600;
-}
-
-.filter-btn:hover {
-  border-color: #d4cfc7;
-}
-
-.log-list {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
 }
+.filter-btn.active { background: #e8f5e9; border-color: #7ec6a4; color: #2e7d5a; font-weight: 600; }
+.filter-btn:hover { border-color: #d4cfc7; }
 
+.log-list { display: flex; flex-direction: column; gap: 4px; }
 .log-item {
-  padding: 12px 14px;
+  padding: 10px 14px; background: #fff; border: 1.5px solid #e5e4e7; border-radius: 10px;
-  background: #fff;
-  border: 1.5px solid #e5e4e7;
-  border-radius: 10px;
-  transition: border-color 0.15s;
-}
-
-.log-item:hover {
-  border-color: #d4cfc7;
-}
-
-.log-header {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  margin-bottom: 4px;
 }
+.log-item:hover { border-color: #d4cfc7; }
 
+.log-header { display: flex; align-items: center; gap: 8px; }
 .log-action {
-  padding: 2px 10px;
+  padding: 2px 10px; border-radius: 10px; font-size: 11px; font-weight: 600;
-  border-radius: 10px;
+  background: #f0eeeb; color: #6b6375; white-space: nowrap;
-  font-size: 11px;
-  font-weight: 600;
-  background: #f0eeeb;
-  color: #6b6375;
 }
+.color-create { background: #e8f5e9; color: #2e7d5a; }
+.color-update { background: #e3f2fd; color: #1565c0; }
+.color-delete { background: #ffebee; color: #c62828; }
+.color-approve { background: #f3e5f5; color: #7b1fa2; }
 
-.action-create { background: #e8f5e9; color: #2e7d5a; }
+.log-user { font-size: 13px; font-weight: 500; color: #3e3a44; }
-.action-update { background: #e3f2fd; color: #1565c0; }
+.log-time { font-size: 11px; color: #b0aab5; margin-left: auto; white-space: nowrap; }
-.action-delete { background: #ffebee; color: #c62828; }
+.log-detail { font-size: 13px; color: #6b6375; margin-top: 2px; }
-.action-login { background: #fff3e0; color: #e65100; }
+.log-target-name { font-weight: 500; color: #3e3a44; margin-right: 8px; }
-.action-approve { background: #f3e5f5; color: #7b1fa2; }
+.log-extra { color: #999; font-size: 12px; }
-
-.log-user {
-  font-size: 13px;
-  font-weight: 500;
-  color: #3e3a44;
-}
-
-.log-time {
-  font-size: 11px;
-  color: #b0aab5;
-  margin-left: auto;
-}
-
-.log-detail {
-  font-size: 13px;
-  color: #6b6375;
-  margin-top: 2px;
-}
-
-.log-target {
-  font-weight: 500;
-  color: #3e3a44;
-}
-
-.log-changes {
-  margin-top: 6px;
-}
-
-.changes-pre {
-  font-size: 11px;
-  background: #f8f7f5;
-  padding: 8px 10px;
-  border-radius: 6px;
-  overflow-x: auto;
-  margin: 0;
-  color: #6b6375;
-  font-family: ui-monospace, Consolas, monospace;
-  line-height: 1.5;
-  max-height: 120px;
-}
-
-.btn-undo {
-  margin-top: 8px;
-  padding: 4px 12px;
-  border: 1.5px solid #e5e4e7;
-  border-radius: 8px;
-  background: #fff;
-  font-size: 12px;
-  cursor: pointer;
-  font-family: inherit;
-  color: #6b6375;
-}
-
-.btn-undo:hover {
-  border-color: #7ec6a4;
-  color: #4a9d7e;
-}
-
-.load-more {
-  text-align: center;
-  margin-top: 16px;
-}
 
+.load-more { text-align: center; margin-top: 16px; }
 .btn-outline {
-  background: #fff;
+  background: #fff; color: #6b6375; border: 1.5px solid #d4cfc7; border-radius: 10px;
-  color: #6b6375;
+  padding: 9px 28px; font-size: 13px; cursor: pointer; font-family: inherit;
-  border: 1.5px solid #d4cfc7;
-  border-radius: 10px;
-  padding: 9px 28px;
-  font-size: 13px;
-  cursor: pointer;
-  font-family: inherit;
-}
-
-.btn-outline:hover {
-  background: #f8f7f5;
-}
-
-.btn-outline:disabled {
-  opacity: 0.5;
-  cursor: default;
-}
-
-.empty-hint {
-  text-align: center;
-  color: #b0aab5;
-  font-size: 13px;
-  padding: 32px 0;
 }
+.btn-outline:hover { background: #f8f7f5; }
+.btn-outline:disabled { opacity: 0.5; cursor: default; }
+.empty-hint { text-align: center; color: #b0aab5; font-size: 13px; padding: 32px 0; }
 </style>

frontend/src/views/MyDiary.vue

@@ -241,56 +241,58 @@
       </div>
 
       <!-- Business Verification -->
-      <div ref="bizCertRef" class="section-card">
+      <div ref="bizCertRef" class="section-card biz-card">
-        <h4>💼 商业认证</h4>
+        <h4>🏢 商业用户认证</h4>
 
         <!-- 已认证 -->
-        <div v-if="auth.isBusiness" class="biz-status biz-approved">
+        <div v-if="auth.isBusiness" class="biz-status-bar biz-approved">
-          <div class="biz-status-icon">✅</div>
+          <span>✅ 已认证商业用户</span>
-          <div class="biz-status-text">已认证商业用户</div>
         </div>
 
         <!-- 审核中 -->
-        <template v-else-if="bizApp.status === 'pending'">
+        <div v-else-if="bizApp.status === 'pending'" class="biz-status-bar biz-pending">
-          <div class="biz-status biz-pending">
+          <span>⏳ 认证申请审核中</span>
-            <div class="biz-status-icon">⏳</div>
+          <div class="biz-status-detail">商户名：{{ bizApp.business_name }} · 提交时间：{{ formatDate(bizApp.created_at) }}</div>
-            <div class="biz-status-text">认证申请审核中</div>
+        </div>
-            <div class="biz-status-detail">商户名：{{ bizApp.business_name }}</div>
-            <div class="biz-status-detail">提交时间：{{ formatDate(bizApp.created_at) }}</div>
-          </div>
-        </template>
 
-        <!-- 被拒绝，可重新申请 -->
+        <!-- 被拒绝 -->
         <template v-else-if="bizApp.status === 'rejected'">
-          <div class="biz-status biz-rejected">
+          <div class="biz-status-bar biz-rejected">
-            <div class="biz-status-icon">❌</div>
+            <span>❌ 认证申请未通过</span>
-            <div class="biz-status-text">认证申请未通过</div>
+            <div v-if="bizApp.reject_reason" class="biz-status-detail">原因：{{ bizApp.reject_reason }}</div>
-            <div v-if="bizApp.reject_reason" class="biz-reject-reason">原因：{{ bizApp.reject_reason }}</div>
           </div>
           <p class="hint-text">你可以修改信息后重新申请。</p>
-          <div class="form-group">
-            <label>商户名称</label>
-            <input v-model="businessName" class="form-input" placeholder="你的商户/品牌名称" />
-          </div>
-          <div class="form-group">
-            <label>申请说明</label>
-            <textarea v-model="businessReason" class="form-textarea" rows="3" placeholder="请说明您的业务情况和申请理由..."></textarea>
-          </div>
-          <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim()">重新申请</button>
         </template>
 
-        <!-- 首次申请 -->
+        <!-- 申请表单（首次或被拒后重新申请） -->
-        <template v-else>
+        <template v-if="!auth.isBusiness && bizApp.status !== 'pending'">
-          <p class="hint-text">申请商业认证后可使用商业核算功能，请填写以下信息。</p>
+          <div class="biz-form">
-          <div class="form-group">
+            <div class="form-group">
-            <label>商户名称</label>
+              <label class="form-label">认证类型 *</label>
-            <input v-model="businessName" class="form-input" placeholder="你的商户/品牌名称" />
+              <select v-model="bizType" class="form-select">
+                <option value="">请选择</option>
+                <option value="individual">个体经营户</option>
+                <option value="company">公司</option>
+                <option value="studio">工作室/美容院</option>
+                <option value="distributor">代理商</option>
+              </select>
+            </div>
+            <div class="form-group">
+              <label class="form-label">企业/商户名称 *</label>
+              <input v-model="businessName" class="form-input" placeholder="你的企业或品牌名称" />
+            </div>
+            <div class="form-group">
+              <label class="form-label">联系电话 *</label>
+              <input v-model="bizPhone" class="form-input" type="tel" placeholder="联系电话" />
+            </div>
+            <div class="form-group">
+              <label class="form-label">业务描述</label>
+              <textarea v-model="businessReason" class="form-textarea" rows="3" placeholder="描述你的业务范围和计划..."></textarea>
+            </div>
+            <div style="display:flex;gap:10px;margin-top:12px">
+              <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim() || !bizType">💾 提交申请</button>
+            </div>
           </div>
-          <div class="form-group">
-            <label>申请说明</label>
-            <textarea v-model="businessReason" class="form-textarea" rows="3" placeholder="请说明您的业务情况和申请理由..."></textarea>
-          </div>
-          <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim()">提交申请</button>
         </template>
       </div>
     </div>
@@ -341,6 +343,8 @@ const newPassword = ref('')
 const confirmPassword = ref('')
 const businessName = ref('')
 const businessReason = ref('')
+const bizType = ref('')
+const bizPhone = ref('')
 const bizApp = ref({ status: null })
 
 onMounted(async () => {
@@ -669,24 +673,30 @@ async function changePassword() {
 }
 
 async function applyBusiness() {
-  if (!businessName.value.trim()) {
+  if (!businessName.value.trim() || !bizType.value) {
-    ui.showToast('请填写商户名称')
+    ui.showToast('请填写必填项')
     return
   }
+  const typeLabels = { individual: '个体经营户', company: '公司', studio: '工作室/美容院', distributor: '代理商' }
+  const info = [
+    `认证类型：${typeLabels[bizType.value] || bizType.value}`,
+    bizPhone.value ? `联系电话：${bizPhone.value}` : '',
+    businessReason.value ? `业务描述：${businessReason.value}` : '',
+  ].filter(Boolean).join('\n')
   try {
     const res = await api('/api/business-apply', {
       method: 'POST',
       body: JSON.stringify({
         business_name: businessName.value.trim(),
-        document: businessReason.value.trim(),
+        document: info,
       }),
     })
     if (res.ok) {
       businessName.value = ''
       businessReason.value = ''
-      bizApp.value = { status: 'pending', business_name: businessName.value }
+      bizType.value = ''
+      bizPhone.value = ''
       ui.showToast('申请已提交，请等待管理员审核')
-      // Reload status
       const bizRes = await api('/api/my-business-application')
       if (bizRes.ok) bizApp.value = await bizRes.json()
     } else {
@@ -1147,19 +1157,27 @@ async function applyBusiness() {
   text-align: center;
 }
 
-.biz-status {
+.biz-card { border-radius: 16px; }
-  padding: 16px;
+.biz-status-bar {
-  border-radius: 12px;
+  padding: 12px 16px;
-  text-align: center;
+  border-radius: 10px;
+  font-size: 14px;
+  font-weight: 500;
   margin-bottom: 12px;
+  line-height: 1.6;
 }
-.biz-status-icon { font-size: 32px; margin-bottom: 8px; }
+.biz-status-bar.biz-approved { background: #e8f5e9; color: #2e7d32; border-left: 3px solid #4caf50; }
-.biz-status-text { font-size: 15px; font-weight: 600; margin-bottom: 4px; }
+.biz-status-bar.biz-pending { background: #fff3e0; color: #e65100; border-left: 3px solid #ff9800; }
-.biz-status-detail { font-size: 12px; color: #999; }
+.biz-status-bar.biz-rejected { background: #ffebee; color: #c62828; border-left: 3px solid #f44336; }
-.biz-approved { background: #e8f5e9; color: #2e7d5a; }
+.biz-status-detail { font-size: 12px; margin-top: 4px; opacity: 0.8; }
-.biz-pending { background: #fff8e1; color: #e65100; }
+.biz-form { margin-top: 8px; }
-.biz-rejected { background: #fce4ec; color: #c62828; }
+.biz-form .form-group { margin-bottom: 14px; }
-.biz-reject-reason { font-size: 13px; margin-top: 8px; padding: 8px 12px; background: rgba(0,0,0,0.05); border-radius: 8px; }
+.biz-form .form-label { display: block; font-size: 13px; font-weight: 600; color: #3e3a44; margin-bottom: 6px; }
+.biz-form .form-select {
+  width: 100%; padding: 10px 14px; border: 1.5px solid #d4cfc7; border-radius: 10px;
+  font-size: 14px; font-family: inherit; background: #fff; outline: none; box-sizing: border-box;
+}
+.biz-form .form-select:focus { border-color: #7ec6a4; }
 
 /* Buttons */
 .btn-primary {

frontend/src/views/OilReference.vue

@@ -260,7 +260,7 @@
     </div>
 
     <!-- Edit Oil Overlay -->
-    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="saveEditOil">
+    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="$event.isComposing || saveEditOil()">
       <div class="modal-panel">
         <div class="modal-header">
           <h3>{{ editingOilName }}</h3>

frontend/src/views/Projects.vue

@@ -42,26 +42,53 @@
         <button class="btn-outline btn-sm" @click="importFromRecipe">📋 从配方导入</button>
       </div>
 
-      <!-- Ingredients Editor -->
+      <!-- Ingredients Table -->
       <div class="ingredients-section">
-        <h4>🧴 配方成分</h4>
+        <div class="section-header-row">
-        <div v-for="(ing, i) in selectedProject.ingredients" :key="i" class="ing-row">
+          <h4>🧴 配方成分</h4>
-          <select v-model="ing.oil" class="form-select" @change="saveProject">
+          <div class="section-actions">
-            <option value="">选择精油</option>
+            <button class="btn-outline btn-sm" @click="addIngredient">＋ 添加精油</button>
-            <option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
+          </div>
-          </select>
+        </div>
-          <input
+        <table class="ingredients-table">
-            v-model.number="ing.drops"
+          <thead>
-            type="number"
+            <tr>
-            min="0"
+              <th>精油</th>
-            class="form-input-sm"
+              <th>单次用量(滴)</th>
-            placeholder="滴数"
+              <th>单价/滴</th>
-            @change="saveProject"
+              <th>小计</th>
-          />
+              <th></th>
-          <span class="ing-cost">{{ ing.oil ? oils.fmtPrice(oils.pricePerDrop(ing.oil) * (ing.drops || 0)) : '--' }}</span>
+            </tr>
-          <button class="btn-icon-sm" @click="removeIngredient(i)">✕</button>
+          </thead>
+          <tbody>
+            <tr v-for="(ing, i) in selectedProject.ingredients" :key="i">
+              <td>
+                <select v-model="ing.oil" class="form-select" @change="saveProject">
+                  <option value="">— 选择精油 —</option>
+                  <option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
+                </select>
+              </td>
+              <td>
+                <input v-model.number="ing.drops" type="number" min="0" step="0.5" class="drops-input" @change="saveProject" />
+              </td>
+              <td class="cell-ppd">{{ ing.oil ? oils.fmtPrice(oils.pricePerDrop(ing.oil)) : '—' }}</td>
+              <td class="cell-subtotal">{{ ing.oil && ing.drops ? oils.fmtPrice(oils.pricePerDrop(ing.oil) * ing.drops) : '—' }}</td>
+              <td><button class="remove-btn" @click="removeIngredient(i)">×</button></td>
+            </tr>
+          </tbody>
+        </table>
+        <div class="total-row">
+          <span class="total-label">配方总成本</span>
+          <span class="total-price">{{ oils.fmtPrice(materialCost) }}</span>
+        </div>
+
+        <!-- Pricing -->
+        <div class="pricing-inline">
+          <div class="price-field">
+            <label>定价 ¥</label>
+            <input v-model.number="selectedProject.selling_price" type="number" class="price-input" placeholder="/次" @change="saveProject" />
+          </div>
         </div>
-        <button class="btn-outline btn-sm" @click="addIngredient">+ 添加成分</button>
       </div>
 
       <!-- Pricing Section -->
@@ -492,12 +519,38 @@ function formatDate(d) {
   color: #3e3a44;
 }
 
-.ing-row {
+.section-header-row {
-  display: flex;
+  display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px;
-  gap: 6px;
-  align-items: center;
-  margin-bottom: 6px;
 }
+.section-header-row h4 { margin: 0; }
+.section-actions { display: flex; gap: 6px; }
+
+.ingredients-table { width: 100%; border-collapse: collapse; margin-bottom: 12px; }
+.ingredients-table th {
+  text-align: center; padding: 10px 8px; font-size: 12px; font-weight: 600;
+  color: var(--text-light, #999); border-bottom: 2px solid #e5e4e7;
+}
+.ingredients-table td { padding: 10px 8px; border-bottom: 1px solid #f0f0f0; text-align: center; }
+.ingredients-table .form-select { width: 100%; padding: 6px 8px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; font-family: inherit; background: #fff; }
+.drops-input { width: 65px; padding: 6px 8px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; text-align: center; outline: none; font-family: inherit; }
+.drops-input:focus { border-color: #7ec6a4; }
+.cell-ppd { color: #999; font-size: 12px; }
+.cell-subtotal { color: #4a9d7e; font-weight: 600; }
+.remove-btn { border: none; background: none; color: #ccc; cursor: pointer; font-size: 18px; }
+.remove-btn:hover { color: #c0392b; }
+
+.total-row {
+  background: #e8f5e9; border-radius: 12px; padding: 14px 18px;
+  display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px;
+}
+.total-label { font-size: 14px; color: #3e3a44; font-weight: 500; }
+.total-price { font-size: 20px; font-weight: 700; color: #2e7d5a; }
+
+.pricing-inline { margin-top: 12px; }
+.price-field { display: flex; align-items: center; gap: 8px; }
+.price-field label { font-size: 13px; font-weight: 600; color: #3e3a44; white-space: nowrap; }
+.price-input { width: 100px; padding: 8px 10px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 14px; font-family: inherit; outline: none; }
+.price-input:focus { border-color: #7ec6a4; }
 
 .form-select {
   flex: 1;
@@ -520,14 +573,6 @@ function formatDate(d) {
   text-align: center;
 }
 
-.ing-cost {
-  font-size: 13px;
-  color: #4a9d7e;
-  font-weight: 500;
-  min-width: 60px;
-  text-align: right;
-}
-
 .price-row {
   display: flex;
   justify-content: space-between;

frontend/src/views/RecipeManager.vue

@@ -14,64 +14,63 @@
       </div>
     </div>
 
-    <!-- Search & Actions Bar (editor+) -->
+    <!-- Row 1: Search (editor+) -->
     <template v-if="auth.canEdit">
       <div class="manage-toolbar">
         <div class="search-box">
-          <input
+          <input class="search-input" v-model="manageSearch" placeholder="搜索配方..." />
-            class="search-input"
-            v-model="manageSearch"
-            placeholder="搜索配方..."
-          />
           <button v-if="manageSearch" class="search-clear-btn" @click="manageSearch = ''">✕</button>
         </div>
-        <div class="toolbar-actions">
-          <button class="btn-outline btn-sm" @click="showAddOverlay = true">+ 添加配方</button>
-          <button class="btn-outline btn-sm" @click="exportExcel">📥 导出Excel</button>
-        </div>
       </div>
-
     </template>
 
-    <!-- Tag Filter & Select All (visible to all) -->
+    <!-- Row 2: Add + Select + Tags + Batch + Export -->
-    <div class="tag-filter-bar">
+    <div class="toolbar-row">
+      <button v-if="auth.canEdit" class="btn-outline btn-sm" @click="showAddOverlay = true">新增</button>
       <button
         class="btn-sm"
-        :class="selectedDiaryIds.size > 0 ? 'btn-select-active' : 'btn-outline'"
+        :class="isAllSelected ? 'btn-select-active' : 'btn-outline'"
-        @click="toggleSelectAllDiary"
+        @click="toggleSelectAll"
       >全选</button>
+      <span v-if="totalSelected > 0" class="select-count">共{{ totalSelected }}个</span>
       <button class="tag-toggle-btn" @click="showTagFilter = !showTagFilter">
-        🏷️ 标签筛选 {{ showTagFilter ? '▾' : '▸' }}
+        标签 {{ showTagFilter ? '▾' : '▸' }}
       </button>
-      <div v-if="showTagFilter" class="tag-list">
+      <button v-if="totalSelected > 0" class="tag-toggle-btn" @click="showBatchMenu = !showBatchMenu">
-        <span
+        批量操作 {{ showBatchMenu ? '▾' : '▸' }}
-          v-for="tag in recipeStore.allTags"
+      </button>
-          :key="tag"
+      <button v-if="totalSelected > 0" class="btn-sm btn-outline" @click="clearSelection">取消</button>
-          class="tag-chip"
+      <button v-if="auth.isAdmin" class="export-btn" @click="exportExcel" title="导出Excel">📥</button>
-          :class="{ active: selectedTags.includes(tag) }"
-          @click="toggleTag(tag)"
-        >{{ tag }}</span>
-      </div>
     </div>
-
+    <div v-if="showBatchMenu && totalSelected > 0" class="batch-menu">
-    <!-- Batch Operations -->
+      <button class="batch-menu-btn" @click="executeBatchAction('tag')">🏷 批量打标签</button>
-    <div v-if="selectedIds.size > 0 || selectedDiaryIds.size > 0" class="batch-bar">
+      <button class="batch-menu-btn" @click="executeBatchAction('export')">📷 批量导出卡片</button>
-      <span>已选 {{ selectedIds.size + selectedDiaryIds.size }} 项</span>
+      <button v-if="selectedDiaryIds.size > 0 && selectedIds.size === 0" class="batch-menu-btn" @click="executeBatchAction('share_public')">📤 批量共享到公共库</button>
-      <button class="btn-sm btn-outline" @click="executeBatchAction('tag')">🏷 打标签</button>
+      <button class="batch-menu-btn batch-delete" @click="executeBatchAction('delete')">🗑 批量删除</button>
-      <button class="btn-sm btn-outline" @click="executeBatchAction('share_public')" v-if="selectedDiaryIds.size > 0">📤 分享到公共库</button>
+    </div>
-      <button class="btn-sm btn-outline" @click="executeBatchAction('export')">📷 导出卡片</button>
+    <div v-if="showTagFilter" class="tag-list-bar">
-      <button class="btn-sm btn-danger-outline" @click="executeBatchAction('delete')">🗑 删除</button>
+      <span
-      <button class="btn-sm btn-outline" @click="clearSelection">取消</button>
+        v-for="tag in recipeStore.allTags"
+        :key="tag"
+        class="tag-chip"
+        :class="{ active: selectedTags.includes(tag) }"
+        @click="toggleTag(tag)"
+      >{{ tag }}<span v-if="auth.isAdmin" class="tag-delete" @click.stop="deleteGlobalTag(tag)">×</span></span>
+      <div v-if="auth.canEdit" class="tag-add-row">
+        <input v-model="globalNewTag" class="tag-add-input" placeholder="新标签..." @keydown.enter="addGlobalTag" />
+        <button class="tag-add-btn" @click="addGlobalTag" :disabled="!globalNewTag.trim()">+</button>
+      </div>
     </div>
 
     <!-- My Recipes Section (from diary) -->
     <div class="recipe-section">
       <h3 class="section-title clickable" @click="showMyRecipes = !showMyRecipes">
+        <button class="mini-select" :class="{ active: isMyAllSelected }" @click.stop="toggleMySelect">✓</button>
         <span>📖 我的配方 ({{ myRecipes.length }})</span>
         <span v-if="!auth.isAdmin" class="contrib-tag">已贡献 {{ sharedCount.adopted }}/{{ sharedCount.total }} 条</span>
         <span class="toggle-icon">{{ showMyRecipes ? '▾' : '▸' }}</span>
       </h3>
-      <template v-if="showMyRecipes">
+      <template v-if="showMyRecipes || manageSearch">
       <div class="recipe-list">
         <div
           v-for="d in myFilteredRecipes"
@@ -109,10 +108,11 @@
     <!-- Public Recipes Section (editor+) -->
     <div v-if="auth.canEdit" class="recipe-section">
       <h3 class="section-title clickable" @click="showPublicRecipes = !showPublicRecipes">
+        <button class="mini-select" :class="{ active: isPubAllSelected }" @click.stop="togglePubSelect">✓</button>
         <span>🌿 公共配方库 ({{ publicRecipes.length }})</span>
         <span class="toggle-icon">{{ showPublicRecipes ? '▾' : '▸' }}</span>
       </h3>
-      <div v-if="showPublicRecipes" class="recipe-list">
+      <div v-if="showPublicRecipes || manageSearch" class="recipe-list">
         <div
           v-for="r in publicFilteredRecipes"
           :key="r._id"
@@ -203,18 +203,39 @@
           </div>
         </div>
 
-        <div class="editor-tip">
+        <!-- Volume selector -->
-          💡 推荐按照单次用量（椰子油10~20滴）添加纯精油，系统会根据容量和稀释比例自动计算。
+        <div class="editor-section">
+          <label class="editor-label">容量</label>
+          <div class="volume-controls">
+            <button class="volume-btn" :class="{ active: formVolume === 'single' }" @click="formVolume = 'single'">单次</button>
+            <button class="volume-btn" :class="{ active: formVolume === '5' }" @click="formVolume = '5'">5ml</button>
+            <button class="volume-btn" :class="{ active: formVolume === '10' }" @click="formVolume = '10'">10ml</button>
+            <button class="volume-btn" :class="{ active: formVolume === '15' }" @click="formVolume = '15'">15ml</button>
+            <button class="volume-btn" :class="{ active: formVolume === '20' }" @click="formVolume = '20'">20ml</button>
+            <button class="volume-btn" :class="{ active: formVolume === '30' }" @click="formVolume = '30'">30ml</button>
+            <button class="volume-btn" :class="{ active: formVolume === 'custom' }" @click="formVolume = 'custom'">自定义</button>
+          </div>
+          <div v-if="formVolume === 'custom'" class="custom-volume-row">
+            <input v-model.number="formCustomVolume" type="number" min="1" class="drops-sm" placeholder="ml" />
+            <span style="font-size:12px;color:#999">ml</span>
+          </div>
+          <div class="ratio-row">
+            <span class="ratio-label">参考比例 1:</span>
+            <select v-model.number="formDilution" class="select-sm">
+              <option v-for="n in [3,4,5,6,7,8,9,10,12,15,20]" :key="n" :value="n">{{ n }}</option>
+            </select>
+            <span class="ratio-hint">纯精油总数约为 {{ suggestedEoDrops }} 滴</span>
+          </div>
         </div>
 
-        <!-- Ingredients table -->
+        <!-- Ingredients table (essential oils only, coconut at bottom) -->
         <div class="editor-section">
           <table class="editor-table">
             <thead>
               <tr><th>精油</th><th>滴数</th><th>单价/滴</th><th>小计</th><th></th></tr>
             </thead>
             <tbody>
-              <tr v-for="(ing, i) in formIngredients" :key="i">
+              <tr v-for="(ing, i) in formEoIngredients" :key="'eo-'+i">
                 <td>
                   <div class="oil-search-wrap">
                     <input
@@ -239,40 +260,31 @@
                 <td><input v-model.number="ing.drops" type="number" min="0.5" step="0.5" class="editor-drops" /></td>
                 <td class="ing-ppd">{{ ing.oil ? oils.fmtPrice(oils.pricePerDrop(ing.oil)) : '-' }}</td>
                 <td class="ing-cost">{{ ing.oil && ing.drops ? oils.fmtPrice(oils.pricePerDrop(ing.oil) * ing.drops) : '-' }}</td>
-                <td><button class="remove-row-btn" @click="formIngredients.splice(i, 1)">✕</button></td>
+                <td><button class="remove-row-btn" @click="removeEoRow(i)">✕</button></td>
+              </tr>
+              <!-- Coconut oil row -->
+              <tr v-if="formCocoRow" class="coco-row">
+                <td><span class="coco-label">椰子油</span></td>
+                <td>
+                  <template v-if="formVolume === 'single'">
+                    <input v-model.number="formCocoRow.drops" type="number" min="0" class="editor-drops" />
+                  </template>
+                  <template v-else>
+                    <span class="coco-fill">填满 (约{{ cocoFillMl }}ml)</span>
+                  </template>
+                </td>
+                <td class="ing-ppd">{{ oils.fmtPrice(oils.pricePerDrop('椰子油')) }}</td>
+                <td class="ing-cost">{{ oils.fmtPrice(oils.pricePerDrop('椰子油') * cocoActualDrops) }}</td>
+                <td><button class="remove-row-btn" @click="formCocoRow = null">✕</button></td>
               </tr>
             </tbody>
           </table>
-
+          <button class="add-row-btn" @click="addOilRow">+ 添加精油</button>
-          <!-- Add ingredient row -->
-          <button class="add-row-btn" @click="formIngredients.push({ oil: '', drops: 1, _search: '', _open: false })">+ 添加精油</button>
         </div>
 
-        <!-- Volume & Dilution -->
+        <!-- Real-time summary -->
-        <div class="editor-section">
+        <div class="recipe-summary">
-          <label class="editor-label">容量与稀释</label>
+          {{ recipeSummaryText }}
-          <div class="volume-controls">
-            <button class="volume-btn" :class="{ active: formVolume === 'single' }" @click="formVolume = 'single'">单次</button>
-            <button class="volume-btn" :class="{ active: formVolume === '5' }" @click="formVolume = '5'">5ml</button>
-            <button class="volume-btn" :class="{ active: formVolume === '10' }" @click="formVolume = '10'">10ml</button>
-            <button class="volume-btn" :class="{ active: formVolume === '30' }" @click="formVolume = '30'">30ml</button>
-            <button class="volume-btn" :class="{ active: formVolume === 'custom' }" @click="formVolume = 'custom'">自定义</button>
-          </div>
-          <div v-if="formVolume === 'custom'" class="custom-volume-row">
-            <input v-model.number="formCustomVolume" type="number" min="1" class="drops-sm" placeholder="数量" />
-            <select v-model="formCustomUnit" class="select-sm">
-              <option value="drops">滴</option>
-              <option value="ml">ml</option>
-            </select>
-          </div>
-          <div class="dilution-row">
-            <span class="dilution-label">稀释 1:</span>
-            <select v-model.number="formDilution" class="select-sm">
-              <option v-for="n in 20" :key="n" :value="n">{{ n }}</option>
-            </select>
-            <button class="action-btn action-btn-primary action-btn-sm" @click="applyVolumeDilution">应用到配方</button>
-          </div>
-          <div class="hint" style="margin-top:6px;font-size:11px;color:#999">{{ formDilutionHint }}</div>
         </div>
 
         <!-- Notes -->
@@ -293,6 +305,10 @@
           <div class="candidate-tags" v-if="formCandidateTags.length">
             <span v-for="tag in formCandidateTags" :key="tag" class="candidate-tag" @click="toggleFormTag(tag)">+ {{ tag }}</span>
           </div>
+          <div class="tag-input-row">
+            <input v-model="newTagInput" type="text" class="editor-input" placeholder="添加新标签..." @keydown.enter="addNewFormTag" style="flex:1" />
+            <button class="action-btn action-btn-sm" @click="addNewFormTag" :disabled="!newTagInput.trim()">+</button>
+          </div>
         </div>
 
         <!-- Total cost -->
@@ -384,15 +400,62 @@ const newIngOil = ref('')
 const newIngSearch = ref('')
 const newIngDrops = ref(1)
 const newIngDropdownOpen = ref(false)
-const formVolume = ref('single')
+const formVolume = ref('30')
 const formCustomVolume = ref(100)
 const formCustomUnit = ref('drops')
-const formDilution = ref(3)
+const formDilution = ref(6)
+
+const formCocoRow = ref({ oil: '椰子油', drops: 10, _search: '椰子油', _open: false })
+
+// EO ingredients (everything except coconut)
+const formEoIngredients = computed(() =>
+  formIngredients.value.filter(i => i.oil !== '椰子油')
+)
+
+const eoTotalDrops = computed(() =>
+  formEoIngredients.value.filter(i => i.oil && i.drops > 0).reduce((s, i) => s + i.drops, 0)
+)
+
+const targetTotalDrops = computed(() => {
+  if (formVolume.value === 'single') return null
+  if (formVolume.value === 'custom') return Math.round((formCustomVolume.value || 0) * DROPS_PER_ML)
+  return Math.round(Number(formVolume.value) * DROPS_PER_ML)
+})
+
+const cocoActualDrops = computed(() => {
+  if (!formCocoRow.value) return 0
+  if (formVolume.value === 'single') return formCocoRow.value.drops || 0
+  if (!targetTotalDrops.value) return 0
+  return Math.max(0, targetTotalDrops.value - eoTotalDrops.value)
+})
+
+const cocoFillMl = computed(() => Math.round(cocoActualDrops.value / DROPS_PER_ML))
+
+const suggestedEoDrops = computed(() => {
+  if (formVolume.value === 'single') {
+    const cocoDrops = formCocoRow.value ? (formCocoRow.value.drops || 10) : 10
+    return Math.round(cocoDrops / formDilution.value)
+  }
+  const total = targetTotalDrops.value || 0
+  return Math.round(total / (1 + formDilution.value))
+})
+
+const recipeSummaryText = computed(() => {
+  const eo = eoTotalDrops.value
+  const coco = cocoActualDrops.value
+  const ratio = eo > 0 ? Math.round(coco / eo) : 0
+  if (formVolume.value === 'single') {
+    return `该配方为单次用量，纯精油 ${eo} 滴，椰子油 ${coco} 滴，稀释比例 1:${ratio}`
+  }
+  const vol = formVolume.value === 'custom' ? (formCustomVolume.value || 0) : Number(formVolume.value)
+  return `该配方总容量 ${vol}ml，纯精油 ${eo} 滴，剩余用椰子油填满，稀释比例 1:${ratio}`
+})
 
 const formTotalCost = computed(() => {
-  const cost = formIngredients.value
+  let cost = formIngredients.value
-    .filter(i => i.oil && i.drops > 0)
+    .filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
     .reduce((sum, i) => sum + oils.pricePerDrop(i.oil) * i.drops, 0)
+  cost += oils.pricePerDrop('椰子油') * cocoActualDrops.value
   return oils.fmtPrice(cost)
 })
 
@@ -429,6 +492,38 @@ function filterBySearchAndTags(list) {
 const myFilteredRecipes = computed(() => filterBySearchAndTags(myRecipes.value))
 const publicFilteredRecipes = computed(() => filterBySearchAndTags(publicRecipes.value))
 
+const globalNewTag = ref('')
+
+async function addGlobalTag() {
+  const tag = globalNewTag.value.trim()
+  if (!tag) return
+  try {
+    await api('/api/tags', { method: 'POST', body: JSON.stringify({ name: tag }) })
+    if (!recipeStore.allTags.includes(tag)) {
+      recipeStore.allTags.push(tag)
+      recipeStore.allTags.sort((a, b) => a.localeCompare(b, 'zh'))
+    }
+    globalNewTag.value = ''
+    ui.showToast('标签已添加')
+  } catch {
+    ui.showToast('添加失败')
+  }
+}
+
+async function deleteGlobalTag(tag) {
+  const { showConfirm } = await import('../composables/useDialog')
+  const ok = await showConfirm(`确定删除标签「${tag}」？`)
+  if (!ok) return
+  try {
+    await api(`/api/tags/${encodeURIComponent(tag)}`, { method: 'DELETE' })
+    const idx = recipeStore.allTags.indexOf(tag)
+    if (idx >= 0) recipeStore.allTags.splice(idx, 1)
+    ui.showToast('标签已删除')
+  } catch {
+    ui.showToast('删除失败')
+  }
+}
+
 function toggleTag(tag) {
   const idx = selectedTags.value.indexOf(tag)
   if (idx >= 0) selectedTags.value.splice(idx, 1)
@@ -448,13 +543,35 @@ function toggleDiarySelect(id) {
 function clearSelection() {
   selectedIds.clear()
   selectedDiaryIds.clear()
+  showBatchMenu.value = false
 }
 
-function toggleSelectAllDiary() {
+function toggleSelectAll() {
-  if (selectedDiaryIds.size === myFilteredRecipes.value.length) {
+  if (isAllSelected.value) {
+    clearSelection()
+  } else {
+    myFilteredRecipes.value.forEach(d => selectedDiaryIds.add(d.id))
+    if (auth.canEdit) publicFilteredRecipes.value.forEach(r => selectedIds.add(r._id))
+    showMyRecipes.value = true
+    if (auth.canEdit) showPublicRecipes.value = true
+  }
+}
+
+function toggleMySelect() {
+  if (isMyAllSelected.value) {
     selectedDiaryIds.clear()
   } else {
     myFilteredRecipes.value.forEach(d => selectedDiaryIds.add(d.id))
+    showMyRecipes.value = true
+  }
+}
+
+function togglePubSelect() {
+  if (isPubAllSelected.value) {
+    selectedIds.clear()
+  } else {
+    publicFilteredRecipes.value.forEach(r => selectedIds.add(r._id))
+    showPublicRecipes.value = true
   }
 }
 
@@ -523,12 +640,35 @@ async function executeBatchAction(action) {
   clearSelection()
 }
 
+function calcDilutionFromIngs(ingredients) {
+  const ings = ingredients || []
+  const coco = ings.find(i => i.oil === '椰子油')
+  const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
+  const cocoDrops = coco ? (coco.drops || 0) : 0
+  const totalDrops = eoDrops + cocoDrops
+  if (eoDrops > 0 && cocoDrops > 0) {
+    formDilution.value = Math.round(cocoDrops / eoDrops)
+  }
+  // Guess volume
+  const DROPS_PER_ML = 18.6
+  const ml = totalDrops / DROPS_PER_ML
+  if (ml <= 1.5) formVolume.value = 'single'
+  else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5'
+  else if (Math.abs(ml - 10) < 3) formVolume.value = '10'
+  else if (Math.abs(ml - 30) < 8) formVolume.value = '30'
+  else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(totalDrops); formCustomUnit.value = 'drops' }
+}
+
 function editRecipe(recipe) {
   editingRecipe.value = recipe
   formName.value = recipe.name
-  formIngredients.value = recipe.ingredients.map(i => ({ ...i, _search: i.oil, _open: false }))
+  const ings = recipe.ingredients || []
+  formIngredients.value = ings.filter(i => i.oil !== '椰子油').map(i => ({ ...i, _search: i.oil, _open: false }))
+  const coco = ings.find(i => i.oil === '椰子油')
+  formCocoRow.value = coco ? { ...coco, _search: '椰子油', _open: false } : { oil: '椰子油', drops: 10, _search: '椰子油', _open: false }
   formNote.value = recipe.note || ''
   formTags.value = [...(recipe.tags || [])]
+  calcDilutionFromIngs(recipe.ingredients)
   showAddOverlay.value = true
 }
 
@@ -541,6 +681,7 @@ function closeOverlay() {
 function resetForm() {
   formName.value = ''
   formIngredients.value = [{ oil: '', drops: 1, _search: '', _open: false }]
+  formCocoRow.value = { oil: '椰子油', drops: 10, _search: '椰子油', _open: false }
   formNote.value = ''
   formTags.value = []
   smartPasteText.value = ''
@@ -549,6 +690,8 @@ function resetForm() {
   newIngOil.value = ''
   newIngSearch.value = ''
   newIngDrops.value = 1
+  formVolume.value = '30'
+  formDilution.value = 6
 }
 
 function handleSmartPaste() {
@@ -578,9 +721,17 @@ function handleSmartPaste() {
 function filteredOilNames(search) {
   if (!search) return oils.oilNames
   const q = search.toLowerCase()
-  return oils.oilNames.filter(name =>
+  const results = oils.oilNames.filter(name =>
     name.toLowerCase().includes(q) || matchesPinyinInitials(name, q)
   )
+  // Sort: pinyin prefix match first, then name contains, then rest
+  results.sort((a, b) => {
+    const aPin = matchesPinyinInitials(a, q) ? 0 : 1
+    const bPin = matchesPinyinInitials(b, q) ? 0 : 1
+    if (aPin !== bPin) return aPin - bPin
+    return a.localeCompare(b, 'zh')
+  })
+  return results
 }
 
 function selectOil(ing, name) {
@@ -597,10 +748,26 @@ function onOilBlur(ing) {
   }, 150)
 }
 
+const newTagInput = ref('')
+
 const formCandidateTags = computed(() =>
   recipeStore.allTags.filter(t => !formTags.value.includes(t))
 )
 
+function addNewFormTag() {
+  const tag = newTagInput.value.trim()
+  if (!tag) return
+  if (!formTags.value.includes(tag)) {
+    formTags.value.push(tag)
+  }
+  // Also add to global tags so it appears in candidates if removed
+  if (!recipeStore.allTags.includes(tag)) {
+    recipeStore.allTags.push(tag)
+    recipeStore.allTags.sort((a, b) => a.localeCompare(b, 'zh'))
+  }
+  newTagInput.value = ''
+}
+
 const DROPS_PER_ML = 18.6
 
 const formDilutionHint = computed(() => {
@@ -609,7 +776,7 @@ const formDilutionHint = computed(() => {
   if (formVolume.value === 'single') {
     const cocoDrops = Math.round(eoDrops * formDilution.value)
     const totalDrops = eoDrops + cocoDrops
-    return `单次用量：纯精油约 ${eoDrops} 滴 + 椰子油约 ${cocoDrops} 滴，共 ${totalDrops} 滴 (${(totalDrops / DROPS_PER_ML).toFixed(1)}ml)，稀释 1:${formDilution.value}`
+    return `单次用量：纯精油约 ${eoDrops} 滴 + 椰子油约 ${cocoDrops} 滴，共 ${totalDrops} 滴 (${Math.round(totalDrops / DROPS_PER_ML)}ml)，稀释 1:${formDilution.value}`
   }
   let totalDrops
   if (formVolume.value === 'custom') {
@@ -619,7 +786,7 @@ const formDilutionHint = computed(() => {
   }
   const targetEo = Math.round(totalDrops / (1 + formDilution.value))
   const cocoDrops = totalDrops - targetEo
-  return `总容量 ${totalDrops} 滴 (${(totalDrops / DROPS_PER_ML).toFixed(1)}ml)，纯精油约 ${targetEo} 滴 + 椰子油约 ${cocoDrops} 滴，稀释 1:${formDilution.value}`
+  return `总容量 ${totalDrops} 滴 (${Math.round(totalDrops / DROPS_PER_ML)}ml)，纯精油约 ${targetEo} 滴 + 椰子油约 ${cocoDrops} 滴，稀释 1:${formDilution.value}`
 })
 
 function applyVolumeDilution() {
@@ -649,7 +816,7 @@ function applyVolumeDilution() {
   const currentEoTotal = eoIngs.reduce((s, i) => s + (i.drops || 0), 0)
   if (currentEoTotal <= 0) return
   const scale = targetEoDrops / currentEoTotal
-  eoIngs.forEach(i => { i.drops = Math.max(0.5, Math.round(i.drops * scale * 2) / 2) })
+  eoIngs.forEach(i => { i.drops = Math.max(1, Math.round(i.drops * scale)) })
   const actualEo = eoIngs.reduce((s, i) => s + i.drops, 0)
   setFormCoconut(targetTotalDrops - actualEo)
   ui.showToast('已应用容量设置')
@@ -665,6 +832,18 @@ function setFormCoconut(drops) {
   }
 }
 
+function addOilRow() {
+  formIngredients.value.push({ oil: '', drops: 1, _search: '', _open: false })
+}
+
+function removeEoRow(index) {
+  // Find the actual index in formIngredients (skip coconut)
+  const eoIngs = formIngredients.value.filter(i => i.oil !== '椰子油')
+  const target = eoIngs[index]
+  const realIdx = formIngredients.value.indexOf(target)
+  if (realIdx >= 0) formIngredients.value.splice(realIdx, 1)
+}
+
 function confirmAddIng() {
   if (!newIngOil.value || !newIngDrops.value) return
   formIngredients.value.push({ oil: newIngOil.value, drops: newIngDrops.value, _search: newIngOil.value, _open: false })
@@ -681,17 +860,21 @@ function toggleFormTag(tag) {
 }
 
 async function saveCurrentRecipe() {
-  const validIngs = formIngredients.value.filter(i => i.oil && i.drops > 0)
+  const eoIngs = formIngredients.value.filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
   if (!formName.value.trim()) {
     ui.showToast('请输入配方名称')
     return
   }
-  if (validIngs.length === 0) {
+  if (eoIngs.length === 0) {
-    ui.showToast('请至少添加一个成分')
+    ui.showToast('请至少添加一个精油')
     return
   }
 
-  const cleanIngs = validIngs.map(i => ({ oil: i.oil, drops: i.drops }))
+  // Combine EO + coconut
+  const cleanIngs = eoIngs.map(i => ({ oil: i.oil, drops: i.drops }))
+  if (formCocoRow.value && cocoActualDrops.value > 0) {
+    cleanIngs.push({ oil: '椰子油', drops: cocoActualDrops.value })
+  }
   const diaryPayload = {
     name: formName.value.trim(),
     ingredients: cleanIngs,
@@ -783,7 +966,12 @@ async function saveAllParsed() {
 
 const sharedCount = ref({ adopted: 0, total: 0 })
 const previewRecipeIndex = ref(null)
-const showMyRecipes = ref(true)
+const showBatchMenu = ref(false)
+const totalSelected = computed(() => selectedIds.size + selectedDiaryIds.size)
+const isMyAllSelected = computed(() => myFilteredRecipes.value.length > 0 && selectedDiaryIds.size === myFilteredRecipes.value.length)
+const isPubAllSelected = computed(() => publicFilteredRecipes.value.length > 0 && selectedIds.size === publicFilteredRecipes.value.length)
+const isAllSelected = computed(() => isMyAllSelected.value && (!auth.canEdit || isPubAllSelected.value))
+const showMyRecipes = ref(false)
 const showPublicRecipes = ref(false)
 const showReviewHistory = ref(false)
 const reviewHistory = ref([])
@@ -820,14 +1008,25 @@ onMounted(async () => {
       if (res.ok) reviewHistory.value = await res.json()
     } catch {}
   }
+  // Open recipe editor if redirected from card view
+  const editId = localStorage.getItem('oil_edit_recipe_id')
+  if (editId) {
+    localStorage.removeItem('oil_edit_recipe_id')
+    const recipe = recipeStore.recipes.find(r => String(r._id) === editId)
+    if (recipe) editRecipe(recipe)
+  }
 })
 
 function editDiaryRecipe(diary) {
   editingRecipe.value = { _diary_id: diary.id, name: diary.name }
   formName.value = diary.name
-  formIngredients.value = (diary.ingredients || []).map(i => ({ ...i, _search: i.oil, _open: false }))
+  const ings = diary.ingredients || []
+  formIngredients.value = ings.filter(i => i.oil !== '椰子油').map(i => ({ ...i, _search: i.oil, _open: false }))
+  const coco = ings.find(i => i.oil === '椰子油')
+  formCocoRow.value = coco ? { ...coco, _search: '椰子油', _open: false } : { oil: '椰子油', drops: 10, _search: '椰子油', _open: false }
   formNote.value = diary.note || ''
   formTags.value = [...(diary.tags || [])]
+  calcDilutionFromIngs(diary.ingredients)
   showAddOverlay.value = true
 }
 
@@ -922,20 +1121,36 @@ async function rejectRecipe(recipe) {
 }
 
 async function exportExcel() {
-  try {
+  const recipes = recipeStore.recipes
-    const res = await api('/api/recipes/export-excel')
+  if (!recipes.length) { ui.showToast('没有配方可导出'); return }
-    if (!res.ok) throw new Error('Export failed')
+  const XLSX = (await import('xlsx')).default || await import('xlsx')
-    const blob = await res.blob()
+
-    const url = URL.createObjectURL(blob)
+  function recipesToRows(list) {
-    const a = document.createElement('a')
+    return list.map(r => ({
-    a.href = url
+      '配方名称': r.name,
-    a.download = '配方导出.xlsx'
+      '标签': (r.tags || []).join('/'),
-    a.click()
+      '精油成分': r.ingredients.map(i => `${i.oil}${i.drops}滴`).join('、'),
-    URL.revokeObjectURL(url)
+      '成本': oils.fmtPrice(oils.calcCost(r.ingredients)),
-    ui.showToast('导出成功')
+      '备注': r.note || '',
-  } catch {
+    }))
-    ui.showToast('导出失败')
   }
+
+  const wb = XLSX.utils.book_new()
+  // Sheet 1: 全部
+  XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(recipesToRows(recipes)), '全部')
+  // Per tag sheets
+  const allTags = [...new Set(recipes.flatMap(r => r.tags || []))].sort((a, b) => a.localeCompare(b, 'zh'))
+  for (const tag of allTags) {
+    const tagged = recipes.filter(r => r.tags && r.tags.includes(tag))
+    if (tagged.length) {
+      const name = tag.substring(0, 31) // Excel sheet name max 31 chars
+      XLSX.utils.book_append_sheet(wb, XLSX.utils.json_to_sheet(recipesToRows(tagged)), name)
+    }
+  }
+
+  const today = new Date().toISOString().slice(0, 10)
+  XLSX.writeFile(wb, `精油配方${today}.xlsx`)
+  ui.showToast('导出成功')
 }
 
 function onTagPickerSave(tags) {
@@ -1367,23 +1582,80 @@ watch(() => recipeStore.recipes, () => {
 .candidate-tags { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 8px; }
 .candidate-tag { background: #f0eeeb; color: #6b6375; padding: 4px 10px; border-radius: 12px; font-size: 12px; cursor: pointer; }
 .candidate-tag:hover { background: #e8f5e9; color: #2e7d5a; }
+.tag-input-row { display: flex; gap: 6px; align-items: center; margin-top: 6px; }
 .editor-total { text-align: right; font-size: 15px; font-weight: 600; color: #4a9d7e; padding: 10px 0; border-top: 1px solid #eee; }
 .action-btn { border: 1.5px solid #d4cfc7; background: #fff; color: #6b6375; border-radius: 8px; padding: 6px 14px; font-size: 13px; cursor: pointer; font-family: inherit; white-space: nowrap; }
 .action-btn:hover { background: #f8f7f5; }
 .action-btn-primary { background: linear-gradient(135deg, #7ec6a4, #4a9d7e); color: #fff; border-color: transparent; }
 .action-btn-primary:hover { opacity: 0.9; }
 .action-btn-sm { padding: 5px 12px; font-size: 12px; }
-.volume-controls { display: flex; gap: 6px; flex-wrap: wrap; margin-bottom: 8px; }
+.volume-controls { display: flex; gap: 6px; margin-bottom: 8px; }
-.volume-btn { padding: 6px 14px; border: 1.5px solid #d4cfc7; border-radius: 8px; background: #fff; font-size: 13px; cursor: pointer; font-family: inherit; color: #6b6375; }
+.volume-btn { flex: 1; padding: 6px 0; border: 1.5px solid #d4cfc7; border-radius: 8px; background: #fff; font-size: 13px; cursor: pointer; font-family: inherit; color: #6b6375; text-align: center; }
 .volume-btn.active { background: #e8f5e9; border-color: #7ec6a4; color: #2e7d5a; font-weight: 600; }
 .volume-btn:hover { border-color: #7ec6a4; }
 .custom-volume-row { display: flex; gap: 6px; align-items: center; margin-bottom: 6px; }
-.dilution-row { display: flex; align-items: center; gap: 6px; margin-top: 6px; }
+.ratio-row { display: flex; align-items: center; gap: 8px; margin-top: 8px; flex-wrap: wrap; }
-.dilution-label { font-size: 12px; color: #3e3a44; white-space: nowrap; }
+.ratio-label { font-size: 12px; color: #3e3a44; font-weight: 500; white-space: nowrap; }
+.ratio-options { display: flex; gap: 4px; flex-wrap: wrap; }
+.ratio-btn {
+  padding: 3px 8px; border: 1px solid #e5e4e7; border-radius: 6px; background: #fff;
+  font-size: 11px; cursor: pointer; font-family: inherit; color: #6b6375; min-width: 28px; text-align: center;
+}
+.ratio-btn.active { background: #e8f5e9; border-color: #7ec6a4; color: #2e7d5a; font-weight: 600; }
+.ratio-btn:hover { border-color: #7ec6a4; }
+.ratio-hint { font-size: 12px; color: #4a9d7e; font-weight: 500; white-space: nowrap; }
+
+.coco-row { background: #f8faf8; }
+.coco-label { font-weight: 600; color: #4a9d7e; font-size: 13px; }
+.coco-fill { font-size: 12px; color: #4a9d7e; font-weight: 500; }
+.recipe-summary {
+  padding: 10px 14px; background: #f0faf5; border-radius: 10px; border-left: 3px solid #7ec6a4;
+  font-size: 13px; color: #2e7d5a; margin-bottom: 12px; line-height: 1.6;
+}
 .drops-sm { width: 50px; padding: 4px 6px; border: 1.5px solid #d4cfc7; border-radius: 6px; font-size: 12px; text-align: center; outline: none; font-family: inherit; }
 .drops-sm:focus { border-color: #7ec6a4; }
 .select-sm { padding: 4px 6px; border: 1.5px solid #d4cfc7; border-radius: 6px; font-size: 12px; font-family: inherit; background: #fff; width: auto; }
 .btn-select-active { background: #e8f5e9; color: #2e7d5a; border: 1.5px solid #7ec6a4; border-radius: 10px; padding: 7px 14px; font-size: 13px; cursor: pointer; font-family: inherit; font-weight: 600; }
+.toolbar-row {
+  display: flex; gap: 8px; align-items: center; flex-wrap: wrap; margin-bottom: 8px;
+}
+.select-count { font-size: 12px; color: #4a9d7e; font-weight: 500; white-space: nowrap; }
+.batch-menu {
+  display: flex; gap: 6px; flex-wrap: wrap; margin-bottom: 8px; padding: 8px 0;
+}
+.batch-menu-btn {
+  padding: 5px 12px; border: 1.5px solid #e5e4e7; border-radius: 8px; background: #fff;
+  font-size: 12px; cursor: pointer; font-family: inherit; color: #6b6375;
+}
+.batch-menu-btn:hover { border-color: #7ec6a4; color: #4a9d7e; }
+.batch-delete { color: #c0392b; border-color: #e8b4b0; }
+.batch-delete:hover { background: #fdf0ee; border-color: #c0392b; }
+.mini-select {
+  width: 20px; height: 20px; border: 1.5px solid #d4cfc7; border-radius: 4px;
+  background: #fff; color: transparent; font-size: 12px; cursor: pointer;
+  display: inline-flex; align-items: center; justify-content: center; flex-shrink: 0;
+  margin-right: 4px;
+}
+.mini-select.active { background: #4a9d7e; border-color: #4a9d7e; color: #fff; }
+.tag-list-bar {
+  display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 10px; padding: 8px 0;
+}
+.tag-delete { margin-left: 4px; cursor: pointer; font-size: 12px; color: #ccc; }
+.tag-delete:hover { color: #c0392b; }
+.tag-add-row { display: inline-flex; gap: 4px; align-items: center; }
+.tag-add-input { width: 80px; padding: 4px 8px; border: 1px solid #e5e4e7; border-radius: 8px; font-size: 12px; outline: none; font-family: inherit; }
+.tag-add-input:focus { border-color: #7ec6a4; }
+.tag-add-btn { border: none; background: #e8f5e9; color: #4a9d7e; border-radius: 6px; padding: 4px 10px; font-size: 12px; cursor: pointer; font-family: inherit; }
+.tag-add-btn:disabled { opacity: 0.4; }
+
+.export-btn {
+  margin-left: auto;
+  border: none; background: none; cursor: pointer; font-size: 16px; padding: 4px 6px;
+  opacity: 0.6;
+}
+.export-btn:hover { opacity: 1; }
+.batch-count { font-size: 12px; color: #4a9d7e; font-weight: 600; white-space: nowrap; }
+.batch-select { padding: 5px 8px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 12px; font-family: inherit; background: #fff; }
 
 .divider-text {
   text-align: center;

frontend/src/views/UserManagement.vue

@@ -22,17 +22,33 @@
     </div>
 
     <!-- Business Application Approval -->
-    <div v-if="businessApps.length > 0" class="review-section">
+    <div v-if="groupedBizApps.length > 0" class="review-section">
       <h4 class="section-title">💼 商业认证申请</h4>
       <div class="review-list">
-        <div v-for="app in businessApps" :key="app._id || app.id" class="review-item">
+        <div v-for="group in groupedBizApps" :key="group.user_id" class="biz-app-group">
-          <div class="review-info">
+          <div class="review-item">
-            <span class="review-name">{{ app.display_name || app.username }}</span>
+            <div class="review-info">
-            <span class="review-reason">商户名：{{ app.business_name }}</span>
+              <span class="review-name">{{ group.latest.display_name || group.latest.username }}</span>
+              <span class="review-reason">商户名：{{ group.latest.business_name }}</span>
+              <span class="biz-status-tag" :class="'biz-' + group.latest.status">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.latest.status] }}</span>
+            </div>
+            <div class="review-actions">
+              <template v-if="group.latest.status === 'pending'">
+                <button class="btn-sm btn-approve" @click="approveBusiness(group.latest)">通过</button>
+                <button class="btn-sm btn-reject" @click="rejectBusiness(group.latest)">拒绝</button>
+              </template>
+              <button v-if="group.history.length > 1" class="btn-sm btn-outline" @click="group.expanded = !group.expanded">
+                {{ group.expanded ? '收起' : `历史 (${group.history.length})` }}
+              </button>
+            </div>
           </div>
-          <div class="review-actions">
+          <div v-if="group.expanded" class="biz-history">
-            <button class="btn-sm btn-approve" @click="approveBusiness(app)">通过</button>
+            <div v-for="app in group.history" :key="app.id" class="biz-history-item">
-            <button class="btn-sm btn-reject" @click="rejectBusiness(app)">拒绝</button>
+              <span class="biz-status-tag small" :class="'biz-' + app.status">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[app.status] }}</span>
+              <span>{{ app.business_name }}</span>
+              <span v-if="app.reject_reason" class="biz-reject-reason">拒绝原因：{{ app.reject_reason }}</span>
+              <span class="biz-time">{{ formatDate(app.created_at) }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -86,6 +102,8 @@
             <option value="editor">编辑</option>
             <option value="senior_editor">高级编辑</option>
           </select>
+          <button v-if="!u.business_verified" class="btn-sm btn-outline" @click="grantBusiness(u)" title="开通商业认证">💼</button>
+          <button v-else class="btn-sm btn-outline" @click="revokeBusiness(u)" title="撤销商业认证" style="opacity:0.5">💼✕</button>
           <button class="btn-sm btn-delete" @click="removeUser(u)" title="删除用户">🗑️</button>
         </div>
       </div>
@@ -111,6 +129,27 @@ const searchQuery = ref('')
 const filterRole = ref('')
 const translations = ref([])
 const businessApps = ref([])
+import { reactive } from 'vue'
+
+const groupedBizApps = computed(() => {
+  const map = {}
+  for (const app of businessApps.value) {
+    const uid = app.user_id
+    if (!map[uid]) map[uid] = { user_id: uid, history: [], latest: null, expanded: false }
+    map[uid].history.push(app)
+  }
+  return Object.values(map).map(g => {
+    g.history.sort((a, b) => b.id - a.id)
+    g.latest = g.history[0]
+    return reactive(g)
+  }).filter(g => g.latest)
+})
+
+function formatDate(d) {
+  if (!d) return ''
+  return new Date(d + 'Z').toLocaleString('zh-CN', { month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' })
+}
+
 const roles = [
   { value: 'admin', label: '管理员' },
   { value: 'senior_editor', label: '高级编辑' },
@@ -138,10 +177,6 @@ function roleLabel(role) {
   return map[role] || role
 }
 
-function formatDate(d) {
-  if (!d) return '--'
-  return new Date(d).toLocaleDateString('zh-CN')
-}
 
 async function loadUsers() {
   try {
@@ -207,6 +242,36 @@ async function removeUser(user) {
   }
 }
 
+async function grantBusiness(user) {
+  const ok = await showConfirm(`直接为「${user.display_name || user.username}」开通商业认证？`)
+  if (!ok) return
+  const id = user._id || user.id
+  try {
+    const res = await api(`/api/business-grant/${id}`, { method: 'POST' })
+    if (res.ok) {
+      user.business_verified = 1
+      ui.showToast('已开通商业认证')
+    }
+  } catch {
+    ui.showToast('操作失败')
+  }
+}
+
+async function revokeBusiness(user) {
+  const ok = await showConfirm(`撤销「${user.display_name || user.username}」的商业认证？`)
+  if (!ok) return
+  const id = user._id || user.id
+  try {
+    const res = await api(`/api/business-revoke/${id}`, { method: 'POST' })
+    if (res.ok) {
+      user.business_verified = 0
+      ui.showToast('已撤销商业认证')
+    }
+  } catch {
+    ui.showToast('操作失败')
+  }
+}
+
 async function approveTranslation(t) {
   const id = t._id || t.id
   try {
@@ -352,8 +417,26 @@ onMounted(() => {
 .review-actions {
   display: flex;
   gap: 6px;
+  flex-shrink: 0;
 }
 
+.biz-app-group { margin-bottom: 6px; }
+.biz-status-tag {
+  font-size: 11px; padding: 2px 8px; border-radius: 8px; font-weight: 500; white-space: nowrap;
+}
+.biz-status-tag.small { font-size: 10px; padding: 1px 6px; }
+.biz-pending { background: #fff3e0; color: #e65100; }
+.biz-approved { background: #e8f5e9; color: #2e7d32; }
+.biz-rejected { background: #fce4ec; color: #c62828; }
+.biz-history {
+  margin: 4px 0 8px 16px; padding: 8px 12px; background: #fafaf8; border-radius: 8px; border-left: 3px solid #e5e4e7;
+}
+.biz-history-item {
+  display: flex; align-items: center; gap: 8px; font-size: 12px; padding: 4px 0; flex-wrap: wrap;
+}
+.biz-reject-reason { color: #c62828; font-size: 11px; }
+.biz-time { color: #bbb; font-size: 11px; margin-left: auto; }
+
 .btn-approve {
   background: #4a9d7e;
   color: #fff;