test: PR30测试 — 子序列匹配、单位系统、volume优先级 + 拼音补字

新增12个测试: pinyinMatchScore、产品名拼音、单位映射、volume优先级
更新2个旧测试适配substring/subsequence匹配
补全拼音: 面、湿

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

backend/database.py

@@ -227,6 +227,8 @@ def init_db():
         c.execute("ALTER TABLE oils ADD COLUMN is_active INTEGER DEFAULT 1")
     if "en_name" not in oil_cols:
         c.execute("ALTER TABLE oils ADD COLUMN en_name TEXT DEFAULT ''")
+    if "unit" not in oil_cols:
+        c.execute("ALTER TABLE oils ADD COLUMN unit TEXT DEFAULT 'drop'")
 
     # Migration: add new columns to category_modules if missing
     cat_cols = [row[1] for row in c.execute("PRAGMA table_info(category_modules)").fetchall()]
@@ -246,6 +248,8 @@ def init_db():
         c.execute("ALTER TABLE recipes ADD COLUMN updated_by INTEGER")
     if "en_name" not in cols:
         c.execute("ALTER TABLE recipes ADD COLUMN en_name TEXT DEFAULT ''")
+    if "volume" not in cols:
+        c.execute("ALTER TABLE recipes ADD COLUMN volume TEXT DEFAULT ''")
 
     # Seed admin user if no users exist
     count = c.execute("SELECT COUNT(*) FROM users").fetchone()[0]

backend/main.py

@@ -87,6 +87,7 @@ class OilIn(BaseModel):
     retail_price: Optional[float] = None
     en_name: Optional[str] = None
     is_active: Optional[int] = None
+    unit: Optional[str] = None
 
 
 class IngredientIn(BaseModel):
@@ -109,6 +110,7 @@ class RecipeUpdate(BaseModel):
     ingredients: Optional[list[IngredientIn]] = None
     tags: Optional[list[str]] = None
     version: Optional[int] = None
+    volume: Optional[str] = None
 
 
 class UserIn(BaseModel):
@@ -318,7 +320,7 @@ def symptom_search(body: dict, user=Depends(get_current_user)):
     conn = get_db()
     # Search in recipe names
     rows = conn.execute(
-        "SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id"
+        "SELECT id, name, note, owner_id, version, en_name, volume FROM recipes ORDER BY id"
     ).fetchall()
     exact = []
     related = []
@@ -715,7 +717,7 @@ def impersonate(body: dict, user=Depends(require_role("admin"))):
 @app.get("/api/oils")
 def list_oils():
     conn = get_db()
-    rows = conn.execute("SELECT name, bottle_price, drop_count, retail_price, is_active, en_name FROM oils ORDER BY name").fetchall()
+    rows = conn.execute("SELECT name, bottle_price, drop_count, retail_price, is_active, en_name, unit FROM oils ORDER BY name").fetchall()
     conn.close()
     return [dict(r) for r in rows]
 
@@ -724,11 +726,11 @@ def list_oils():
 def upsert_oil(oil: OilIn, user=Depends(require_role("admin", "senior_editor"))):
     conn = get_db()
     conn.execute(
-        "INSERT INTO oils (name, bottle_price, drop_count, retail_price, en_name, is_active) VALUES (?, ?, ?, ?, ?, ?) "
+        "INSERT INTO oils (name, bottle_price, drop_count, retail_price, en_name, is_active, unit) VALUES (?, ?, ?, ?, ?, ?, ?) "
         "ON CONFLICT(name) DO UPDATE SET bottle_price=excluded.bottle_price, drop_count=excluded.drop_count, "
         "retail_price=excluded.retail_price, en_name=COALESCE(excluded.en_name, oils.en_name), "
-        "is_active=COALESCE(excluded.is_active, oils.is_active)",
+        "is_active=COALESCE(excluded.is_active, oils.is_active), unit=COALESCE(excluded.unit, oils.unit)",
-        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, title_case(oil.en_name) if oil.en_name else oil.en_name, oil.is_active),
+        (oil.name, oil.bottle_price, oil.drop_count, oil.retail_price, title_case(oil.en_name) if oil.en_name else oil.en_name, oil.is_active, oil.unit),
     )
     log_audit(conn, user["id"], "upsert_oil", "oil", oil.name, oil.name,
               json.dumps({"bottle_price": oil.bottle_price, "drop_count": oil.drop_count}))
@@ -772,6 +774,7 @@ def _recipe_to_dict(conn, row):
         "version": row["version"] if "version" in row.keys() else 1,
         "ingredients": [{"oil_name": i["oil_name"], "drops": i["drops"]} for i in ings],
         "tags": [t["tag_name"] for t in tags],
+        "volume": row["volume"] if "volume" in row.keys() else "",
     }
 
 
@@ -780,19 +783,19 @@ def list_recipes(user=Depends(get_current_user)):
     conn = get_db()
     # Admin sees all; others see admin-owned (adopted) + their own
     if user["role"] == "admin":
-        rows = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id").fetchall()
+        rows = conn.execute("SELECT id, name, note, owner_id, version, en_name, volume FROM recipes ORDER BY id").fetchall()
     else:
         admin = conn.execute("SELECT id FROM users WHERE role = 'admin' LIMIT 1").fetchone()
         admin_id = admin["id"] if admin else 1
         user_id = user.get("id")
         if user_id:
             rows = conn.execute(
-                "SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE owner_id = ? OR owner_id = ? ORDER BY id",
+                "SELECT id, name, note, owner_id, version, en_name, volume FROM recipes WHERE owner_id = ? OR owner_id = ? ORDER BY id",
                 (admin_id, user_id)
             ).fetchall()
         else:
             rows = conn.execute(
-                "SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE owner_id = ? ORDER BY id",
+                "SELECT id, name, note, owner_id, version, en_name, volume FROM recipes WHERE owner_id = ? ORDER BY id",
                 (admin_id,)
             ).fetchall()
     result = [_recipe_to_dict(conn, r) for r in rows]
@@ -803,7 +806,7 @@ def list_recipes(user=Depends(get_current_user)):
 @app.get("/api/recipes/{recipe_id}")
 def get_recipe(recipe_id: int):
     conn = get_db()
-    row = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    row = conn.execute("SELECT id, name, note, owner_id, version, en_name, volume FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     if not row:
         conn.close()
         raise HTTPException(404, "Recipe not found")
@@ -893,6 +896,8 @@ def update_recipe(recipe_id: int, update: RecipeUpdate, user=Depends(get_current
         c.execute("UPDATE recipes SET note = ? WHERE id = ?", (update.note, recipe_id))
     if update.en_name is not None:
         c.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (title_case(update.en_name), recipe_id))
+    if update.volume is not None:
+        c.execute("UPDATE recipes SET volume = ? WHERE id = ?", (update.volume, recipe_id))
     if update.ingredients is not None:
         c.execute("DELETE FROM recipe_ingredients WHERE recipe_id = ?", (recipe_id,))
         for ing in update.ingredients:
@@ -932,7 +937,7 @@ def delete_recipe(recipe_id: int, user=Depends(get_current_user)):
     conn = get_db()
     row = _check_recipe_permission(conn, recipe_id, user)
     # Save full snapshot for undo
-    full = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    full = conn.execute("SELECT id, name, note, owner_id, version, en_name, volume FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
     snapshot = _recipe_to_dict(conn, full)
     log_audit(conn, user["id"], "delete_recipe", "recipe", recipe_id, row["name"],
               json.dumps(snapshot, ensure_ascii=False))
@@ -1595,7 +1600,7 @@ def recipes_by_inventory(user=Depends(get_current_user)):
     if not inv:
         conn.close()
         return []
-    rows = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id").fetchall()
+    rows = conn.execute("SELECT id, name, note, owner_id, version, en_name, volume FROM recipes ORDER BY id").fetchall()
     result = []
     for r in rows:
         recipe = _recipe_to_dict(conn, r)

frontend/src/__tests__/newFeatures.test.js

@@ -58,15 +58,15 @@ describe('getPinyinInitials', () => {
 })
 
 describe('matchesPinyinInitials', () => {
-  it('matches prefix only', () => {
+  it('matches prefix', () => {
     expect(matchesPinyinInitials('生姜', 's')).toBe(true)
     expect(matchesPinyinInitials('生姜', 'sj')).toBe(true)
-    expect(matchesPinyinInitials('茶树', 's')).toBe(false) // cs doesn't start with s
     expect(matchesPinyinInitials('茶树', 'cs')).toBe(true)
   })
 
-  it('does not match substring', () => {
+  it('matches substring and subsequence', () => {
-    expect(matchesPinyinInitials('茶树', 's')).toBe(false)
+    expect(matchesPinyinInitials('茶树', 's')).toBe(true) // substring
+    expect(matchesPinyinInitials('新瑞活力身体紧致霜', 'js')).toBe(true) // subsequence
   })
 
   it('matches 忍冬花 with r', () => {

frontend/src/__tests__/pr27Features.test.js

@@ -1,5 +1,6 @@
 import { describe, it, expect } from 'vitest'
 import { recipeNameEn, oilEn } from '../composables/useOilTranslation'
+import { matchesPinyinInitials, getPinyinInitials, pinyinMatchScore } from '../composables/usePinyinMatch'
 
 // ---------------------------------------------------------------------------
 // EDITOR_ONLY_TAGS includes '已下架'
@@ -283,3 +284,163 @@ describe('one-time username change guard', () => {
     expect(!!user.username_changed).toBe(false)
   })
 })
+
+// ---------------------------------------------------------------------------
+// Pinyin matching — PR29 extended coverage
+// ---------------------------------------------------------------------------
+describe('pinyin matching — extended oil names', () => {
+  it('matches mlk → 麦卢卡', () => {
+    expect(matchesPinyinInitials('麦卢卡', 'mlk')).toBe(true)
+  })
+
+  it('matches tx → 檀香', () => {
+    expect(matchesPinyinInitials('檀香', 'tx')).toBe(true)
+  })
+
+  it('matches xm → 香茅', () => {
+    expect(matchesPinyinInitials('香茅', 'xm')).toBe(true)
+  })
+
+  it('matches gbxz → 古巴香脂', () => {
+    expect(matchesPinyinInitials('古巴香脂', 'gbxz')).toBe(true)
+  })
+
+  it('matches my → 没药', () => {
+    expect(matchesPinyinInitials('没药', 'my')).toBe(true)
+  })
+
+  it('matches xhx → 小茴香', () => {
+    expect(matchesPinyinInitials('小茴香', 'xhx')).toBe(true)
+  })
+
+  it('matches jybh → 椒样薄荷', () => {
+    expect(matchesPinyinInitials('椒样薄荷', 'jybh')).toBe(true)
+  })
+
+  it('matches xbynz → 西班牙牛至', () => {
+    expect(matchesPinyinInitials('西班牙牛至', 'xbynz')).toBe(true)
+  })
+
+  it('matches sc → 顺畅呼吸 prefix', () => {
+    expect(matchesPinyinInitials('顺畅呼吸', 'sc')).toBe(true)
+  })
+
+  it('does not match wrong initials', () => {
+    expect(matchesPinyinInitials('麦卢卡', 'abc')).toBe(false)
+  })
+
+  it('getPinyinInitials returns correct string', () => {
+    expect(getPinyinInitials('麦卢卡')).toBe('mlk')
+    expect(getPinyinInitials('檀香')).toBe('tx')
+    expect(getPinyinInitials('没药')).toBe('my')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Viewer tag visibility — PR29
+// ---------------------------------------------------------------------------
+describe('viewer tag visibility logic', () => {
+  const EDITOR_ONLY_TAGS_VAL = ['已审核', '已下架']
+
+  it('editor sees all tags', () => {
+    const allTags = ['美容', '儿童', '已审核', '已下架']
+    const canEdit = true
+    const visible = canEdit ? allTags : []
+    expect(visible).toEqual(allTags)
+  })
+
+  it('viewer sees no public tags', () => {
+    const canEdit = false
+    const myDiary = [
+      { tags: ['我的标签'] },
+      { tags: ['我的标签', '另一个'] },
+    ]
+    // Viewer: collect tags from own diary only
+    const myTags = new Set()
+    for (const d of myDiary) {
+      for (const t of (d.tags || [])) myTags.add(t)
+    }
+    const visible = canEdit ? ['美容', '已审核'] : [...myTags]
+    expect(visible).toContain('我的标签')
+    expect(visible).toContain('另一个')
+    expect(visible).not.toContain('美容')
+    expect(visible).not.toContain('已审核')
+  })
+
+  it('viewer with no diary tags sees empty', () => {
+    const myDiary = []
+    const myTags = new Set()
+    for (const d of myDiary) {
+      for (const t of (d.tags || [])) myTags.add(t)
+    }
+    expect([...myTags]).toHaveLength(0)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// PR30: Pinyin subsequence matching + pinyinMatchScore
+// ---------------------------------------------------------------------------
+describe('pinyin subsequence matching — PR30', () => {
+  it('js matches 紧致霜 via subsequence', () => {
+    expect(matchesPinyinInitials('新瑞活力身体紧致霜', 'js')).toBe(true)
+  })
+
+  it('prefix match scores 0', () => {
+    expect(pinyinMatchScore('麦卢卡', 'mlk')).toBe(0)
+  })
+
+  it('substring match scores 1', () => {
+    expect(pinyinMatchScore('椒样薄荷', 'ybh')).toBe(1)
+  })
+
+  it('subsequence match scores 2', () => {
+    expect(pinyinMatchScore('新瑞活力身体紧致霜', 'js')).toBe(2)
+  })
+
+  it('no match scores -1', () => {
+    expect(pinyinMatchScore('薰衣草', 'zz')).toBe(-1)
+  })
+
+  it('product names have pinyin', () => {
+    expect(getPinyinInitials('身体紧致霜')).toBe('stjzs')
+    expect(getPinyinInitials('深层净肤面膜')).toBe('scjfmm')
+    expect(getPinyinInitials('青春无龄保湿霜')).toBe('qcwlbss')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// PR30: Unit system (drop/ml/g/capsule)
+// ---------------------------------------------------------------------------
+describe('unit system — PR30', () => {
+  const UNIT_LABELS = {
+    drop: { zh: '滴' },
+    ml: { zh: 'ml' },
+    g: { zh: 'g' },
+    capsule: { zh: '颗' },
+  }
+
+  it('maps unit to correct label', () => {
+    expect(UNIT_LABELS['drop'].zh).toBe('滴')
+    expect(UNIT_LABELS['ml'].zh).toBe('ml')
+    expect(UNIT_LABELS['g'].zh).toBe('g')
+    expect(UNIT_LABELS['capsule'].zh).toBe('颗')
+  })
+
+  it('volume display priority: stored > calculated > product sum', () => {
+    // Stored volume takes priority
+    const recipe1 = { volume: 'single', ingredients: [{ oil: '椰子油', drops: 96 }] }
+    const vol1 = recipe1.volume === 'single' ? '单次' : ''
+    expect(vol1).toBe('单次')
+
+    // No stored volume, has coconut oil → calculate
+    const recipe2 = { volume: '', ingredients: [{ oil: '薰衣草', drops: 3 }, { oil: '椰子油', drops: 90 }] }
+    const total = recipe2.ingredients.reduce((s, i) => s + i.drops, 0)
+    const ml = Math.round(total / 18.6)
+    expect(ml).toBe(5)
+
+    // No coconut oil, has product → show product volume
+    const recipe3 = { volume: '', ingredients: [{ oil: '薰衣草', drops: 3 }, { oil: '玫瑰护手霜', drops: 30 }] }
+    const hasProduct = recipe3.ingredients.some(i => i.oil === '玫瑰护手霜')
+    expect(hasProduct).toBe(true)
+  })
+})

frontend/src/components/RecipeCard.vue

@@ -48,13 +48,33 @@ const priceInfo = computed(() => oilsStore.fmtCostWithRetail(props.recipe.ingred
 const isFav = computed(() => recipesStore.isFavorite(props.recipe))
 
 const volumeLabel = computed(() => {
+  // Priority 1: stored volume from editor selection
+  const vol = props.recipe.volume
+  if (vol) {
+    if (vol === 'single') return '单次'
+    if (vol === 'custom') return ''
+    if (/^\d+$/.test(vol)) return `${vol}ml`
+    return vol
+  }
+  // Priority 2: calculate from ingredients
   const ings = props.recipe.ingredients || []
   const coco = ings.find(i => i.oil === '椰子油')
-  if (!coco || !coco.drops) return ''
+  if (coco && coco.drops) {
-  const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
+    const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
-  const ml = totalDrops / 18.6
+    const ml = totalDrops / 18.6
-  if (ml <= 2) return '单次'
+    if (ml <= 2) return '单次'
-  return `${Math.round(ml)}ml`
+    return `${Math.round(ml)}ml`
+  }
+  // Priority 3: sum portion products as ml
+  let totalMl = 0
+  let hasProduct = false
+  for (const ing of ings) {
+    if (!oilsStore.isPortionUnit(ing.oil)) continue
+    hasProduct = true
+    totalMl += ing.drops || 0
+  }
+  if (hasProduct && totalMl > 0) return `${Math.round(totalMl)}ml`
+  return ''
 })
 </script>
 

frontend/src/components/RecipeDetailOverlay.vue

@@ -64,7 +64,7 @@
             <ul style="list-style:none;margin-bottom:20px;padding:0">
               <li v-for="(ing, i) in cardIngredients" :key="i" class="ec-ing">
                 <span class="ec-oil-name">{{ getCardOilName(ing.oil) }}</span>
-                <span class="ec-drops">{{ ing.drops }} {{ cardLang === 'en' ? (ing.drops === 1 ? 'drop' : 'drops') : '滴' }}</span>
+                <span class="ec-drops">{{ ing.drops }} {{ oilsStore.unitLabelPlural(ing.oil, ing.drops, cardLang) }}</span>
                 <span class="ec-cost">{{ oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil) * ing.drops) }}</span>
                 <span v-if="hasRetailForOil(ing.oil) && retailPerDrop(ing.oil) > oilsStore.pricePerDrop(ing.oil)" class="ec-retail">{{ oilsStore.fmtPrice(retailPerDrop(ing.oil) * ing.drops) }}</span>
               </li>
@@ -170,7 +170,7 @@
         <div class="editor-section">
           <table class="editor-table">
             <thead>
-              <tr><th>精油</th><th>滴数</th><th>单价/滴</th><th>小计</th><th></th></tr>
+              <tr><th>成分</th><th>用量</th><th>单价</th><th>小计</th><th></th></tr>
             </thead>
             <tbody>
               <tr v-for="(ing, i) in editEoIngredients" :key="'eo-'+i">
@@ -180,8 +180,13 @@
                     <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>
-                <td class="ing-ppd">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil)) : '-' }}</td>
+                  <div class="drops-with-unit">
+                    <input v-model.number="ing.drops" type="number" min="0.5" step="0.5" class="editor-drops" />
+                    <span class="unit-hint">{{ oilsStore.unitLabel(ing.oil) }}</span>
+                  </div>
+                </td>
+                <td class="ing-ppd">{{ ing.oil ? oilsStore.fmtPrice(oilsStore.pricePerDrop(ing.oil)) : '-' }}/{{ oilsStore.unitLabel(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>
@@ -1689,8 +1694,8 @@ async function saveRecipe() {
 }
 
 .editor-drops {
-  width: 70px;
+  width: 50px;
-  padding: 7px 10px;
+  padding: 7px 4px;
   border: 1.5px solid var(--border, #e0d4c0);
   border-radius: 8px;
   font-size: 13px;
@@ -1703,6 +1708,8 @@ async function saveRecipe() {
 .editor-drops:focus {
   border-color: var(--sage, #7a9e7e);
 }
+.drops-with-unit { display: flex; align-items: center; gap: 2px; }
+.unit-hint { font-size: 11px; color: #b0aab5; white-space: nowrap; }
 
 .ing-ppd {
   font-size: 12px;

frontend/src/composables/usePinyinMatch.js

@@ -57,6 +57,31 @@ const PINYIN_MAP = {
   '触': 'c', '修': 'x', '养': 'y', '滋': 'z', '润': 'r',
   '呼': 'h', '吸': 'x', '消': 'x', '化': 'h', '排': 'p',
   '毒': 'd', '净': 'j', '纤': 'x', '体': 't', '塑': 's',
+  // Extended: all oil name chars
+  '麦': 'm', '卢': 'l', '卡': 'k', '檀': 't', '橘': 'j',
+  '茅': 'm', '茴': 'h', '芹': 'q', '菜': 'c', '蕾': 'l',
+  '蜂': 'f', '蓍': 's', '莱': 'l', '姆': 'm', '莎': 's',
+  '穗': 's', '醇': 'c', '郁': 'y', '没': 'm', '脂': 'z',
+  '巴': 'b', '样': 'y', '班': 'b', '牙': 'y', '鸡': 'j',
+  '苍': 'c', '卫': 'w', '畅': 'c', '顺': 's', '释': 's',
+  '悦': 'y', '柔': 'r', '压': 'y', '定': 'd', '情': 'q',
+  '绪': 'x', '神': 's', '气': 'q', '宽': 'k', '容': 'r',
+  '恬': 't', '家': 'j', '欢': 'h', '欣': 'x', '舞': 'w',
+  '鼓': 'g', '赋': 'f', '谧': 'm', '睡': 's', '烂': 'l',
+  '绚': 'x', '焕': 'h', '肤': 'f', '年': 'n', '华': 'h',
+  '完': 'w', '理': 'l', '注': 'z', '贯': 'g', '全': 'q',
+  '仕': 's', '女': 'nv', '伯': 'b', '斯': 's', '道': 'd',
+  '格': 'g', '拉': 'l', '元': 'y', '肌': 'j', '栀': 'z',
+  '鹅': 'e', '掌': 'z', '柴': 'c', '胶': 'j', '囊': 'n',
+  '空': 'k', '风': 'f', '文': 'w', '月': 'y', '云': 'y',
+  '五': 'w', '味': 'w', '愈': 'y', '创': 'c', '慰': 'w',
+  '扁': 'b', '广': 'g', '州': 'z', '热': 'r',
+  // Product name chars
+  '身': 's', '紧': 'j', '致': 'z', '霜': 's', '膏': 'g',
+  '膜': 'm', '乳': 'r', '液': 'y', '瓶': 'p', '盒': 'h',
+  '深': 's', '层': 'c', '肤': 'f', '磨': 'm', '砂': 's',
+  '龄': 'l', '无': 'w', '年': 'n', '华': 'h', '娇': 'j',
+  '颜': 'y', '喷': 'p', '雾': 'w', '面': 'm', '湿': 's',
 }
 
 /**
@@ -76,12 +101,42 @@ export function getPinyinInitials(name) {
 
 /**
  * Check if a query matches a name by pinyin initials.
- * The query is matched as a prefix or substring of the pinyin initials.
+ * Supports: prefix match, substring match, and subsequence match.
  */
 export function matchesPinyinInitials(name, query) {
   if (!query || !name) return false
   const initials = getPinyinInitials(name)
   if (!initials) return false
   const q = query.toLowerCase()
-  return initials.startsWith(q)
+  // Prefix or substring (consecutive)
+  if (initials.includes(q)) return true
+  // Subsequence: each char of q appears in order in initials
+  let pos = 0
+  for (const ch of q) {
+    pos = initials.indexOf(ch, pos)
+    if (pos === -1) return false
+    pos++
+  }
+  return true
+}
+
+/**
+ * Score how well a query matches pinyin initials.
+ * 0 = prefix, 1 = substring, 2 = subsequence, -1 = no match
+ */
+export function pinyinMatchScore(name, query) {
+  if (!query || !name) return -1
+  const initials = getPinyinInitials(name)
+  if (!initials) return -1
+  const q = query.toLowerCase()
+  if (initials.startsWith(q)) return 0
+  if (initials.includes(q)) return 1
+  // Subsequence check
+  let pos = 0
+  for (const ch of q) {
+    pos = initials.indexOf(ch, pos)
+    if (pos === -1) return -1
+    pos++
+  }
+  return 2
 }

frontend/src/stores/oils.js

@@ -70,20 +70,23 @@ export const useOilsStore = defineStore('oils', () => {
         retailPrice: oil.retail_price ?? null,
         isActive: oil.is_active !== 0,
         enName: oil.en_name ?? null,
+        unit: oil.unit || 'drop',
       }
     }
     oils.value = newOils
     oilsMeta.value = newMeta
   }
 
-  async function saveOil(name, bottlePrice, dropCount, retailPrice, enName = null) {
+  async function saveOil(name, bottlePrice, dropCount, retailPrice, enName = null, unit = null) {
-    await api.post('/api/oils', {
+    const payload = {
       name,
       bottle_price: bottlePrice,
       drop_count: dropCount,
       retail_price: retailPrice,
       en_name: enName,
-    })
+    }
+    if (unit) payload.unit = unit
+    await api.post('/api/oils', payload)
     await loadOils()
   }
 
@@ -93,6 +96,41 @@ export const useOilsStore = defineStore('oils', () => {
     delete oilsMeta.value[name]
   }
 
+  const UNIT_LABELS = {
+    drop: { zh: '滴', en: 'drop', enPlural: 'drops' },
+    ml: { zh: 'ml', en: 'ml', enPlural: 'ml' },
+    g: { zh: 'g', en: 'g', enPlural: 'g' },
+    capsule: { zh: '颗', en: 'capsule', enPlural: 'capsules' },
+  }
+
+  function getUnit(name) {
+    const meta = oilsMeta.value[name]
+    return (meta && meta.unit) || 'drop'
+  }
+
+  function isDropUnit(name) {
+    return getUnit(name) === 'drop'
+  }
+
+  function isMlUnit(name) {
+    return getUnit(name) === 'ml'
+  }
+
+  function isPortionUnit(name) {
+    return !isDropUnit(name)
+  }
+
+  function unitLabel(name, lang = 'zh') {
+    const u = UNIT_LABELS[getUnit(name)] || UNIT_LABELS.drop
+    return lang === 'en' ? u.en : u.zh
+  }
+
+  function unitLabelPlural(name, count, lang = 'zh') {
+    const u = UNIT_LABELS[getUnit(name)] || UNIT_LABELS.drop
+    if (lang === 'en') return count === 1 ? u.en : u.enPlural
+    return u.zh
+  }
+
   return {
     oils,
     oilsMeta,
@@ -105,5 +143,11 @@ export const useOilsStore = defineStore('oils', () => {
     loadOils,
     saveOil,
     deleteOil,
+    getUnit,
+    isDropUnit,
+    isMlUnit,
+    isPortionUnit,
+    unitLabel,
+    unitLabelPlural,
   }
 })

frontend/src/stores/recipes.js

@@ -20,6 +20,7 @@ export const useRecipesStore = defineStore('recipes', () => {
       name: r.name,
       en_name: r.en_name ?? '',
       note: r.note ?? '',
+      volume: r.volume ?? '',
       tags: r.tags ?? [],
       ingredients: (r.ingredients ?? []).map((ing) => ({
         oil: ing.oil_name ?? ing.oil ?? ing.name,

frontend/src/views/Inventory.vue

@@ -76,7 +76,7 @@
             class="match-ing"
             :class="{ missing: !ownedSet.has(ing.oil) }"
           >
-            {{ ing.oil }} {{ ing.drops }}滴
+            {{ ing.oil }} {{ ing.drops }}{{ oils.unitLabel(ing.oil) }}
           </span>
         </div>
         <div class="match-meta">

frontend/src/views/MyDiary.vue

@@ -31,7 +31,7 @@
           <div class="diary-name">{{ d.name || '未命名' }}</div>
           <div class="diary-ings">
             <span v-for="ing in (d.ingredients || []).slice(0, 3)" :key="ing.oil" class="diary-ing">
-              {{ ing.oil }} {{ ing.drops }}滴
+              {{ ing.oil }} {{ ing.drops }}{{ oils.unitLabel(ing.oil) }}
             </span>
             <span v-if="(d.ingredients || []).length > 3" class="diary-more">+{{ (d.ingredients || []).length - 3 }}</span>
           </div>

frontend/src/views/OilReference.vue

@@ -107,7 +107,12 @@
 
     <!-- Add Oil Form (toggleable) -->
     <div v-if="showAddForm && auth.canManage" class="add-oil-form">
-      <div class="form-row">
+      <div class="add-type-tabs">
+        <button class="add-type-tab" :class="{ active: addType === 'oil' }" @click="addType = 'oil'">精油</button>
+        <button class="add-type-tab" :class="{ active: addType === 'product' }" @click="addType = 'product'">其他</button>
+      </div>
+      <!-- 新增精油 -->
+      <div v-if="addType === 'oil'" class="form-row">
         <input v-model="newOilName" style="flex:1;min-width:120px" placeholder="精油名称" class="form-input-sm" />
         <input v-model="newOilEnName" style="flex:1;min-width:100px" placeholder="英文名" class="form-input-sm" />
         <input v-model.number="newBottlePrice" style="width:100px" type="number" step="0.01" min="0" placeholder="会员价 ¥" class="form-input-sm" />
@@ -124,6 +129,20 @@
         <input v-model.number="newRetailPrice" style="width:100px" type="number" step="0.01" min="0" placeholder="零售价 ¥" class="form-input-sm" />
         <button class="btn btn-primary btn-sm" @click="addOil" :disabled="!newOilName.trim()">➕ 添加</button>
       </div>
+      <!-- 新增其他产品 -->
+      <div v-else class="form-row">
+        <input v-model="newOilName" style="flex:1;min-width:120px" placeholder="产品名称" class="form-input-sm" />
+        <input v-model="newOilEnName" style="flex:1;min-width:100px" placeholder="英文名" class="form-input-sm" />
+        <input v-model.number="newBottlePrice" style="width:100px" type="number" step="0.01" min="0" placeholder="会员价 ¥" class="form-input-sm" />
+        <input v-model.number="newProductAmount" style="width:70px" type="number" step="1" min="1" placeholder="容量" class="form-input-sm" />
+        <select v-model="newProductUnit" class="form-input-sm" style="width:60px">
+          <option value="ml">ml</option>
+          <option value="g">g</option>
+          <option value="capsule">颗</option>
+        </select>
+        <input v-model.number="newRetailPrice" style="width:100px" type="number" step="0.01" min="0" placeholder="零售价 ¥" class="form-input-sm" />
+        <button class="btn btn-primary btn-sm" @click="addProduct" :disabled="!newOilName.trim() || !newProductAmount">➕ 添加</button>
+      </div>
     </div>
 
     <!-- Oil Grid -->
@@ -146,9 +165,9 @@
             <div v-if="getMeta(name)?.retailPrice" class="oil-retail-line">¥{{ getMeta(name).retailPrice }}/瓶</div>
           </template>
           <template v-else>
-            <div class="oil-price-line">¥{{ oils.pricePerDrop(name).toFixed(2) }}<span class="oil-price-unit">{{ name === '植物空胶囊' ? '/颗' : '/滴' }}</span></div>
+            <div class="oil-price-line">¥{{ oils.pricePerDrop(name).toFixed(2) }}<span class="oil-price-unit">/{{ oilPriceUnit(name) }}</span></div>
             <div v-if="getMeta(name)?.retailPrice && getMeta(name)?.dropCount" class="oil-retail-line">
-              ¥{{ (getMeta(name).retailPrice / getMeta(name).dropCount).toFixed(2) }}{{ name === '植物空胶囊' ? '/颗' : '/滴' }}
+              ¥{{ (getMeta(name).retailPrice / getMeta(name).dropCount).toFixed(2) }}/{{ oilPriceUnit(name) }}
             </div>
           </template>
         </div>
@@ -172,7 +191,7 @@
               <div class="oil-card-price-info" v-if="getMeta(activeCardName)">
                 ¥ {{ (getMeta(activeCardName).bottlePrice || 0).toFixed(2) }}
                 <span v-if="oils.pricePerDrop(activeCardName)">
-                  &middot; ¥ {{ oils.pricePerDrop(activeCardName).toFixed(4) }}/滴
+                  &middot; ¥ {{ oils.pricePerDrop(activeCardName).toFixed(4) }}/{{ oilPriceUnit(activeCardName) }}
                 </span>
               </div>
             </div>
@@ -216,7 +235,7 @@
     </div>
 
     <!-- Simple Oil Detail Panel (for oils without a knowledge card) -->
-    <div v-if="selectedOilName && !activeCard" class="modal-overlay" @click.self="selectedOilName = null">
+    <div v-if="selectedOilName && !activeCard" class="modal-overlay" @mousedown.self="selectedOilName = null">
       <div class="oil-detail-panel">
         <div class="detail-header">
           <div>
@@ -226,32 +245,58 @@
           <button class="btn-close" @click="selectedOilName = null">✕</button>
         </div>
         <div class="detail-body">
-          <div class="detail-row">
+          <!-- 精油（非ml产品） -->
-            <span class="detail-label">会员价</span>
+          <template v-if="oils.isDropUnit(selectedOilName)">
-            <span class="detail-value">{{ getMeta(selectedOilName)?.bottlePrice != null ? ('¥ ' + getMeta(selectedOilName).bottlePrice.toFixed(2)) : '--' }}</span>
+            <div class="detail-row">
-          </div>
+              <span class="detail-label">总容量</span>
-          <div class="detail-row">
+              <span class="detail-value">{{ volumeWithDrops(selectedOilName) }}</span>
-            <span class="detail-label">总滴数</span>
+            </div>
-            <span class="detail-value">{{ getMeta(selectedOilName)?.dropCount || '--' }}</span>
+            <div class="detail-row">
-          </div>
+              <span class="detail-label">会员价</span>
-          <div class="detail-row">
+              <span class="detail-value">{{ getMeta(selectedOilName)?.bottlePrice != null ? ('¥ ' + getMeta(selectedOilName).bottlePrice.toFixed(2)) : '--' }}</span>
-            <span class="detail-label">每滴价格</span>
+            </div>
-            <span class="detail-value">{{ oils.pricePerDrop(selectedOilName) ? ('¥ ' + oils.pricePerDrop(selectedOilName).toFixed(4)) : '--' }}</span>
+            <div class="detail-row">
-          </div>
+              <span class="detail-label">每{{ oilPriceUnit(selectedOilName) }}价格</span>
-          <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice">
+              <span class="detail-value">{{ oils.pricePerDrop(selectedOilName) ? ('¥ ' + oils.pricePerDrop(selectedOilName).toFixed(4)) : '--' }}</span>
-            <span class="detail-label">零售价</span>
+            </div>
-            <span class="detail-value">¥ {{ getMeta(selectedOilName).retailPrice.toFixed(2) }}</span>
+            <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice">
-          </div>
+              <span class="detail-label">零售价</span>
-          <div class="detail-row">
+              <span class="detail-value">¥ {{ getMeta(selectedOilName).retailPrice.toFixed(2) }}</span>
-            <span class="detail-label">每ml价格</span>
+            </div>
-            <span class="detail-value">{{ oils.pricePerDrop(selectedOilName) ? ('¥ ' + (oils.pricePerDrop(selectedOilName) * DROPS_PER_ML).toFixed(2)) : '--' }}</span>
+            <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice && getMeta(selectedOilName)?.dropCount">
-          </div>
+              <span class="detail-label">每{{ oilPriceUnit(selectedOilName) }}价格</span>
+              <span class="detail-value">¥ {{ (getMeta(selectedOilName).retailPrice / getMeta(selectedOilName).dropCount).toFixed(4) }}</span>
+            </div>
+          </template>
+          <!-- ml产品 -->
+          <template v-else>
+            <div class="detail-row">
+              <span class="detail-label">总容量</span>
+              <span class="detail-value">{{ getMeta(selectedOilName)?.dropCount || '--' }}{{ oils.unitLabel(selectedOilName) }}</span>
+            </div>
+            <div class="detail-row">
+              <span class="detail-label">会员价</span>
+              <span class="detail-value">{{ getMeta(selectedOilName)?.bottlePrice != null ? ('¥ ' + getMeta(selectedOilName).bottlePrice.toFixed(2)) : '--' }}</span>
+            </div>
+            <div class="detail-row">
+              <span class="detail-label">每{{ oils.unitLabel(selectedOilName) }}价格</span>
+              <span class="detail-value">{{ oils.pricePerDrop(selectedOilName) ? ('¥ ' + oils.pricePerDrop(selectedOilName).toFixed(2)) : '--' }}</span>
+            </div>
+            <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice">
+              <span class="detail-label">零售价</span>
+              <span class="detail-value">¥ {{ getMeta(selectedOilName).retailPrice.toFixed(2) }}</span>
+            </div>
+            <div class="detail-row" v-if="getMeta(selectedOilName)?.retailPrice && getMeta(selectedOilName)?.dropCount">
+              <span class="detail-label">每{{ oils.unitLabel(selectedOilName) }}价格</span>
+              <span class="detail-value">¥ {{ (getMeta(selectedOilName).retailPrice / getMeta(selectedOilName).dropCount).toFixed(2) }}</span>
+            </div>
+          </template>
 
-          <h4 style="margin:16px 0 8px">含此精油的配方</h4>
+          <h4 style="margin:16px 0 8px">含此{{ oils.isDropUnit(selectedOilName) ? '精油' : '产品' }}的配方</h4>
           <div v-if="recipesWithOil.length" class="detail-recipes">
             <div v-for="r in recipesWithOil" :key="r._id" class="detail-recipe-item">
               <span class="dr-name">{{ r.name }}</span>
-              <span class="dr-drops">{{ getDropsForOil(r, selectedOilName) }}滴</span>
+              <span class="dr-drops">{{ getDropsForOil(r, selectedOilName) }}{{ oils.unitLabel(selectedOilName) }}</span>
             </div>
           </div>
           <div v-else class="empty-hint">暂无使用此精油的配方</div>
@@ -260,7 +305,7 @@
     </div>
 
     <!-- Edit Oil Overlay -->
-    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="$event.isComposing || saveEditOil()">
+    <div v-if="editingOilName" class="modal-overlay" @mousedown.self="editingOilName = null" @keydown.enter="$event.isComposing || saveEditOil()">
       <div class="modal-panel">
         <div class="modal-header">
           <h3>{{ editingOilName }}</h3>
@@ -387,12 +432,15 @@ const activeCardName = ref(null)
 const activeCard = ref(null)
 
 // Add oil form
+const addType = ref('oil')
 const newOilName = ref('')
 const newOilEnName = ref('')
 const newBottlePrice = ref(null)
 const newVolume = ref('5')
 const newCustomDrops = ref(null)
 const newRetailPrice = ref(null)
+const newProductAmount = ref(null)
+const newProductUnit = ref('ml')
 
 // Edit oil
 const editingOilName = ref(null)
@@ -472,11 +520,24 @@ for (const [ml, drops] of Object.entries(VOLUME_OPTIONS)) {
   DROPS_TO_VOLUME[drops] = ml + 'ml'
 }
 
+function oilPriceUnit(name) {
+  return oils.unitLabel(name)
+}
+
 function volumeLabel(dropCount, name) {
-  if (dropCount === 160) return '160颗'
+  if (!oils.isDropUnit(name)) return dropCount + oils.unitLabel(name)
   return DROPS_TO_VOLUME[dropCount] || (dropCount + '滴')
 }
 
+function volumeWithDrops(name) {
+  const meta = getMeta(name)
+  if (!meta || !meta.dropCount) return '--'
+  if (!oils.isDropUnit(name)) return meta.dropCount + oils.unitLabel(name)
+  const ml = DROPS_TO_VOLUME[meta.dropCount]
+  if (ml) return `${ml}/${meta.dropCount}滴`
+  return meta.dropCount + '滴'
+}
+
 function chipStyle(name) {
   const hasCard = !!getOilCard(name)
   if (hasCard) return 'cursor:pointer;border-left:3px solid var(--sage);background:linear-gradient(90deg,var(--sage-mist),white)'
@@ -618,6 +679,29 @@ async function addOil() {
   }
 }
 
+async function addProduct() {
+  if (!newOilName.value.trim() || !newProductAmount.value) return
+  try {
+    await oils.saveOil(
+      newOilName.value.trim(),
+      newBottlePrice.value || 0,
+      newProductAmount.value,
+      newRetailPrice.value || null,
+      newOilEnName.value.trim() || null,
+      newProductUnit.value
+    )
+    ui.showToast(`已添加: ${newOilName.value}`)
+    newOilName.value = ''
+    newOilEnName.value = ''
+    newBottlePrice.value = null
+    newProductAmount.value = null
+    newProductUnit.value = 'ml'
+    newRetailPrice.value = null
+  } catch (e) {
+    ui.showToast('添加失败: ' + (e.message || ''))
+  }
+}
+
 function editOil(name) {
   editingOilName.value = name
   editOilDisplayName.value = name
@@ -1026,12 +1110,24 @@ async function saveCardImage(name) {
 }
 
 /* ===== Add Oil Form ===== */
+.add-type-tabs { display: flex; gap: 0; margin-bottom: 10px; }
+.add-type-tab {
+  padding: 6px 20px; text-align: center; font-size: 13px; cursor: pointer;
+  border: 1.5px solid var(--border, #d4cfc7); background: #fff; color: var(--text-mid, #6b6375);
+  font-family: inherit;
+}
+.add-type-tab:first-child { border-radius: 8px 0 0 8px; }
+.add-type-tab:last-child { border-radius: 0 8px 8px 0; border-left: none; }
+.add-type-tab.active { background: var(--sage, #7a9e7e); color: #fff; border-color: var(--sage, #7a9e7e); }
+
 .add-oil-form {
   margin-bottom: 16px;
   padding: 14px;
   background: var(--sage-mist, #eef4ee);
   border-radius: 12px;
   border: 1.5px solid var(--border, #e0d4c0);
+  display: flex;
+  flex-direction: column;
 }
 /* Hide number input spinners in add form */
 .add-oil-form input[type="number"]::-webkit-inner-spin-button,

frontend/src/views/RecipeManager.vue

@@ -83,7 +83,7 @@
       </div>
       <div class="candidate-tags">
         <span
-          v-for="tag in recipeStore.allTags.filter(t => !batchTagsSelected.includes(t))"
+          v-for="tag in visibleAllTags.filter(t => !batchTagsSelected.includes(t))"
           :key="tag"
           class="candidate-tag"
           @click="batchTagsSelected.push(tag)"
@@ -171,7 +171,7 @@
           />
           <div class="row-info" @click="editRecipe(r)">
             <span class="row-name">{{ r.name }}</span>
-            <span v-if="getVolumeLabel(r.ingredients)" class="row-volume">{{ getVolumeLabel(r.ingredients) }}</span>
+            <span v-if="getVolumeLabel(r.ingredients, r.volume)" class="row-volume">{{ getVolumeLabel(r.ingredients, r.volume) }}</span>
             <span class="row-tags">
               <span v-for="t in [...(r.tags || [])].sort((a,b)=>a.localeCompare(b,'zh'))" :key="t" class="mini-tag">{{ t }}</span>
             </span>
@@ -271,7 +271,7 @@
         <div class="editor-section">
           <table class="editor-table">
             <thead>
-              <tr><th>精油</th><th>滴数</th><th>单价/滴</th><th>小计</th><th></th></tr>
+              <tr><th>成分</th><th>用量</th><th>单价</th><th>小计</th><th></th></tr>
             </thead>
             <tbody>
               <tr v-for="(ing, i) in formEoIngredients" :key="'eo-'+i">
@@ -296,8 +296,13 @@
                     </div>
                   </div>
                 </td>
-                <td><input v-model.number="ing.drops" type="number" min="0.5" step="0.5" class="editor-drops" /></td>
+                <td>
-                <td class="ing-ppd">{{ ing.oil ? oils.fmtPrice(oils.pricePerDrop(ing.oil)) : '-' }}</td>
+                  <div class="drops-with-unit">
+                    <input v-model.number="ing.drops" type="number" min="0.5" step="0.5" class="editor-drops" />
+                    <span class="unit-hint">{{ oils.unitLabel(ing.oil) }}</span>
+                  </div>
+                </td>
+                <td class="ing-ppd">{{ ing.oil ? oils.fmtPrice(oils.pricePerDrop(ing.oil)) : '-' }}/{{ oils.unitLabel(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="removeEoRow(i)">✕</button></td>
               </tr>
@@ -408,7 +413,7 @@ import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
 import { showConfirm, showPrompt } from '../composables/useDialog'
 import { parseSingleBlock, parseMultiRecipes } from '../composables/useSmartPaste'
-import { matchesPinyinInitials } from '../composables/usePinyinMatch'
+import { matchesPinyinInitials, pinyinMatchScore } from '../composables/usePinyinMatch'
 import RecipeCard from '../components/RecipeCard.vue'
 import TagPicker from '../components/TagPicker.vue'
 import RecipeDetailOverlay from '../components/RecipeDetailOverlay.vue'
@@ -772,17 +777,25 @@ function editRecipe(recipe) {
   const coco = ings.find(i => i.oil === '椰子油')
   if (coco) {
     formCocoRow.value = { ...coco, _search: '椰子油', _open: false }
-    // Guess volume from total drops
     const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
-    const totalDrops = eoDrops + coco.drops
+    // Use stored volume if available, otherwise guess from drops
-    const ml = totalDrops / DROPS_PER_ML
+    if (recipe.volume) {
-    if (ml <= 2) formVolume.value = 'single'
+      formVolume.value = recipe.volume
-    else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5'
+      if (recipe.volume === 'custom') {
-    else if (Math.abs(ml - 10) < 2.5) formVolume.value = '10'
+        const totalDrops = eoDrops + coco.drops
-    else if (Math.abs(ml - 15) < 2.5) formVolume.value = '15'
+        formCustomVolume.value = Math.round(totalDrops / DROPS_PER_ML)
-    else if (Math.abs(ml - 20) < 3) formVolume.value = '20'
+      }
-    else if (Math.abs(ml - 30) < 6) formVolume.value = '30'
+    } else {
-    else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(ml) }
+      const totalDrops = eoDrops + coco.drops
+      const ml = totalDrops / DROPS_PER_ML
+      if (ml <= 2) formVolume.value = 'single'
+      else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5'
+      else if (Math.abs(ml - 10) < 2.5) formVolume.value = '10'
+      else if (Math.abs(ml - 15) < 2.5) formVolume.value = '15'
+      else if (Math.abs(ml - 20) < 3) formVolume.value = '20'
+      else if (Math.abs(ml - 30) < 6) formVolume.value = '30'
+      else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(ml) }
+    }
     // Guess dilution
     if (eoDrops > 0 && coco.drops > 0) {
       const ratio = Math.round(coco.drops / eoDrops)
@@ -853,11 +866,11 @@ function filteredOilNames(search) {
   const results = oils.oilNames.filter(name =>
     name.toLowerCase().includes(q) || matchesPinyinInitials(name, q)
   )
-  // Sort: pinyin prefix match first, then name contains, then rest
+  // Sort: prefix > substring > subsequence > name match only
   results.sort((a, b) => {
-    const aPin = matchesPinyinInitials(a, q) ? 0 : 1
+    const sa = pinyinMatchScore(a, q), sb = pinyinMatchScore(b, q)
-    const bPin = matchesPinyinInitials(b, q) ? 0 : 1
+    const scoreA = sa >= 0 ? sa : 3, scoreB = sb >= 0 ? sb : 3
-    if (aPin !== bPin) return aPin - bPin
+    if (scoreA !== scoreB) return scoreA - scoreB
     return a.localeCompare(b, 'zh')
   })
   return results
@@ -867,7 +880,7 @@ function selectOil(ing, name) {
   // Check for duplicate oil in current recipe
   const existing = formIngredients.value.find(i => i !== ing && i.oil === name)
   if (existing) {
-    ui.showToast(`已有「${name}」，请直接修改滴数`)
+    ui.showToast(`已有「${name}」，请直接修改用量`)
     ing._open = false
     return
   }
@@ -1019,8 +1032,8 @@ async function checkDupName(name, ings, target = 'diary') {
       return false
     }
 
-    const existIngs = dupIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
+    const existIngs = dupIngs.map(i => `${i.oil}${i.drops}${oils.unitLabel(i.oil)}`).join('、')
-    const newIngs = myIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
+    const newIngs = myIngs.map(i => `${i.oil}${i.drops}${oils.unitLabel(i.oil)}`).join('、')
     const ok = await showConfirm(
       `${where}中已有同名配方「${currentName}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n请改名后保存`,
       { okText: '改名', cancelText: '取消' }
@@ -1086,6 +1099,7 @@ async function saveCurrentRecipe() {
       ingredients: mappedIngs,
       note: formNote.value,
       tags: formTags.value,
+      volume: formVolume.value || '',
     }
     try {
       await recipeStore.saveRecipe(payload)
@@ -1308,9 +1322,13 @@ const previewRecipeIndex = ref(null)
 const previewRecipeData = ref(null)
 const showBatchMenu = ref(false)
 const visibleAllTags = computed(() => {
-  const tags = recipeStore.allTags
+  if (auth.canEdit) return recipeStore.allTags
-  if (auth.canEdit) return tags
+  // Viewer: only show tags from their own diary recipes
-  return tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+  const myTags = new Set()
+  for (const d of diaryStore.userDiary) {
+    for (const t of (d.tags || [])) myTags.add(t)
+  }
+  return [...myTags].sort((a, b) => a.localeCompare(b, 'zh'))
 })
 const showBatchTagPicker = ref(false)
 const batchTagsSelected = ref([])
@@ -1446,14 +1464,33 @@ function openRecipeDetail(recipe) {
   if (idx >= 0) previewRecipeIndex.value = idx
 }
 
-function getVolumeLabel(ingredients) {
+function getVolumeLabel(ingredients, volume) {
+  // Priority 1: stored volume
+  if (volume) {
+    if (volume === 'single') return '单次'
+    if (volume === 'custom') return ''
+    if (/^\d+$/.test(volume)) return `${volume}ml`
+    return volume
+  }
+  // Priority 2: calculate from ingredients
   const ings = ingredients || []
   const coco = ings.find(i => i.oil === '椰子油')
-  if (!coco || !coco.drops) return ''
+  if (coco && coco.drops) {
-  const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
+    const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
-  const ml = totalDrops / 18.6
+    const ml = totalDrops / 18.6
-  if (ml <= 2) return '单次'
+    if (ml <= 2) return '单次'
-  return `${Math.round(ml)}ml`
+    return `${Math.round(ml)}ml`
+  }
+  // Priority 3: sum portion products as ml
+  let totalMl = 0
+  let hasProduct = false
+  for (const ing of ings) {
+    if (!oils.isPortionUnit(ing.oil)) continue
+    hasProduct = true
+    totalMl += ing.drops || 0
+  }
+  if (hasProduct && totalMl > 0) return `${Math.round(totalMl)}ml`
+  return ''
 }
 
 function diaryMatchesPublic(d) {
@@ -1559,7 +1596,7 @@ function recipesIdentical(a, b) {
 }
 
 function formatIngsCompare(ings) {
-  return (ings || []).map(i => `${i.oil} ${i.drops}滴`).join('、')
+  return (ings || []).map(i => `${i.oil} ${i.drops}${oils.unitLabel(i.oil)}`).join('、')
 }
 
 async function approveRecipe(recipe) {
@@ -1641,7 +1678,7 @@ async function exportExcel() {
     return list.map(r => ({
       '配方名称': r.name,
       '标签': (r.tags || []).join('/'),
-      '精油成分': r.ingredients.map(i => `${i.oil}${i.drops}滴`).join('、'),
+      '精油成分': r.ingredients.map(i => `${i.oil}${i.drops}${oils.unitLabel(i.oil)}`).join('、'),
       '成本': oils.fmtPrice(oils.calcCost(r.ingredients)),
       '备注': r.note || '',
     }))
@@ -2075,8 +2112,10 @@ watch(() => recipeStore.recipes, () => {
 .editor-table { width: 100%; border-collapse: collapse; font-size: 13px; margin-bottom: 8px; }
 .editor-table th { text-align: left; padding: 6px 4px; color: #999; font-weight: 500; font-size: 12px; border-bottom: 1px solid #eee; }
 .editor-table td { padding: 6px 4px; border-bottom: 1px solid #f5f5f5; }
-.editor-drops { width: 65px; padding: 6px 8px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; text-align: center; outline: none; font-family: inherit; }
+.editor-drops { width: 50px; padding: 6px 4px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; text-align: center; outline: none; font-family: inherit; }
 .editor-drops:focus { border-color: #7ec6a4; }
+.drops-with-unit { display: flex; align-items: center; gap: 2px; }
+.unit-hint { font-size: 11px; color: #b0aab5; white-space: nowrap; }
 .editor-input { padding: 8px 10px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; outline: none; font-family: inherit; width: 100%; box-sizing: border-box; }
 .editor-input:focus { border-color: #7ec6a4; }
 .editor-textarea { width: 100%; padding: 8px 10px; border: 1.5px solid #d4cfc7; border-radius: 8px; font-size: 13px; font-family: inherit; outline: none; resize: vertical; box-sizing: border-box; }

frontend/src/views/UserManagement.vue

@@ -91,18 +91,18 @@
         </div>
         <div class="user-actions">
           <select
+            v-if="u.role !== 'admin'"
             :value="u.role"
             class="role-select"
             @change="changeRole(u, $event.target.value)"
-            :disabled="u.role === 'admin'"
           >
             <option value="viewer">查看者</option>
             <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-if="u.business_verified" class="btn-sm btn-outline" @click="revokeBusiness(u)" title="撤销商业认证">💼</button>
-          <button v-else class="btn-sm btn-outline" @click="revokeBusiness(u)" title="撤销商业认证" style="opacity:0.5">💼✕</button>
+          <button v-else class="btn-sm btn-outline" @click="grantBusiness(u)" title="开通商业认证" style="opacity:0.3">💼</button>
-          <button class="btn-sm btn-delete" @click="removeUser(u)" title="删除用户">🗑️</button>
+          <button class="btn-sm btn-delete" @click="removeUser(u)" :disabled="u.role === 'admin'" title="删除用户">🗑️</button>
         </div>
       </div>
       <div v-if="filteredUsers.length === 0" class="empty-hint">未找到用户</div>
@@ -162,10 +162,10 @@ function formatDate(d) {
 }
 
 const roles = [
-  { value: 'admin', label: '管理员' },
   { value: 'senior_editor', label: '高级编辑' },
   { value: 'editor', label: '编辑' },
   { value: 'viewer', label: '查看者' },
+  { value: 'business', label: '企业用户' },
 ]
 
 const filteredUsers = computed(() => {
@@ -178,7 +178,11 @@ const filteredUsers = computed(() => {
     )
   }
   if (filterRole.value) {
-    list = list.filter(u => u.role === filterRole.value)
+    if (filterRole.value === 'business') {
+      list = list.filter(u => u.business_verified)
+    } else {
+      list = list.filter(u => u.role === filterRole.value)
+    }
   }
   return list
 })