fix: 去重只检查目标库，跳过后继续处理下一条

- checkDupName 接受 target 参数，只查目标库（公共/个人）
- 提取 skipCurrentParsed/dedupOrSkip 避免代码重复
- 共享到公共库检查公共库，保存到个人检查个人

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

.gitea/workflows/test.yml

@@ -12,6 +12,7 @@ jobs:
   e2e-test:
     runs-on: test
     needs: unit-test
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
 
@@ -23,26 +24,43 @@ jobs:
 
       - name: E2E tests
         run: |
+          # Dynamic ports to avoid conflicts
+          BE_PORT=$(shuf -i 9000-9999 -n 1)
+          FE_PORT=$(shuf -i 4000-4999 -n 1)
+          DB_FILE="/tmp/ci_oil_test_${BE_PORT}.db"
+          echo "Using backend=$BE_PORT frontend=$FE_PORT db=$DB_FILE"
+
           # Start backend
-          DB_PATH=/tmp/ci_oil_test.db FRONTEND_DIR=/dev/null \
+          DB_PATH="$DB_FILE" FRONTEND_DIR=/dev/null \
-            /tmp/ci-venv/bin/uvicorn backend.main:app --port 8000 &
+            /tmp/ci-venv/bin/uvicorn backend.main:app --port $BE_PORT &
+          BE_PID=$!
 
-          # Start frontend (in subshell to not change cwd)
+          # Start frontend with proxy to dynamic backend port
-          (cd frontend && npx vite --port 5173) &
+          (cd frontend && VITE_API_PORT=$BE_PORT npx vite --port $FE_PORT) &
+          FE_PID=$!
 
-          # Wait for both servers
+          # Wait for both servers (max 30s, fail fast)
+          READY=0
           for i in $(seq 1 30); do
-            if curl -sf http://localhost:8000/api/version > /dev/null 2>&1 && \
+            if curl -sf http://localhost:$BE_PORT/api/oils > /dev/null 2>&1 && \
-               curl -sf http://localhost:5173/ > /dev/null 2>&1; then
+               curl -sf http://localhost:$FE_PORT/ > /dev/null 2>&1; then
-              echo "Both servers ready"
+              echo "Both servers ready in ${i}s"
+              READY=1
               break
             fi
             sleep 1
           done
 
-          # Run core cypress specs (proven stable)
+          if [ "$READY" = "0" ]; then
+            echo "ERROR: Servers failed to start within 30s"
+            kill $BE_PID $FE_PID 2>/dev/null
+            rm -f "$DB_FILE"
+            exit 1
+          fi
+
+          # Run core cypress specs with hard 3-minute timeout
           cd frontend
-          npx cypress run --spec "\
+          timeout 180 npx cypress run --spec "\
           cypress/e2e/recipe-detail.cy.js,\
           cypress/e2e/oil-reference.cy.js,\
           cypress/e2e/oil-data-integrity.cy.js,\
@@ -50,13 +68,17 @@ jobs:
           cypress/e2e/category-modules.cy.js,\
           cypress/e2e/notification-flow.cy.js,\
           cypress/e2e/registration-flow.cy.js\
-          " --config video=false
+          " --config "video=false,defaultCommandTimeout=5000,pageLoadTimeout=10000,requestTimeout=5000,responseTimeout=10000,baseUrl=http://localhost:$FE_PORT"
           EXIT_CODE=$?
 
           # Cleanup
-          pkill -f "uvicorn backend" || true
+          kill $BE_PID $FE_PID 2>/dev/null
-          pkill -f "node.*vite" || true
+          pkill -f "Cypress" 2>/dev/null || true
-          rm -f /tmp/ci_oil_test.db
+          rm -f "$DB_FILE"
+          if [ $EXIT_CODE -eq 124 ]; then
+            echo "ERROR: Cypress timed out after 3 minutes"
+            exit 1
+          fi
           exit $EXIT_CODE
 
   build-check:

backend/main.py

@@ -355,6 +355,8 @@ def register(body: dict):
             "INSERT INTO users (username, token, role, display_name, password) VALUES (?, ?, ?, ?, ?)",
             (username, token, "viewer", display_name or username, hash_password(password))
         )
+        uid = conn.execute("SELECT id FROM users WHERE username = ?", (username,)).fetchone()
+        log_audit(conn, uid["id"] if uid else None, "register", "user", username, display_name or username, None)
         conn.commit()
     except Exception:
         conn.close()
@@ -798,7 +800,9 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
     for tag in recipe.tags:
         c.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (tag,))
         c.execute("INSERT OR IGNORE INTO recipe_tags (recipe_id, tag_name) VALUES (?, ?)", (rid, tag))
-    log_audit(conn, user["id"], "create_recipe", "recipe", rid, recipe.name)
+    # Only log for admin/senior_editor direct adds (share); others wait for adopt
+    if user["role"] in ("admin", "senior_editor"):
+        log_audit(conn, user["id"], "share_recipe", "recipe", rid, recipe.name)
     who = user.get("display_name") or user["username"]
     if user["role"] == "senior_editor":
         # Senior editor adds directly — just inform admin
@@ -866,7 +870,17 @@ def update_recipe(recipe_id: int, update: RecipeUpdate, user=Depends(get_current
                 (recipe_id, tag),
             )
     c.execute("UPDATE recipes SET updated_by = ?, version = COALESCE(version, 1) + 1 WHERE id = ?", (user["id"], recipe_id))
-    log_audit(conn, user["id"], "update_recipe", "recipe", recipe_id, update.name)
+    # Get recipe name for log
+    rname = c.execute("SELECT name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    changed = []
+    if update.name is not None: changed.append("名称")
+    if update.ingredients is not None: changed.append("成分")
+    if update.tags is not None: changed.append("标签")
+    if update.note is not None: changed.append("备注")
+    if update.en_name is not None: changed.append("英文名")
+    log_audit(conn, user["id"], "update_recipe", "recipe", recipe_id,
+              rname["name"] if rname else update.name,
+              json.dumps({"changed": "、".join(changed)}, ensure_ascii=False) if changed else None)
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1028,7 +1042,7 @@ def create_tag(body: dict, user=Depends(require_role("admin", "senior_editor", "
         raise HTTPException(400, "Tag name required")
     conn = get_db()
     conn.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (name,))
-    # Don't log tag creation (too frequent/noisy)
+    log_audit(conn, user["id"], "create_tag", "tag", name, name, None)
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1242,17 +1256,32 @@ def list_projects():
     conn = get_db()
     rows = conn.execute("SELECT * FROM profit_projects ORDER BY id DESC").fetchall()
     conn.close()
-    return [{ **dict(r), "ingredients": json.loads(r["ingredients"]) } for r in rows]
+    result = []
+    for r in rows:
+        d = dict(r)
+        d["ingredients"] = json.loads(r["ingredients"])
+        try:
+            extra = json.loads(r["pricing"]) if r["pricing"] else {}
+            if isinstance(extra, dict):
+                d.update(extra)
+        except (json.JSONDecodeError, TypeError):
+            pass
+        result.append(d)
+    return result
 
 
 @app.post("/api/projects", status_code=201)
 def create_project(body: dict, user=Depends(require_role("admin", "senior_editor"))):
     conn = get_db()
     c = conn.cursor()
+    extra = {}
+    for k in ("selling_price", "packaging_cost", "labor_cost", "other_cost", "quantity"):
+        if k in body:
+            extra[k] = body[k]
     c.execute(
         "INSERT INTO profit_projects (name, ingredients, pricing, note, created_by) VALUES (?, ?, ?, ?, ?)",
         (body["name"], json.dumps(body.get("ingredients", []), ensure_ascii=False),
-         body.get("pricing", 0), body.get("note", ""), user["id"])
+         json.dumps(extra) if extra else '{}', body.get("note", ""), user["id"])
     )
     conn.commit()
     pid = c.lastrowid
@@ -1272,6 +1301,14 @@ def update_project(pid: int, body: dict, user=Depends(require_role("admin", "sen
         conn.execute("UPDATE profit_projects SET pricing = ? WHERE id = ?", (body["pricing"], pid))
     if "note" in body:
         conn.execute("UPDATE profit_projects SET note = ? WHERE id = ?", (body["note"], pid))
+    # Store extra cost fields in pricing as JSON
+    extra = {}
+    for k in ("selling_price", "packaging_cost", "labor_cost", "other_cost", "quantity"):
+        if k in body:
+            extra[k] = body[k]
+    if extra:
+        conn.execute("UPDATE profit_projects SET pricing = ? WHERE id = ?",
+                     (json.dumps(extra, ensure_ascii=False), pid))
     conn.commit()
     conn.close()
     return {"ok": True}

frontend/src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="isPreview" style="background:#e65100;color:white;text-align:center;padding:6px 16px;font-size:13px;font-weight:600;letter-spacing:0.5px;position:sticky;top:0;z-index:100">
-    ⚠️ 预览环境 · PR #{{ prId }} · 数据为生产副本，修改不影响正式环境
+    ⚠️ 预览环境 · PR #{{ prId }} · 数据为生产副本，修改不影响正式环境 · {{ buildInfo }}
   </div>
   <div class="app-header">
     <div class="header-inner">
@@ -116,6 +116,7 @@ const hostname = window.location.hostname
 const prMatch = hostname.match(/^pr-(\d+)\./)
 const isPreview = !!prMatch
 const prId = prMatch ? prMatch[1] : ''
+const buildInfo = __BUILD_TIME__ || ''
 
 function handleTabClick(tab) {
   if (tab.require === 'login' && !auth.isLoggedIn) {

frontend/src/__tests__/inventoryCommercial.test.js

@@ -0,0 +1,146 @@
+import { describe, it, expect } from 'vitest'
+
+// ---------------------------------------------------------------------------
+// Kit definitions
+// ---------------------------------------------------------------------------
+describe('Kit definitions', () => {
+  const KITS = {
+    family: ['乳香', '茶树', '薰衣草', '柠檬', '椒样薄荷', '保卫', '牛至', '乐活', '顺畅呼吸', '舒缓'],
+    home3988: ['乳香', '野橘', '柠檬', '薰衣草', '椒样薄荷', '冬青', '茶树', '生姜', '柠檬草', '西班牙牛至',
+      '西洋蓍草石榴籽', '乐活', '保卫', '新瑞活力', '舒缓', '安定情绪', '安宁神气', '顺畅呼吸', '柑橘清新', '芳香调理', '元气焕能'],
+    aroma: ['薰衣草', '舒缓', '安定情绪', '芳香调理', '野橘', '椒样薄荷', '保卫', '茶树'],
+  }
+
+  it('family kit has 10 oils', () => {
+    expect(KITS.family).toHaveLength(10)
+  })
+
+  it('home3988 kit has 21 oils', () => {
+    expect(KITS.home3988).toHaveLength(21)
+  })
+
+  it('aroma kit has 8 oils', () => {
+    expect(KITS.aroma).toHaveLength(8)
+    expect(KITS.aroma).toContain('薰衣草')
+    expect(KITS.aroma).toContain('芳香调理')
+    expect(KITS.aroma).toContain('茶树')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Recipe matching (exclude coconut oil)
+// ---------------------------------------------------------------------------
+describe('Recipe matching', () => {
+  function matchRecipe(recipe, ownedSet) {
+    const needed = recipe.ingredients.filter(i => i.oil !== '椰子油').map(i => i.oil)
+    if (needed.length === 0) return false
+    const coverage = needed.filter(o => ownedSet.has(o)).length
+    return coverage >= 1
+  }
+
+  it('matches recipe when user has at least one oil', () => {
+    const recipe = { ingredients: [{ oil: '乳香', drops: 3 }, { oil: '茶树', drops: 2 }, { oil: '椰子油', drops: 100 }] }
+    expect(matchRecipe(recipe, new Set(['乳香']))).toBe(true)
+  })
+
+  it('does not match when user has none of the oils', () => {
+    const recipe = { ingredients: [{ oil: '乳香', drops: 3 }, { oil: '茶树', drops: 2 }] }
+    expect(matchRecipe(recipe, new Set(['薰衣草']))).toBe(false)
+  })
+
+  it('excludes coconut oil from matching', () => {
+    const recipe = { ingredients: [{ oil: '椰子油', drops: 100 }] }
+    expect(matchRecipe(recipe, new Set(['椰子油']))).toBe(false)
+  })
+
+  it('matches when user has all oils', () => {
+    const recipe = { ingredients: [{ oil: '乳香', drops: 3 }, { oil: '茶树', drops: 2 }] }
+    expect(matchRecipe(recipe, new Set(['乳香', '茶树']))).toBe(true)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Consumption analysis
+// ---------------------------------------------------------------------------
+describe('Consumption analysis', () => {
+  function calcConsumption(ingredients, oilsMeta) {
+    return ingredients
+      .filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
+      .map(i => {
+        const bottleDrops = oilsMeta[i.oil]?.dropCount || 0
+        const sessions = bottleDrops > 0 ? Math.floor(bottleDrops / i.drops) : 0
+        return { oil: i.oil, drops: i.drops, bottleDrops, sessions }
+      })
+  }
+
+  function findLimit(data) {
+    const valid = data.filter(c => c.sessions > 0)
+    if (!valid.length) return { oil: '', sessions: 0, allSame: true }
+    const min = Math.min(...valid.map(c => c.sessions))
+    const allSame = valid.every(c => c.sessions === valid[0].sessions)
+    const limiting = valid.find(c => c.sessions === min)
+    return { oil: limiting.oil, sessions: min, allSame }
+  }
+
+  const meta = {
+    '芳香调理': { dropCount: 280 },
+    '薰衣草': { dropCount: 280 },
+    '茶树': { dropCount: 280 },
+  }
+
+  it('calculates sessions correctly', () => {
+    const data = calcConsumption([{ oil: '芳香调理', drops: 10 }], meta)
+    expect(data[0].sessions).toBe(28)
+  })
+
+  it('finds limiting oil', () => {
+    const data = calcConsumption([
+      { oil: '芳香调理', drops: 10 },
+      { oil: '薰衣草', drops: 20 },
+    ], meta)
+    const limit = findLimit(data)
+    expect(limit.oil).toBe('薰衣草')
+    expect(limit.sessions).toBe(14)
+    expect(limit.allSame).toBe(false)
+  })
+
+  it('detects all same sessions', () => {
+    const data = calcConsumption([
+      { oil: '芳香调理', drops: 10 },
+      { oil: '茶树', drops: 10 },
+    ], meta)
+    const limit = findLimit(data)
+    expect(limit.allSame).toBe(true)
+    expect(limit.sessions).toBe(28)
+  })
+
+  it('excludes coconut oil', () => {
+    const data = calcConsumption([
+      { oil: '芳香调理', drops: 10 },
+      { oil: '椰子油', drops: 200 },
+    ], meta)
+    expect(data).toHaveLength(1)
+    expect(data[0].oil).toBe('芳香调理')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Project pricing persistence
+// ---------------------------------------------------------------------------
+describe('Project pricing JSON', () => {
+  it('serializes extra fields to JSON', () => {
+    const extra = { selling_price: 299, packaging_cost: 5, labor_cost: 30, other_cost: 10, quantity: 1 }
+    const json = JSON.stringify(extra)
+    const parsed = JSON.parse(json)
+    expect(parsed.selling_price).toBe(299)
+    expect(parsed.quantity).toBe(1)
+  })
+
+  it('merges extra fields back into project', () => {
+    const project = { id: 1, name: 'test', ingredients: [], pricing: '{"selling_price":299,"quantity":1}' }
+    const extra = JSON.parse(project.pricing)
+    const merged = { ...project, ...extra }
+    expect(merged.selling_price).toBe(299)
+    expect(merged.quantity).toBe(1)
+  })
+})

frontend/src/__tests__/newFeatures.test.js

@@ -0,0 +1,135 @@
+import { describe, it, expect } from 'vitest'
+import { parseMultiRecipes } from '../composables/useSmartPaste'
+import { getPinyinInitials, matchesPinyinInitials } from '../composables/usePinyinMatch'
+
+const oilNames = ['薰衣草','茶树','柠檬','芳香调理','永久花','椒样薄荷','乳香','檀香','天竺葵','佛手柑','生姜']
+
+// ---------------------------------------------------------------------------
+// parseMultiRecipes
+// ---------------------------------------------------------------------------
+describe('parseMultiRecipes', () => {
+  it('parses single recipe with name', () => {
+    const results = parseMultiRecipes('舒缓放松，薰衣草3，茶树2', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('舒缓放松')
+    expect(results[0].ingredients).toHaveLength(2)
+  })
+
+  it('parses recipe with space-separated parts', () => {
+    const results = parseMultiRecipes('长高 芳香调理8 永久花10', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('长高')
+    expect(results[0].ingredients.length).toBeGreaterThanOrEqual(2)
+  })
+
+  it('parses recipe with concatenated name+oil', () => {
+    const results = parseMultiRecipes('长高芳香调理8永久花10', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('长高')
+  })
+
+  it('parses multiple recipes', () => {
+    const results = parseMultiRecipes('舒缓放松，薰衣草3，茶树2，提神醒脑，柠檬5', oilNames)
+    expect(results).toHaveLength(2)
+    expect(results[0].name).toBe('舒缓放松')
+    expect(results[1].name).toBe('提神醒脑')
+  })
+
+  it('handles recipe with no name', () => {
+    const results = parseMultiRecipes('薰衣草3，茶树2', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].ingredients).toHaveLength(2)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Pinyin matching
+// ---------------------------------------------------------------------------
+describe('getPinyinInitials', () => {
+  it('returns correct initials for common oils', () => {
+    expect(getPinyinInitials('薰衣草')).toBe('xyc')
+    expect(getPinyinInitials('茶树')).toBe('cs')
+    expect(getPinyinInitials('生姜')).toBe('sj')
+  })
+
+  it('handles 忍冬花', () => {
+    expect(getPinyinInitials('忍冬花呵护')).toBe('rdhhh')
+  })
+})
+
+describe('matchesPinyinInitials', () => {
+  it('matches prefix only', () => {
+    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', () => {
+    expect(matchesPinyinInitials('茶树', 's')).toBe(false)
+  })
+
+  it('matches 忍冬花 with r', () => {
+    expect(matchesPinyinInitials('忍冬花呵护', 'r')).toBe(true)
+    expect(matchesPinyinInitials('忍冬花呵护', 'rdh')).toBe(true)
+    expect(matchesPinyinInitials('忍冬花呵护', 'l')).toBe(false)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// EDITOR_ONLY_TAGS
+// ---------------------------------------------------------------------------
+describe('EDITOR_ONLY_TAGS', () => {
+  it('exports EDITOR_ONLY_TAGS from recipes store', async () => {
+    const { EDITOR_ONLY_TAGS } = await import('../stores/recipes')
+    expect(EDITOR_ONLY_TAGS).toContain('已审核')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// English search
+// ---------------------------------------------------------------------------
+describe('English search matching', () => {
+  const { oilEn } = require('../composables/useOilTranslation')
+
+  it('oilEn returns English name for known oils', () => {
+    expect(oilEn('薰衣草')).toBe('Lavender')
+    expect(oilEn('茶树')).toBe('Tea Tree')
+    expect(oilEn('乳香')).toBe('Frankincense')
+  })
+
+  it('oilEn returns empty for unknown oils', () => {
+    expect(oilEn('不存在的油')).toBeFalsy()
+  })
+
+  it('English query detection', () => {
+    const isEn = (q) => /^[a-zA-Z\s]+$/.test(q)
+    expect(isEn('lavender')).toBe(true)
+    expect(isEn('Tea Tree')).toBe(true)
+    expect(isEn('薰衣草')).toBe(false)
+    expect(isEn('lav3')).toBe(false)
+  })
+
+  it('English matches oil name in recipe', () => {
+    const recipe = {
+      name: '助眠配方',
+      en_name: 'Sleep Aid Blend',
+      ingredients: [{ oil: '薰衣草', drops: 3 }],
+      tags: []
+    }
+    const q = 'lavender'
+    const isEn = /^[a-zA-Z\s]+$/.test(q)
+    const enNameMatch = isEn && (recipe.en_name || '').toLowerCase().includes(q)
+    const oilEnMatch = isEn && recipe.ingredients.some(ing => (oilEn(ing.oil) || '').toLowerCase().includes(q))
+    expect(oilEnMatch).toBe(true)
+    expect(enNameMatch).toBe(false)
+  })
+
+  it('English matches recipe en_name', () => {
+    const recipe = { name: '助眠', en_name: 'Sleep Aid Blend', ingredients: [], tags: [] }
+    const q = 'sleep'
+    const isEn = /^[a-zA-Z\s]+$/.test(q)
+    const enNameMatch = isEn && (recipe.en_name || '').toLowerCase().includes(q)
+    expect(enNameMatch).toBe(true)
+  })
+})

frontend/src/__tests__/polishFeatures.test.js

@@ -0,0 +1,126 @@
+import { describe, it, expect } from 'vitest'
+import { EDITOR_ONLY_TAGS } from '../stores/recipes'
+
+// ---------------------------------------------------------------------------
+// Tag sorting
+// ---------------------------------------------------------------------------
+describe('Tag sorting', () => {
+  it('sorts tags alphabetically with localeCompare zh', () => {
+    const tags = ['香水', '呼吸', '消化', '美容']
+    const sorted = [...tags].sort((a, b) => a.localeCompare(b, 'zh'))
+    expect(sorted[0]).toBe('呼吸')
+    // All sorted
+    for (let i = 1; i < sorted.length; i++) {
+      expect(sorted[i - 1].localeCompare(sorted[i], 'zh')).toBeLessThanOrEqual(0)
+    }
+  })
+
+  it('EDITOR_ONLY_TAGS filters correctly', () => {
+    const allTags = ['呼吸', '已审核', '消化', '香水']
+    const visible = allTags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+    expect(visible).not.toContain('已审核')
+    expect(visible).toContain('呼吸')
+    expect(visible).toHaveLength(3)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Recipe save data format
+// ---------------------------------------------------------------------------
+describe('Recipe data format', () => {
+  it('oil_name format overwrites oil format when spread', () => {
+    // This test documents the bug that was fixed
+    const localRecipe = {
+      ingredients: [{ oil: '薰衣草', drops: 3 }],
+    }
+    const payload = {
+      ingredients: [{ oil_name: '薰衣草', drops: 3 }],
+    }
+    const merged = { ...localRecipe, ...payload }
+    // After merge, ingredients have oil_name not oil — this was the bug
+    expect(merged.ingredients[0]).toHaveProperty('oil_name')
+    expect(merged.ingredients[0]).not.toHaveProperty('oil')
+  })
+
+  it('loadRecipes mapping converts oil_name to oil', () => {
+    // Simulate what loadRecipes does
+    const apiData = [
+      { id: 1, name: 'test', ingredients: [{ oil_name: '薰衣草', drops: 3 }], tags: [] }
+    ]
+    const mapped = apiData.map(r => ({
+      ...r,
+      ingredients: r.ingredients.map(ing => ({
+        oil: ing.oil_name ?? ing.oil,
+        drops: ing.drops,
+      }))
+    }))
+    expect(mapped[0].ingredients[0].oil).toBe('薰衣草')
+    expect(mapped[0].ingredients[0]).not.toHaveProperty('oil_name')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Volume detection from ingredients
+// ---------------------------------------------------------------------------
+describe('Volume detection', () => {
+  const DROPS_PER_ML = 18.6
+
+  function guessVolume(eoDrops, cocoDrops) {
+    const totalDrops = eoDrops + cocoDrops
+    const ml = totalDrops / DROPS_PER_ML
+    if (ml <= 2) return 'single'
+    if (Math.abs(ml - 5) < 1.5) return '5'
+    if (Math.abs(ml - 10) < 2.5) return '10'
+    if (Math.abs(ml - 15) < 2.5) return '15'
+    if (Math.abs(ml - 20) < 3) return '20'
+    if (Math.abs(ml - 30) < 6) return '30'
+    return 'custom'
+  }
+
+  it('detects single use (small amounts)', () => {
+    expect(guessVolume(5, 10)).toBe('single')
+  })
+
+  it('detects 5ml', () => {
+    expect(guessVolume(15, Math.round(5 * DROPS_PER_ML) - 15)).toBe('5')
+  })
+
+  it('detects 10ml', () => {
+    expect(guessVolume(20, Math.round(10 * DROPS_PER_ML) - 20)).toBe('10')
+  })
+
+  it('detects 30ml', () => {
+    expect(guessVolume(50, Math.round(30 * DROPS_PER_ML) - 50)).toBe('30')
+  })
+
+  it('no coconut returns no volume', () => {
+    // When cocoDrops is 0, function still returns based on total
+    // But in real code, no coconut → formVolume = ''
+    expect(guessVolume(10, 0)).toBe('single')
+  })
+
+  it('detects custom for large volumes', () => {
+    expect(guessVolume(100, 1000)).toBe('custom')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Dilution ratio calculation
+// ---------------------------------------------------------------------------
+describe('Dilution ratio', () => {
+  it('calculates ratio correctly', () => {
+    expect(Math.round(60 / 10)).toBe(6) // 1:6
+    expect(Math.round(30 / 10)).toBe(3) // 1:3
+    expect(Math.round(100 / 10)).toBe(10) // 1:10
+  })
+
+  it('snaps to nearest option', () => {
+    const options = [3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20]
+    const snap = (ratio) => options.reduce((a, b) => Math.abs(b - ratio) < Math.abs(a - ratio) ? b : a)
+    expect(snap(6)).toBe(6)
+    expect([10, 12]).toContain(snap(11)) // equidistant
+    expect(snap(13)).toBe(12)
+    expect([12, 15]).toContain(snap(14))
+    expect(snap(18)).toBe(20)
+  })
+})

frontend/src/components/RecipeCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="recipe-card" @click="$emit('click', index)">
-    <div class="recipe-card-name">{{ recipe.name }}</div>
+    <div class="recipe-card-name">{{ recipe.name }} <span v-if="volumeLabel" class="recipe-card-volume">{{ volumeLabel }}</span></div>
     <div v-if="visibleTags.length" class="recipe-card-tags">
       <span v-for="tag in visibleTags" :key="tag" class="tag" :class="{ 'tag-reviewed': tag === '已审核' }">{{ tag }}</span>
     </div>
@@ -20,11 +20,9 @@
 <script setup>
 import { computed } from 'vue'
 import { useOilsStore } from '../stores/oils'
-import { useRecipesStore } from '../stores/recipes'
+import { useRecipesStore, EDITOR_ONLY_TAGS } from '../stores/recipes'
 import { useAuthStore } from '../stores/auth'
 
-const EDITOR_ONLY_TAGS = ['已审核']
-
 const props = defineProps({
   recipe: { type: Object, required: true },
   index: { type: Number, required: true },
@@ -38,15 +36,26 @@ const auth = useAuthStore()
 
 const visibleTags = computed(() => {
   if (!props.recipe.tags) return []
-  if (auth.canEdit) return props.recipe.tags
+  if (!auth.canEdit) return []
-  return props.recipe.tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+  const tags = [...props.recipe.tags]
+  return tags.sort((a, b) => a.localeCompare(b, 'zh'))
 })
 
 const oilNames = computed(() =>
-  props.recipe.ingredients.map(i => i.oil).join('、')
+  [...props.recipe.ingredients].sort((a, b) => a.oil.localeCompare(b.oil, 'zh')).map(i => i.oil).join('、')
 )
 const priceInfo = computed(() => oilsStore.fmtCostWithRetail(props.recipe.ingredients))
 const isFav = computed(() => recipesStore.isFavorite(props.recipe))
+
+const volumeLabel = computed(() => {
+  const ings = props.recipe.ingredients || []
+  const coco = ings.find(i => i.oil === '椰子油')
+  if (!coco || !coco.drops) return ''
+  const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
+  const ml = totalDrops / 18.6
+  if (ml <= 2) return '单次'
+  return `${Math.round(ml)}ml`
+})
 </script>
 
 <style scoped>
@@ -100,6 +109,13 @@ const isFav = computed(() => recipesStore.isFavorite(props.recipe))
   line-height: 1.7;
 }
 
+.recipe-card-volume {
+  font-size: 10px;
+  color: #b0aab5;
+  font-weight: 400;
+  margin-left: 4px;
+}
+
 .recipe-card-bottom {
   display: flex;
   justify-content: space-between;

frontend/src/composables/useSmartPaste.js

@@ -86,7 +86,8 @@ export function findOil(input, oilNames) {
     }
   }
 
-  // 5. Edit distance fuzzy match
+  // 5. Edit distance fuzzy match (only for 3+ char inputs to avoid false positives)
+  if (trimmed.length < 3) return null
   let bestMatch = null
   let bestDist = Infinity
   for (const name of oilNames) {
@@ -144,19 +145,25 @@ export function greedyMatchOils(text, oilNames) {
 /**
  * Parse text chunk into [{oil, drops}] pairs.
  * Handles formats like "芳香调理8永久花10" or "薰衣草 3滴 茶树 2ml"
+ * Also handles oil names without numbers, defaulting to 1 drop.
  */
 export function parseOilChunk(text, oilNames) {
   const results = []
+  // Match: name + optional number+unit
   const regex = /([^\d]+?)(\d+\.?\d*)\s*(ml|毫升|ML|mL|滴)?/g
   let match
+  let lastIndex = 0
   while ((match = regex.exec(text)) !== null) {
+    lastIndex = regex.lastIndex
     const namePart = match[1].trim()
     let amount = parseFloat(match[2])
     const unit = match[3] || ''
 
+    const isMl = unit && (unit.toLowerCase() === 'ml' || unit === '毫升')
+    let drops = amount
     // Convert ml to drops
-    if (unit && (unit.toLowerCase() === 'ml' || unit === '毫升')) {
+    if (isMl) {
-      amount = Math.round(amount * 20)
+      drops = Math.round(amount * 20)
     }
 
     // Try greedy match on the name part
@@ -164,22 +171,58 @@ export function parseOilChunk(text, oilNames) {
     if (matched.length > 0) {
       // Last matched oil gets the drops
       for (let i = 0; i < matched.length - 1; i++) {
-        results.push({ oil: matched[i], drops: 0 })
+        results.push({ oil: matched[i], drops: 1 })
       }
-      results.push({ oil: matched[matched.length - 1], drops: amount })
+      const item = { oil: matched[matched.length - 1], drops }
+      if (isMl) { item._ml = amount }
+      results.push(item)
     } else {
       // Try findOil as fallback
       const found = findOil(namePart, oilNames)
       if (found) {
-        results.push({ oil: found, drops: amount })
+        const item = { oil: found, drops }
+        if (isMl) { item._ml = amount }
+        results.push(item)
       } else if (namePart) {
-        results.push({ oil: namePart, drops: amount, notFound: true })
+        results.push({ oil: namePart, drops, notFound: true })
       }
     }
   }
+
+  if (lastIndex === 0) {
+    // Regex matched nothing — try the whole text as oil names without numbers
+    _parseNamesOnly(text.trim(), oilNames, results)
+  } else {
+    // Handle trailing text after last number match
+    const trailing = text.substring(lastIndex).trim()
+    if (trailing) {
+      _parseNamesOnly(trailing, oilNames, results)
+    }
+  }
+
   return results
 }
 
+/** Parse text that contains only oil names (no numbers), default 1 drop each. */
+function _parseNamesOnly(text, oilNames, results) {
+  // Try greedy match first
+  const matched = greedyMatchOils(text, oilNames)
+  if (matched.length > 0) {
+    for (const oil of matched) {
+      results.push({ oil, drops: 1 })
+    }
+    return
+  }
+  // Fallback: try splitting by common delimiters and fuzzy match
+  const parts = text.split(/[\s+、,，]+/).filter(s => s)
+  for (const part of parts) {
+    const found = findOil(part, oilNames)
+    if (found) {
+      results.push({ oil: found, drops: 1 })
+    }
+  }
+}
+
 /**
  * Split multi-recipe input by blank lines or semicolons.
  * Detects recipe boundaries (non-oil text after seeing oils = new recipe).
@@ -255,7 +298,7 @@ export function parseSingleBlock(raw, oilNames) {
   }
 
   return {
-    name: name || '未命名配方',
+    name: name || '',
     ingredients: deduped,
     notFound
   }
@@ -266,8 +309,23 @@ export function parseSingleBlock(raw, oilNames) {
  * appears after some oils have been found, it starts a new recipe.
  */
 export function parseMultiRecipes(raw, oilNames) {
+  // Split by blank lines into major blocks
+  const blankLineSplit = raw.split(/\n\s*\n/).map(s => s.trim()).filter(s => s)
+  if (blankLineSplit.length > 1) {
+    return blankLineSplit.flatMap(block => parseMultiRecipes(block, oilNames))
+  }
+  // Split by semicolons only if both sides contain oil names
+  const semiParts = raw.split(/[;；]/).map(s => s.trim()).filter(s => s)
+  if (semiParts.length > 1) {
+    const hasOilInPart = p => oilNames.some(oil => p.includes(oil)) ||
+      Object.keys(OIL_HOMOPHONES).some(a => p.includes(a))
+    if (semiParts.every(hasOilInPart)) {
+      return semiParts.flatMap(block => parseMultiRecipes(block, oilNames))
+    }
+  }
+
   // First split by lines/commas, then within each part also try space splitting
-  const roughParts = raw.split(/[,，、\n\r]+/).map(s => s.trim()).filter(s => s)
+  const roughParts = raw.split(/[,，、;；\n\r]+/).map(s => s.trim()).filter(s => s)
   const parts = []
   for (const rp of roughParts) {
     // If the part has spaces and contains mixed name+oil, split by spaces too
@@ -307,19 +365,23 @@ export function parseMultiRecipes(raw, oilNames) {
 
   for (const part of parts) {
     const hasNumber = /\d/.test(part)
+    const textPart = part.replace(/\d+\.?\d*/g, '').trim()
     const hasOil = oilNames.some(oil => part.includes(oil)) ||
                    Object.keys(OIL_HOMOPHONES).some(alias => part.includes(alias))
     // Also check fuzzy: 3+ char parts
-    const fuzzyOil = !hasOil && part.replace(/\d+\.?\d*/g, '').length >= 2 &&
+    const fuzzyOil = !hasOil && textPart.length >= 2 &&
-                     findOil(part.replace(/\d+\.?\d*/g, '').trim(), oilNames)
+                     findOil(textPart, oilNames)
+    // First part only: has number but text is not any oil → likely a name like "美容1"
+    const isFirstNameWithNumber = !current.foundOil && current.nameParts.length === 0 &&
+      current.ingredientParts.length === 0 && hasNumber && !hasOil && !fuzzyOil && textPart.length >= 2
 
     if (current.foundOil && !hasOil && !fuzzyOil && !hasNumber && part.length >= 2) {
       // New recipe starts
       recipes.push(current)
       current = { nameParts: [], ingredientParts: [], foundOil: false }
       current.nameParts.push(part)
-    } else if (!current.foundOil && !hasOil && !fuzzyOil && !hasNumber) {
+    } else if ((!current.foundOil && !hasOil && !fuzzyOil && !hasNumber) || isFirstNameWithNumber) {
-      current.nameParts.push(part)
+      current.nameParts.push(isFirstNameWithNumber ? textPart : part)
     } else {
       current.foundOil = true
       current.ingredientParts.push(part)
@@ -350,7 +412,7 @@ export function parseMultiRecipes(raw, oilNames) {
       }
     }
     return {
-      name: r.nameParts.join(' ') || '未命名配方',
+      name: r.nameParts.join(' ') || '',
       ingredients: deduped,
       notFound,
     }

frontend/src/stores/recipes.js

@@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { api } from '../composables/useApi'
 
+export const EDITOR_ONLY_TAGS = ['已审核']
+
 export const useRecipesStore = defineStore('recipes', () => {
   const recipes = ref([])
   const allTags = ref([])
@@ -46,10 +48,8 @@ export const useRecipesStore = defineStore('recipes', () => {
   async function saveRecipe(recipe) {
     if (recipe._id) {
       const data = await api.put(`/api/recipes/${recipe._id}`, recipe)
-      const idx = recipes.value.findIndex((r) => r._id === recipe._id)
+      // Reload from server to get properly formatted data (oil_name → oil mapping)
-      if (idx !== -1) {
+      await loadRecipes()
-        recipes.value[idx] = { ...recipes.value[idx], ...recipe, _version: data._version ?? data.version ?? recipe._version }
-      }
       return data
     } else {
       const data = await api.post('/api/recipes', recipe)

frontend/src/views/AuditLog.vue

@@ -49,6 +49,7 @@
         <div class="log-detail">
           <span v-if="log.target_name" class="log-target-name">{{ log.target_name }}</span>
           <span v-if="parsedDetail(log)" class="log-extra">{{ parsedDetail(log) }}</span>
+          <button v-if="canUndo(log)" class="undo-btn" @click="undoAction(log)">↩ 撤销</button>
         </div>
       </div>
       <div v-if="filteredLogs.length === 0" class="empty-hint">暂无日志记录</div>
@@ -66,6 +67,10 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue'
 import { api } from '../composables/useApi'
+import { showConfirm } from '../composables/useDialog'
+import { useUiStore } from '../stores/ui'
+
+const ui = useUiStore()
 
 const logs = ref([])
 const loading = ref(false)
@@ -77,10 +82,10 @@ const selectedUser = ref('')
 const selectedTarget = ref('')
 
 const ACTION_MAP = {
-  create_recipe: '新增配方',
+  share_recipe: '共享配方',
+  adopt_recipe: '共享配方',
   update_recipe: '编辑配方',
   delete_recipe: '删除配方',
-  adopt_recipe: '采纳配方',
   reject_recipe: '拒绝配方',
   undo_delete_recipe: '恢复配方',
   upsert_oil: '编辑精油',
@@ -96,16 +101,19 @@ const ACTION_MAP = {
   reject_business: '拒绝商业认证',
   grant_business: '开通商业认证',
   revoke_business: '撤销商业认证',
+  register: '用户注册',
 }
 
-const actionTypes = [
+const actionGroups = {
-  { value: 'recipe', label: '配方' },
+  '配方': ['share_recipe', 'adopt_recipe', 'update_recipe', 'delete_recipe', 'undo_delete_recipe'],
-  { value: 'oil', label: '精油' },
+  '审核': ['reject_recipe'],
-  { value: 'user', label: '用户' },
+  '精油': ['upsert_oil', 'delete_oil', 'undo_delete_oil'],
-  { value: 'tag', label: '标签' },
+  '标签': ['create_tag', 'delete_tag'],
-  { value: 'adopt', label: '审核' },
+  '用户': ['create_user', 'update_user', 'delete_user', 'undo_delete_user', 'register'],
-  { value: 'business', label: '商业认证' },
+  '商业认证': ['business_apply', 'approve_business', 'reject_business', 'grant_business', 'revoke_business'],
-]
+}
+
+const actionTypes = Object.keys(actionGroups).map(label => ({ value: label, label }))
 
 const targetTypes = [
   { value: 'recipe', label: '配方' },
@@ -125,7 +133,8 @@ const uniqueUsers = computed(() => {
 const filteredLogs = computed(() => {
   let result = logs.value
   if (selectedAction.value) {
-    result = result.filter(l => l.action.includes(selectedAction.value))
+    const group = actionGroups[selectedAction.value]
+    if (group) result = result.filter(l => group.includes(l.action))
   }
   if (selectedUser.value) {
     result = result.filter(l => (l.user_name || l.username) === selectedUser.value)
@@ -144,7 +153,7 @@ function actionColorClass(action) {
   if (action.includes('create') || action.includes('upsert')) return 'color-create'
   if (action.includes('update')) return 'color-update'
   if (action.includes('delete') || action.includes('reject')) return 'color-delete'
-  if (action.includes('adopt') || action.includes('undo')) return 'color-approve'
+  if (action.includes('adopt') || action.includes('undo') || action.includes('share')) return 'color-approve'
   return ''
 }
 
@@ -157,6 +166,7 @@ function parsedDetail(log) {
     if (d.from_user) parts.push(`来自: ${d.from_user}`)
     if (d.reason) parts.push(`原因: ${d.reason}`)
     if (d.business_name) parts.push(`商户: ${d.business_name}`)
+    if (d.changed) parts.push(`修改: ${d.changed}`)
     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(' · ')
@@ -168,6 +178,30 @@ function parsedDetail(log) {
   }
 }
 
+function canUndo(log) {
+  return ['delete_recipe', 'delete_oil'].includes(log.action)
+}
+
+async function undoAction(log) {
+  const ok = await showConfirm(`确定撤销此操作？将恢复「${log.target_name}」`)
+  if (!ok) return
+  try {
+    const res = await api(`/api/audit-log/${log.id}/undo`, { method: 'POST' })
+    if (res.ok) {
+      ui.showToast('已撤销')
+      logs.value = []
+      page.value = 0
+      hasMore.value = true
+      await fetchLogs()
+    } else {
+      const err = await res.json().catch(() => ({}))
+      ui.showToast('撤销失败: ' + (err.detail || err.message || ''))
+    }
+  } catch {
+    ui.showToast('撤销失败')
+  }
+}
+
 function formatTime(t) {
   if (!t) return ''
   return new Date(t + 'Z').toLocaleString('zh-CN', {
@@ -235,6 +269,11 @@ onMounted(() => fetchLogs())
 .log-detail { font-size: 13px; color: #6b6375; margin-top: 2px; }
 .log-target-name { font-weight: 500; color: #3e3a44; margin-right: 8px; }
 .log-extra { color: #999; font-size: 12px; }
+.undo-btn {
+  margin-left: 8px; padding: 2px 8px; border: 1px solid #d4cfc7; border-radius: 6px;
+  background: #fff; font-size: 11px; cursor: pointer; color: #6b6375; font-family: inherit;
+}
+.undo-btn:hover { border-color: #7ec6a4; color: #4a9d7e; }
 
 .load-more { text-align: center; margin-top: 16px; }
 .btn-outline {

frontend/src/views/Inventory.vue

@@ -1,29 +1,29 @@
 <template>
   <div class="inventory-page">
-    <!-- Search -->
+    <!-- Search + direct add -->
     <div class="search-box">
       <input
         class="search-input"
         v-model="searchQuery"
-        placeholder="搜索精油..."
+        placeholder="搜索精油名称，回车添加..."
+        @keydown.enter="addFromSearch"
       />
       <button v-if="searchQuery" class="search-clear-btn" @click="searchQuery = ''">✕</button>
     </div>
-
+    <!-- Search results for direct add -->
-    <!-- Oil Picker Grid -->
+    <div v-if="searchQuery && searchResults.length" class="search-results">
-    <div class="section-label">点击添加到库存</div>
+      <div v-for="name in searchResults" :key="name" class="search-result-item" @click="addOil(name)">
-    <div class="oil-picker-grid">
-      <div
-        v-for="name in filteredOilNames"
-        :key="name"
-        class="oil-pick-chip"
-        :class="{ owned: ownedSet.has(name) }"
-        @click="toggleOil(name)"
-      >
         <span class="pick-dot" :class="{ active: ownedSet.has(name) }">{{ ownedSet.has(name) ? '✓' : '+' }}</span>
-        <span class="pick-name">{{ name }}</span>
+        {{ name }}
       </div>
-      <div v-if="filteredOilNames.length === 0" class="empty-hint">未找到精油</div>
+    </div>
+
+    <!-- Quick add kits -->
+    <div class="kit-bar">
+      <button class="kit-btn" @click="addKit('family')">家庭医生</button>
+      <button class="kit-btn" @click="addKit('home3988')">居家呵护(3988)</button>
+      <button class="kit-btn" @click="addKit('aroma')">芳香调理</button>
+      <button class="kit-btn" @click="addKit('full')">全精油</button>
     </div>
 
     <!-- Owned Oils Section -->
@@ -36,7 +36,25 @@
         {{ name }} ✕
       </div>
     </div>
-    <div v-else class="empty-hint">暂未添加精油，点击上方精油添加到库存</div>
+    <div v-else class="empty-hint">搜索添加精油，或点击上方套装快捷添加</div>
+
+    <!-- Oil Picker Grid (collapsed by default) -->
+    <div class="section-header clickable" @click="showPicker = !showPicker">
+      <span>📦 全部精油</span>
+      <span class="toggle-icon">{{ showPicker ? '▾' : '▸' }}</span>
+    </div>
+    <div v-if="showPicker" class="oil-picker-grid">
+      <div
+        v-for="name in oils.oilNames"
+        :key="name"
+        class="oil-pick-chip"
+        :class="{ owned: ownedSet.has(name) }"
+        @click="toggleOil(name)"
+      >
+        <span class="pick-dot" :class="{ active: ownedSet.has(name) }">{{ ownedSet.has(name) ? '✓' : '+' }}</span>
+        <span class="pick-name">{{ name }}</span>
+      </div>
+    </div>
 
     <!-- Matching Recipes Section -->
     <div class="section-header" style="margin-top:20px">
@@ -85,32 +103,86 @@ const ui = useUiStore()
 const searchQuery = ref('')
 const ownedOils = ref([])
 const loading = ref(false)
+const showPicker = ref(false)
 
 const ownedSet = computed(() => new Set(ownedOils.value))
 
-const filteredOilNames = computed(() => {
+const searchResults = computed(() => {
-  if (!searchQuery.value.trim()) return oils.oilNames
+  if (!searchQuery.value.trim()) return []
   const q = searchQuery.value.trim().toLowerCase()
-  return oils.oilNames.filter(n => n.toLowerCase().includes(q))
+  return oils.oilNames.filter(n => n.toLowerCase().includes(q)).slice(0, 15)
 })
 
+// Kit definitions
+const KITS = {
+  family: ['乳香', '茶树', '薰衣草', '柠檬', '椒样薄荷', '保卫', '牛至', '乐活', '顺畅呼吸', '舒缓'],
+  home3988: ['乳香', '野橘', '柠檬', '薰衣草', '椒样薄荷', '冬青', '茶树', '生姜', '柠檬草', '西班牙牛至',
+    '西洋蓍草石榴籽', '乐活', '保卫', '新瑞活力', '舒缓', '安定情绪', '安宁神气', '顺畅呼吸', '柑橘清新', '芳香调理', '元气焕能'],
+  aroma: ['薰衣草', '舒缓', '安定情绪', '芳香调理', '野橘', '椒样薄荷', '保卫', '茶树'],
+  full: ['侧柏', '乳香', '雪松', '芫荽', '丝柏', '圆柚', '红橘', '冬青', '没药', '扁柏', '檀香', '姜黄', '玫瑰',
+    '绿薄荷', '薰衣草', '永久花', '香蜂草', '迷迭香', '麦卢卡', '天竺葵', '蓝艾菊', '小茴香',
+    '古巴香脂', '依兰依兰', '丁香花蕾', '柠檬尤加利', '藿香', '西班牙牛至尾草',
+    '罗勒', '莱姆', '生姜', '柠檬', '茶树', '野橘', '香茅', '枫香',
+    '芹菜籽', '岩兰草', '苦橙叶', '柠檬草', '山鸡椒', '黑云杉',
+    '马郁兰', '佛手柑', '黑胡椒', '小豆蔻', '尤加利', '百里香',
+    '椒样薄荷', '杜松浆果', '加州白鼠尾草',
+    '快乐鼠尾草', '西伯利亚冷杉',
+    '西班牙牛至', '斯里兰卡肉桂']
+}
+
+function addKit(kitName) {
+  const kit = KITS[kitName]
+  if (!kit) return
+  let added = 0
+  for (const name of kit) {
+    // Match existing oil names (fuzzy)
+    const match = oils.oilNames.find(n => n === name) || oils.oilNames.find(n => n.includes(name) || name.includes(n))
+    if (match && !ownedOils.value.includes(match)) {
+      ownedOils.value.push(match)
+      added++
+    }
+  }
+  ownedOils.value.sort((a, b) => a.localeCompare(b, 'zh'))
+  saveInventory()
+  ui.showToast(`已添加 ${added} 种精油`)
+}
+
+function addFromSearch() {
+  if (searchResults.value.length > 0) {
+    addOil(searchResults.value[0])
+  }
+}
+
+function addOil(name) {
+  if (!ownedOils.value.includes(name)) {
+    ownedOils.value.push(name)
+    ownedOils.value.sort((a, b) => a.localeCompare(b, 'zh'))
+    saveInventory()
+  }
+  searchQuery.value = ''
+}
+
 const matchingRecipes = computed(() => {
   if (ownedOils.value.length === 0) return []
   return recipeStore.recipes
     .filter(r => {
-      const needed = r.ingredients.map(i => i.oil)
+      // Exclude coconut oil from matching
+      const needed = r.ingredients.filter(i => i.oil !== '椰子油').map(i => i.oil)
+      if (needed.length === 0) return false
       const coverage = needed.filter(o => ownedSet.value.has(o)).length
-      return coverage >= Math.ceil(needed.length * 0.5)
+      // Show if at least 1 oil matches
+      return coverage >= 1
     })
     .sort((a, b) => {
       const aCov = coverageRatio(a)
       const bCov = coverageRatio(b)
-      return bCov - aCov
+      if (bCov !== aCov) return bCov - aCov
+      return a.name.localeCompare(b.name, 'zh')
     })
 })
 
 function coverageRatio(recipe) {
-  const needed = recipe.ingredients.map(i => i.oil)
+  const needed = recipe.ingredients.filter(i => i.oil !== '椰子油').map(i => i.oil)
   if (needed.length === 0) return 0
   return needed.filter(o => ownedSet.value.has(o)).length / needed.length
 }
@@ -205,6 +277,27 @@ onMounted(() => {
   padding: 4px;
 }
 
+.search-results {
+  margin-bottom: 10px; max-height: 200px; overflow-y: auto;
+  border: 1.5px solid #e5e4e7; border-radius: 10px; background: #fff;
+}
+.search-result-item {
+  padding: 8px 12px; cursor: pointer; font-size: 13px; display: flex; align-items: center; gap: 6px;
+  border-bottom: 1px solid #f5f5f5;
+}
+.search-result-item:hover { background: #f0faf5; }
+.search-result-item:last-child { border-bottom: none; }
+
+.kit-bar { display: flex; gap: 6px; flex-wrap: wrap; margin-bottom: 12px; }
+.kit-btn {
+  padding: 5px 12px; border: 1.5px solid #e5e4e7; border-radius: 20px; background: #fff;
+  font-size: 12px; cursor: pointer; font-family: inherit; color: #6b6375;
+}
+.kit-btn:hover { border-color: #7ec6a4; color: #4a9d7e; }
+
+.clickable { cursor: pointer; }
+.toggle-icon { font-size: 12px; color: #999; margin-left: auto; }
+
 .section-label {
   font-size: 12px;
   color: #b0aab5;

frontend/src/views/MyDiary.vue

@@ -245,56 +245,41 @@
       <div ref="bizCertRef" class="section-card biz-card">
         <h4>🏢 商业用户认证</h4>
 
-        <!-- 已认证 -->
+        <!-- Status bar -->
         <div v-if="auth.isBusiness" class="biz-status-bar biz-approved">
           <span>✅ 已认证商业用户</span>
         </div>
-
-        <!-- 审核中 -->
         <div v-else-if="bizApp.status === 'pending'" class="biz-status-bar biz-pending">
           <span>⏳ 认证申请审核中</span>
-          <div class="biz-status-detail">商户名：{{ bizApp.business_name }} · 提交时间：{{ formatDate(bizApp.created_at) }}</div>
+        </div>
+        <div v-else-if="bizApp.status === 'rejected'" class="biz-status-bar biz-rejected">
+          <span>❌ 认证申请未通过</span>
+          <div v-if="bizApp.reject_reason" class="biz-status-detail">原因：{{ bizApp.reject_reason }}</div>
+          <p style="font-size:12px;margin-top:4px">你可以修改后重新申请</p>
         </div>
 
-        <!-- 被拒绝 -->
+        <!-- Always show filled info (like QR page) -->
-        <template v-else-if="bizApp.status === 'rejected'">
+        <div class="biz-form">
-          <div class="biz-status-bar biz-rejected">
+          <div class="form-group">
-            <span>❌ 认证申请未通过</span>
+            <label class="form-label">商户名称 *</label>
-            <div v-if="bizApp.reject_reason" class="biz-status-detail">原因：{{ bizApp.reject_reason }}</div>
+            <input v-model="businessName" class="form-input" placeholder="你的商户或品牌名称" :disabled="bizApp.status === 'pending'" />
           </div>
-          <p class="hint-text">你可以修改信息后重新申请。</p>
+          <div class="form-group">
-        </template>
+            <label class="form-label">证明图片 *</label>
-
+            <p style="font-size:11px;color:var(--text-light);margin-bottom:6px">营业执照或相关证明材料</p>
-        <!-- 申请表单（首次或被拒后重新申请） -->
+            <div class="upload-box" @click="$refs.bizDocInput?.click()">
-        <template v-if="!auth.isBusiness && bizApp.status !== 'pending'">
+              <img v-if="bizDocImage" :src="bizDocImage" class="upload-box-img" />
-          <div class="biz-form">
+              <span v-else class="upload-box-hint">点击上传</span>
-            <div class="form-group">
-              <label class="form-label">认证类型 *</label>
-              <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>
+            <input ref="bizDocInput" type="file" accept="image/*" style="display:none" @change="handleBizDocUpload" />
+            <button v-if="bizDocImage" class="btn-clear" @click="bizDocImage = ''">清除</button>
           </div>
-        </template>
+          <template v-if="!auth.isBusiness && bizApp.status !== 'pending'">
+            <div style="margin-top:12px">
+              <button class="btn-primary" @click="applyBusiness" :disabled="!businessName.trim() || !bizDocImage">💾 提交申请</button>
+            </div>
+          </template>
+        </div>
       </div>
     </div>
   </div>
@@ -346,6 +331,7 @@ const businessName = ref('')
 const businessReason = ref('')
 const bizType = ref('')
 const bizPhone = ref('')
+const bizDocImage = ref('')
 const bizApp = ref({ status: null })
 
 onMounted(async () => {
@@ -356,7 +342,11 @@ onMounted(async () => {
   // Load business application status
   try {
     const bizRes = await api('/api/my-business-application')
-    if (bizRes.ok) bizApp.value = await bizRes.json()
+    if (bizRes.ok) {
+      bizApp.value = await bizRes.json()
+      if (bizApp.value.business_name) businessName.value = bizApp.value.business_name
+      if (bizApp.value.document) bizDocImage.value = bizApp.value.document
+    }
   } catch {}
   // 从商业核算跳转过来，滚到商业认证区域
   if (route.query.section === 'biz-cert') {
@@ -702,33 +692,36 @@ async function changePassword() {
   }
 }
 
+async function handleBizDocUpload(event) {
+  const file = event.target.files[0]
+  if (!file) return
+  let base64 = await readFileAsBase64(file)
+  base64 = await compressImage(base64, 300000, 600)
+  bizDocImage.value = base64
+}
+
 async function applyBusiness() {
-  if (!businessName.value.trim() || !bizType.value) {
+  if (!businessName.value.trim() || !bizDocImage.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: info,
+        document: bizDocImage.value,
       }),
     })
     if (res.ok) {
-      businessName.value = ''
+      // Don't clear — keep showing submitted data
-      businessReason.value = ''
-      bizType.value = ''
-      bizPhone.value = ''
       ui.showToast('申请已提交，请等待管理员审核')
       const bizRes = await api('/api/my-business-application')
-      if (bizRes.ok) bizApp.value = await bizRes.json()
+      if (bizRes.ok) {
+        bizApp.value = await bizRes.json()
+        // Restore document image from app data
+        if (bizApp.value.document) bizDocImage.value = bizApp.value.document
+      }
     } else {
       const err = await res.json().catch(() => ({}))
       ui.showToast(err.detail || '提交失败')

frontend/src/views/Projects.vue

@@ -1,14 +1,33 @@
 <template>
   <div class="projects-page">
+    <!-- Header -->
+    <div class="commercial-header">
+      <div class="commercial-icon">💼</div>
+      <div class="commercial-desc">商业用户专属功能，包含项目核算、成本分析等工具</div>
+    </div>
+
     <!-- Project List -->
-    <div class="toolbar">
+    <div class="toolbar-sticky">
-      <h3 class="page-title">💼 商业核算</h3>
+      <div class="toolbar-inner">
-      <button v-if="auth.isBusiness" class="btn-primary" @click="createProject">+ 新建项目</button>
+        <h3 class="page-title">📊 服务项目成本利润分析</h3>
+        <button class="btn-primary btn-sm" @click="handleCreateProject">+ 新增项目</button>
+      </div>
     </div>
 
     <div v-if="!selectedProject" class="project-list">
+      <!-- Demo project (first one, or fallback) -->
+      <div v-if="demoProject" class="project-card demo-card" @click="selectDemoProject">
+        <div class="proj-header">
+          <span class="proj-name">{{ demoProject.name }}</span>
+          <span class="proj-badge">体验</span>
+        </div>
+        <div class="proj-summary">
+          <span>点击体验成本利润分析</span>
+        </div>
+      </div>
+      <!-- Real projects (exclude demo) -->
       <div
-        v-for="p in projects"
+        v-for="p in userProjects"
         :key="p._id || p.id"
         class="project-card"
         @click="selectProject(p)"
@@ -23,11 +42,10 @@
             成本 {{ oils.fmtPrice(oils.calcCost(p.ingredients)) }}
           </span>
         </div>
-        <div v-if="auth.isAdmin" class="proj-actions" @click.stop>
+        <div class="proj-actions proj-actions-hover" @click.stop>
           <button class="btn-icon-sm" @click="deleteProject(p)" title="删除">🗑️</button>
         </div>
       </div>
-      <div v-if="projects.length === 0" class="empty-hint">暂无项目，点击上方创建</div>
     </div>
 
     <!-- Project Detail -->
@@ -39,7 +57,7 @@
           class="proj-name-input"
           @blur="saveProject"
         />
-        <button class="btn-outline btn-sm" @click="importFromRecipe">📋 从配方导入</button>
+        <button class="btn-outline btn-sm" :disabled="isDemoMode && !auth.isAdmin" @click="importFromRecipe">📋 从配方导入</button>
       </div>
 
       <!-- Ingredients Table -->
@@ -47,120 +65,130 @@
         <div class="section-header-row">
           <h4>🧴 配方成分</h4>
           <div class="section-actions">
-            <button class="btn-outline btn-sm" @click="addIngredient">＋ 添加精油</button>
+            <button v-if="!isDemoMode || auth.isAdmin" class="btn-outline btn-sm" @click="addIngredient">＋ 添加精油</button>
           </div>
         </div>
         <table class="ingredients-table">
           <thead>
             <tr>
               <th>精油</th>
-              <th>单次用量(滴)</th>
+              <th>用量</th>
-              <th>单价/滴</th>
+              <th>每滴</th>
               <th>小计</th>
               <th></th>
             </tr>
           </thead>
           <tbody>
-            <tr v-for="(ing, i) in selectedProject.ingredients" :key="i">
+            <tr v-for="(ing, i) in selectedProject.ingredients" :key="i" :class="{ 'readonly-row': isDemoMode && !auth.isAdmin }">
               <td>
-                <select v-model="ing.oil" class="form-select" @change="saveProject">
+                <template v-if="isDemoMode && !auth.isAdmin">
-                  <option value="">— 选择精油 —</option>
+                  <span class="readonly-oil">{{ ing.oil || '—' }}</span>
-                  <option v-for="name in oils.oilNames" :key="name" :value="name">{{ name }}</option>
+                </template>
-                </select>
+                <template v-else>
+                  <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>
+                </template>
               </td>
               <td>
-                <input v-model.number="ing.drops" type="number" min="0" step="0.5" class="drops-input" @change="saveProject" />
+                <template v-if="isDemoMode && !auth.isAdmin">
+                  <span class="readonly-drops">{{ ing.drops }}</span>
+                </template>
+                <template v-else>
+                  <input v-model.number="ing.drops" type="number" min="0" step="0.5" class="drops-input" @change="saveProject" />
+                </template>
               </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>
+              <td><button v-if="!isDemoMode || auth.isAdmin" class="remove-btn" @click="removeIngredient(i)">×</button></td>
             </tr>
           </tbody>
         </table>
-        <div class="total-row">
+        <table class="ingredients-table total-table">
-          <span class="total-label">配方总成本</span>
+          <tr>
-          <span class="total-price">{{ oils.fmtPrice(materialCost) }}</span>
+            <td class="total-label-cell">配方总成本</td>
-        </div>
+            <td></td>
+            <td></td>
+            <td class="total-price-cell">{{ oils.fmtPrice(materialCost) }}</td>
+            <td></td>
+          </tr>
+        </table>
 
-        <!-- Pricing -->
+        <!-- Consumption Analysis -->
-        <div class="pricing-inline">
+        <div v-if="consumptionData.length" class="consumption-section" style="margin-top:12px">
-          <div class="price-field">
+          <h4>🧪 消耗分析</h4>
-            <label>定价 ¥</label>
+          <table class="ingredients-table">
-            <input v-model.number="selectedProject.selling_price" type="number" class="price-input" placeholder="/次" @change="saveProject" />
+            <thead>
+              <tr><th>精油</th><th>单次用量</th><th>瓶装容量</th><th>可做次数</th><th></th></tr>
+            </thead>
+            <tbody>
+              <tr v-for="c in consumptionData" :key="c.oil" :class="{ 'limit-oil': c.isLimit }">
+                <td>{{ c.oil }}</td>
+                <td>{{ c.drops }}滴</td>
+                <td>{{ c.bottleDrops }}滴</td>
+                <td>{{ c.sessions }}次</td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+          <div class="consumption-summary">
+            <span v-if="allSameSession">可做 <strong>{{ maxSessions }}</strong> 次</span>
+            <span v-else>⚠️ <strong>{{ limitingOil }}</strong> 最先消耗完，可做 <strong>{{ maxSessions }}</strong> 次</span>
           </div>
         </div>
       </div>
 
-      <!-- Pricing Section -->
+      <!-- Pricing + Profit side by side -->
-      <div class="pricing-section">
+      <div class="price-profit-row">
-        <h4>💰 价格计算</h4>
+        <div class="pricing-col">
-        <div class="price-row">
+          <h4>💰 价格计算</h4>
-          <span class="price-label">原料成本</span>
+          <div class="price-row">
-          <span class="price-value cost">{{ oils.fmtPrice(materialCost) }}</span>
+            <span class="price-label">原料成本</span>
-        </div>
+            <span class="price-val-box">{{ oils.fmtPrice(materialCost) }}</span>
-
+          </div>
-        <div class="price-row">
+          <div class="price-row">
-          <span class="price-label">包装费用</span>
+            <span class="price-label">包装费用</span>
-          <div class="price-input-wrap">
+            <div class="price-input-wrap"><span>¥</span><input v-model.number="selectedProject.packaging_cost" type="number" class="form-input-inline" placeholder="0" @focus="clearZero($event)" @change="saveProject" /></div>
-            <span>¥</span>
+          </div>
-            <input v-model.number="selectedProject.packaging_cost" type="number" class="form-input-inline" @change="saveProject" />
+          <div class="price-row">
+            <span class="price-label">人工费用</span>
+            <div class="price-input-wrap"><span>¥</span><input v-model.number="selectedProject.labor_cost" type="number" class="form-input-inline" placeholder="0" @focus="clearZero($event)" @change="saveProject" /></div>
+          </div>
+          <div class="price-row">
+            <span class="price-label">其他成本</span>
+            <div class="price-input-wrap"><span>¥</span><input v-model.number="selectedProject.other_cost" type="number" class="form-input-inline" placeholder="0" @focus="clearZero($event)" @change="saveProject" /></div>
+          </div>
+          <div class="price-row total">
+            <span class="price-label">总成本</span>
+            <span class="price-val-box">{{ oils.fmtPrice(totalCost) }}</span>
+          </div>
+          <div class="price-row">
+            <span class="price-label">售价</span>
+            <div class="price-input-wrap"><span>¥</span><input v-model.number="selectedProject.selling_price" type="number" class="form-input-inline" @change="saveProject" /></div>
+          </div>
+          <div class="price-row">
+            <span class="price-label">批量数量</span>
+            <input v-model.number="selectedProject.quantity" type="number" min="1" class="form-input-inline" @change="saveProject" />
           </div>
         </div>
-
+        <div class="profit-col">
-        <div class="price-row">
+          <h4>📊 利润分析</h4>
-          <span class="price-label">人工费用</span>
-          <div class="price-input-wrap">
-            <span>¥</span>
-            <input v-model.number="selectedProject.labor_cost" type="number" class="form-input-inline" @change="saveProject" />
-          </div>
-        </div>
-
-        <div class="price-row">
-          <span class="price-label">其他成本</span>
-          <div class="price-input-wrap">
-            <span>¥</span>
-            <input v-model.number="selectedProject.other_cost" type="number" class="form-input-inline" @change="saveProject" />
-          </div>
-        </div>
-
-        <div class="price-row total">
-          <span class="price-label">总成本</span>
-          <span class="price-value cost">{{ oils.fmtPrice(totalCost) }}</span>
-        </div>
-
-        <div class="price-row">
-          <span class="price-label">售价</span>
-          <div class="price-input-wrap">
-            <span>¥</span>
-            <input v-model.number="selectedProject.selling_price" type="number" class="form-input-inline" @change="saveProject" />
-          </div>
-        </div>
-
-        <div class="price-row">
-          <span class="price-label">批量数量</span>
-          <input v-model.number="selectedProject.quantity" type="number" min="1" class="form-input-inline" @change="saveProject" />
-        </div>
-      </div>
-
-      <!-- Profit Analysis -->
-      <div class="profit-section">
-        <h4>📊 利润分析</h4>
-        <div class="profit-grid">
           <div class="profit-card">
-            <div class="profit-label">单件利润</div>
+            <div class="profit-card-label">单件利润</div>
-            <div class="profit-value" :class="{ negative: unitProfit < 0 }">{{ oils.fmtPrice(unitProfit) }}</div>
+            <div class="profit-card-value" :class="{ negative: unitProfit < 0 }">{{ oils.fmtPrice(unitProfit) }}</div>
           </div>
           <div class="profit-card">
-            <div class="profit-label">利润率</div>
+            <div class="profit-card-label">利润率</div>
-            <div class="profit-value" :class="{ negative: profitMargin < 0 }">{{ profitMargin.toFixed(1) }}%</div>
+            <div class="profit-card-value" :class="{ negative: profitMargin < 0 }">{{ profitMargin.toFixed(1) }}%</div>
           </div>
           <div class="profit-card">
-            <div class="profit-label">批量总利润</div>
+            <div class="profit-card-label">批量总收入</div>
-            <div class="profit-value" :class="{ negative: batchProfit < 0 }">{{ oils.fmtPrice(batchProfit) }}</div>
+            <div class="profit-card-value">{{ oils.fmtPrice(batchRevenue) }}</div>
           </div>
           <div class="profit-card">
-            <div class="profit-label">批量总收入</div>
+            <div class="profit-card-label">批量总利润</div>
-            <div class="profit-value">{{ oils.fmtPrice(batchRevenue) }}</div>
+            <div class="profit-card-value" :class="{ negative: batchProfit < 0 }">{{ oils.fmtPrice(batchProfit) }}</div>
           </div>
         </div>
       </div>
@@ -244,6 +272,38 @@ async function loadProjects() {
   }
 }
 
+// Demo = first project (芳香调理技术), managed by admin
+const demoProject = computed(() => projects.value.find(p => p.name && p.name.includes('芳香调理')) || projects.value[0] || null)
+const userProjects = computed(() => {
+  const demoId = demoProject.value?._id || demoProject.value?.id
+  return projects.value.filter(p => (p._id || p.id) !== demoId)
+})
+const isDemoMode = computed(() => selectedProject.value?._demo === true)
+
+function selectDemoProject() {
+  const p = demoProject.value
+  if (!p) return
+  selectedProject.value = {
+    ...p,
+    _demo: true,
+    ingredients: (p.ingredients || []).map(i => ({ ...i })),
+    packaging_cost: p.packaging_cost || 0,
+    labor_cost: p.labor_cost || 0,
+    other_cost: p.other_cost || 0,
+    selling_price: p.selling_price || 299,
+    quantity: p.quantity || 1,
+    notes: p.notes || '',
+  }
+}
+
+function handleCreateProject() {
+  if (!auth.isBusiness && !auth.isAdmin) {
+    showCertPrompt()
+    return
+  }
+  createProject()
+}
+
 async function createProject() {
   const name = await showPrompt('项目名称:', '新项目')
   if (!name) return
@@ -256,7 +316,7 @@ async function createProject() {
         packaging_cost: 0,
         labor_cost: 0,
         other_cost: 0,
-        selling_price: 0,
+        selling_price: 299,
         quantity: 1,
         notes: '',
       }),
@@ -273,7 +333,7 @@ async function createProject() {
 }
 
 function selectProject(p) {
-  if (!auth.isBusiness) {
+  if (!auth.isBusiness && !auth.isAdmin) {
     showCertPrompt()
     return
   }
@@ -283,7 +343,7 @@ function selectProject(p) {
     packaging_cost: p.packaging_cost || 0,
     labor_cost: p.labor_cost || 0,
     other_cost: p.other_cost || 0,
-    selling_price: p.selling_price || 0,
+    selling_price: p.selling_price || 299,
     quantity: p.quantity || 1,
     notes: p.notes || '',
   }
@@ -291,7 +351,10 @@ function selectProject(p) {
 
 async function saveProject() {
   if (!selectedProject.value) return
+  // Demo mode for non-admin: only save locally, don't hit API
+  if (isDemoMode.value && !auth.isAdmin) return
   const id = selectedProject.value._id || selectedProject.value.id
+  if (!id) return
   try {
     await api(`/api/projects/${id}`, {
       method: 'PUT',
@@ -372,6 +435,41 @@ const batchRevenue = computed(() => {
   return (selectedProject.value?.selling_price || 0) * (selectedProject.value?.quantity || 1)
 })
 
+const consumptionData = computed(() => {
+  if (!selectedProject.value) return []
+  const ings = (selectedProject.value.ingredients || []).filter(i => i.oil && i.oil !== '椰子油' && i.drops > 0)
+  return ings.map(i => {
+    const meta = oils.oilsMeta[i.oil]
+    const bottleDrops = meta ? meta.dropCount : 0
+    const sessions = bottleDrops > 0 && i.drops > 0 ? Math.floor(bottleDrops / i.drops) : 0
+    return { oil: i.oil, drops: i.drops, bottleDrops, sessions, isLimit: false }
+  })
+})
+
+const limitingOil = computed(() => {
+  const data = consumptionData.value.filter(c => c.sessions > 0)
+  if (!data.length) return ''
+  const min = data.reduce((a, b) => a.sessions < b.sessions ? a : b)
+  min.isLimit = true
+  return min.oil
+})
+
+const allSameSession = computed(() => {
+  const data = consumptionData.value.filter(c => c.sessions > 0)
+  if (data.length <= 1) return true
+  return data.every(c => c.sessions === data[0].sessions)
+})
+
+const maxSessions = computed(() => {
+  const data = consumptionData.value.filter(c => c.sessions > 0)
+  if (!data.length) return 0
+  return Math.min(...data.map(c => c.sessions))
+})
+
+function clearZero(e) {
+  if (e.target.value === '0' || e.target.value === 0) e.target.value = ''
+}
+
 function formatDate(d) {
   if (!d) return ''
   return new Date(d).toLocaleDateString('zh-CN')
@@ -383,11 +481,44 @@ function formatDate(d) {
   padding: 0 12px 24px;
 }
 
-.toolbar {
+.commercial-header {
+  text-align: center; padding: 24px 16px 16px; margin-bottom: 16px;
+}
+.commercial-icon { font-size: 48px; margin-bottom: 8px; }
+.commercial-desc { font-size: 14px; color: var(--text-light, #999); }
+.demo-card { border-style: dashed !important; opacity: 0.85; }
+.proj-actions-hover { opacity: 0; transition: opacity 0.15s; }
+.project-card:hover .proj-actions-hover { opacity: 1; }
+
+.readonly-row { background: #f8f7f5; }
+.readonly-oil { font-size: 13px; color: #6b6375; }
+.readonly-drops { font-size: 13px; color: #3e3a44; font-weight: 500; }
+
+.consumption-section { margin-bottom: 20px; padding: 14px; background: #f8f7f5; border-radius: 12px; border: 1.5px solid #e5e4e7; }
+.consumption-section h4 { margin: 0 0 12px; font-size: 14px; color: #3e3a44; }
+.consumption-table { width: 100%; border-collapse: collapse; font-size: 13px; margin-bottom: 10px; }
+.consumption-table th { text-align: left; padding: 6px 8px; color: #999; font-size: 12px; border-bottom: 1px solid #eee; }
+.consumption-table td { padding: 6px 8px; border-bottom: 1px solid #f5f5f5; }
+.consumption-table .limit-oil { background: #fff3e0; font-weight: 600; }
+.consumption-summary { font-size: 13px; color: #e65100; padding: 8px; background: #fff8e1; border-radius: 8px; }
+.proj-badge {
+  font-size: 10px; background: #fff3e0; color: #e65100; padding: 2px 8px; border-radius: 8px;
+}
+
+.toolbar-sticky {
+  position: sticky;
+  top: 0;
+  z-index: 20;
+  background: linear-gradient(135deg, #f0faf5 0%, #e8f0e8 100%);
+  margin: 0 -12px;
+  padding: 0 12px;
+  border-bottom: 1.5px solid #d4e8d4;
+}
+.toolbar-inner {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 16px;
+  padding: 12px 0;
 }
 
 .page-title {
@@ -526,25 +657,24 @@ function formatDate(d) {
 .section-actions { display: flex; gap: 6px; }
 
 .ingredients-table { width: 100%; border-collapse: collapse; margin-bottom: 12px; }
+.ingredients-table th { white-space: nowrap; }
 .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 td { padding: 6px 4px; border-bottom: 1px solid #f0f0f0; text-align: center; white-space: nowrap; }
 .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 { width: 45px; padding: 4px 4px; border: 1.5px solid #d4cfc7; border-radius: 6px; font-size: 12px; 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 { border: none; background: none; color: #ccc; cursor: pointer; font-size: 12px; padding: 0; width: 16px; }
 .remove-btn:hover { color: #c0392b; }
 
-.total-row {
+.total-table { background: #e8f5e9; border-radius: 10px; margin-bottom: 0; }
-  background: #e8f5e9; border-radius: 12px; padding: 14px 18px;
+.total-table td { border: none; padding: 10px 8px; }
-  display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px;
+.total-label-cell { font-size: 14px; color: #3e3a44; font-weight: 600; }
-}
+.total-price-cell { font-size: 18px; font-weight: 700; color: #2e7d5a; text-align: center; }
-.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; }
@@ -575,12 +705,18 @@ function formatDate(d) {
 
 .price-row {
   display: flex;
-  justify-content: space-between;
   align-items: center;
-  padding: 8px 0;
+  justify-content: space-between;
+  padding: 6px 0;
   border-bottom: 1px solid #eae8e5;
-  font-size: 14px;
+  font-size: 13px;
 }
+.price-row .price-label { color: #6b6375; }
+.price-row .price-value { text-align: right; font-weight: 600; }
+.price-val-box { width: 70px; text-align: right; font-weight: 600; color: #4a9d7e; font-size: 13px; }
+.price-row .price-input-wrap { display: flex; align-items: center; gap: 2px; }
+.price-row .form-input-inline, .price-row input[type="number"] { width: 70px; text-align: right; padding: 4px 6px; border: 1px solid #d4cfc7; border-radius: 6px; font-size: 13px; font-family: inherit; outline: none; }
+.price-row .form-input-inline:focus, .price-row input[type="number"]:focus { border-color: #7ec6a4; }
 
 .price-row.total {
   border-top: 2px solid #d4cfc7;
@@ -625,35 +761,20 @@ function formatDate(d) {
   border-color: #7ec6a4;
 }
 
-.profit-grid {
+.price-profit-row {
-  display: grid;
+  display: flex; gap: 16px; margin-bottom: 20px;
-  grid-template-columns: 1fr 1fr;
-  gap: 8px;
 }
-
+.pricing-col, .profit-col {
+  flex: 1; padding: 14px; background: #f8f7f5; border-radius: 12px; border: 1.5px solid #e5e4e7;
+}
+.pricing-col h4, .profit-col h4 { margin: 0 0 10px; font-size: 14px; color: #3e3a44; }
 .profit-card {
-  padding: 12px;
+  padding: 10px 12px; background: #fff; border-radius: 10px;
-  background: #fff;
+  border: 1.5px solid #e5e4e7; text-align: center; margin-bottom: 6px;
-  border-radius: 10px;
-  text-align: center;
-  border: 1.5px solid #e5e4e7;
-}
-
-.profit-label {
-  font-size: 12px;
-  color: #6b6375;
-  margin-bottom: 4px;
-}
-
-.profit-value {
-  font-size: 18px;
-  font-weight: 700;
-  color: #4a9d7e;
-}
-
-.profit-value.negative {
-  color: #ef5350;
 }
+.profit-card-label { font-size: 12px; color: #6b6375; margin-bottom: 2px; }
+.profit-card-value { font-size: 18px; font-weight: 700; color: #4a9d7e; }
+.profit-card-value.negative { color: #ef5350; }
 
 .notes-textarea {
   width: 100%;

frontend/src/views/RecipeManager.vue

@@ -42,14 +42,14 @@
       <button class="action-chip" :class="{ active: isAllSelected }" @click="toggleSelectAll">
         全选<span v-if="totalSelected > 0" class="chip-count">{{ totalSelected }}</span>
       </button>
-      <button class="action-chip" :class="{ active: showTagFilter }" @click="showTagFilter = !showTagFilter">标签</button>
+      <button class="action-chip" :class="{ active: showTagFilter }" @click="toggleTagFilter">标签</button>
       <button v-if="totalSelected > 0" class="action-chip" :class="{ active: showBatchMenu }" @click="showBatchMenu = !showBatchMenu">批量</button>
       <button v-if="totalSelected > 0" class="action-chip cancel" @click="clearSelection">取消</button>
       <button v-if="auth.isAdmin" class="export-btn" @click="exportExcel" title="导出Excel">📥</button>
     </div>
     <div v-if="showTagFilter" class="tag-list-bar">
       <span
-        v-for="tag in recipeStore.allTags"
+        v-for="tag in visibleAllTags"
         :key="tag"
         class="tag-chip"
         :class="{ active: selectedTags.includes(tag) }"
@@ -125,8 +125,9 @@
           />
           <div class="row-info" @click="editDiaryRecipe(d)">
             <span class="row-name">{{ d.name }}</span>
+            <span v-if="getVolumeLabel(d.ingredients)" class="row-volume">{{ getVolumeLabel(d.ingredients) }}</span>
             <span class="row-tags">
-              <span v-for="t in (d.tags || [])" :key="t" class="mini-tag">{{ t }}</span>
+              <span v-for="t in [...(d.tags || [])].sort((a,b)=>a.localeCompare(b,'zh'))" :key="t" class="mini-tag">{{ t }}</span>
             </span>
             <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
             <span v-if="getDiaryShareStatus(d) === 'shared'" class="share-tag shared">已共享</span>
@@ -164,8 +165,9 @@
           />
           <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 class="row-tags">
-              <span v-for="t in r.tags" :key="t" class="mini-tag">{{ t }}</span>
+              <span v-for="t in [...(r.tags || [])].sort((a,b)=>a.localeCompare(b,'zh'))" :key="t" class="mini-tag">{{ t }}</span>
             </span>
             <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(r.ingredients)) }}</span>
           </div>
@@ -178,7 +180,7 @@
     </div>
 
     <!-- Add/Edit Recipe Overlay -->
-    <div v-if="showAddOverlay" class="overlay" @click.self="closeOverlay">
+    <div v-if="showAddOverlay" class="overlay">
       <div class="overlay-panel">
         <div class="overlay-header">
           <h3>{{ editingRecipe ? '编辑配方' : '添加配方' }}</h3>
@@ -191,7 +193,7 @@
             <textarea
               v-model="smartPasteText"
               class="paste-input"
-              placeholder="直接粘贴配方文本，支持多条配方同时识别&#10;例如: 舒缓放松，薰衣草3，茶树2&#10;提神醒脑，柠檬5，椒样薄荷3"
+              placeholder="直接粘贴配方文本，支持多条配方同时识别&#10;例如: 舒缓放松，薰衣草3，茶树2&#10;提神醒脑，柠檬5，椒样薄荷3&#10;不写数字默认1滴: 薰衣草，茶树，乳香"
               rows="4"
             ></textarea>
             <button class="btn-primary btn-sm" @click="handleSmartPaste" :disabled="!smartPasteText.trim()">
@@ -199,28 +201,24 @@
             </button>
           </div>
 
-          <!-- Parsed results preview -->
+          <!-- Multi-recipe queue indicator -->
-          <div v-if="parsedRecipes.length > 0" class="parsed-results">
+          <div v-if="parsedRecipes.length > 0" class="parsed-queue">
-            <div v-for="(pr, pi) in parsedRecipes" :key="pi" class="parsed-recipe-card">
+            <div class="parsed-queue-header">
-              <div class="parsed-header">
+              <span class="parsed-queue-label">批量识别 ({{ parsedCurrentIndex + 1 }}/{{ parsedRecipes.length }})</span>
-                <input v-model="pr.name" class="form-input parsed-name" placeholder="配方名称" />
+              <button class="btn-outline btn-sm" @click="saveAllParsed">全部保存</button>
-                <button class="btn-icon-sm" @click="parsedRecipes.splice(pi, 1)" title="放弃">✕</button>
+              <button class="btn-outline btn-sm" @click="parsedRecipes = []; parsedCurrentIndex = -1">取消全部</button>
-              </div>
-              <div class="parsed-ings">
-                <div v-for="(ing, ii) in pr.ingredients" :key="ii" class="parsed-ing">
-                  <span class="parsed-oil">{{ ing.oil }}</span>
-                  <input v-model.number="ing.drops" type="number" min="0" class="form-input-sm" />
-                  <button class="btn-icon-sm" @click="pr.ingredients.splice(ii, 1)">✕</button>
-                </div>
-              </div>
-              <div v-if="pr.notFound && pr.notFound.length" class="parsed-warn">
-                ⚠️ 未识别: {{ pr.notFound.join('、') }}
-              </div>
-              <button class="btn-primary btn-sm" @click="saveParsedRecipe(pi)">💾 保存此条</button>
             </div>
-            <div class="parsed-actions">
+            <div class="parsed-queue-list">
-              <button class="btn-primary btn-sm" @click="saveAllParsed" :disabled="parsedRecipes.length === 0">全部保存 ({{ parsedRecipes.length }})</button>
+              <button
-              <button class="btn-outline btn-sm" @click="parsedRecipes = []">取消全部</button>
+                v-for="(pr, pi) in parsedRecipes" :key="pi"
+                class="parsed-queue-item"
+                :class="{ active: pi === parsedCurrentIndex }"
+                @click="loadParsedIntoForm(pi)"
+              >
+                <span class="parsed-queue-name">{{ pr.name || '未命名' }}</span>
+                <span class="parsed-queue-count">{{ pr.ingredients.length }}味</span>
+                <span class="btn-icon-sm" @click.stop="parsedRecipes.splice(pi, 1); if (parsedRecipes.length === 0) parsedCurrentIndex = -1; else if (pi <= parsedCurrentIndex) loadParsedIntoForm(Math.min(parsedCurrentIndex, parsedRecipes.length - 1))">✕</span>
+              </button>
             </div>
           </div>
 
@@ -317,8 +315,8 @@
           <button class="add-row-btn" @click="addOilRow">+ 添加精油</button>
         </div>
 
-        <!-- Real-time summary -->
+        <!-- Real-time summary (only when volume selected) -->
-        <div class="recipe-summary">
+        <div v-if="formVolume" class="recipe-summary">
           {{ recipeSummaryText }}
         </div>
 
@@ -397,7 +395,7 @@
 import { ref, computed, reactive, onMounted, watch } from 'vue'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
-import { useRecipesStore } from '../stores/recipes'
+import { useRecipesStore, EDITOR_ONLY_TAGS } from '../stores/recipes'
 import { useDiaryStore } from '../stores/diary'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
@@ -433,6 +431,7 @@ const formNote = ref('')
 const formTags = ref([])
 const smartPasteText = ref('')
 const parsedRecipes = ref([])
+const parsedCurrentIndex = ref(-1)
 const showAddIngRow = ref(false)
 const newIngOil = ref('')
 const newIngSearch = ref('')
@@ -443,7 +442,13 @@ const formCustomVolume = ref(null)
 const formCustomUnit = ref('drops')
 const formDilution = ref(6)
 
-const formCocoRow = ref({ oil: '椰子油', drops: 10, _search: '椰子油', _open: false })
+const formCocoRow = ref(null)
+
+watch(() => formVolume.value, (vol) => {
+  if (vol && !formCocoRow.value && parsedCurrentIndex.value < 0) {
+    formCocoRow.value = { oil: '椰子油', drops: vol === 'single' ? 10 : 0, _search: '椰子油', _open: false }
+  }
+})
 
 // EO ingredients (everything except coconut)
 const formEoIngredients = computed(() =>
@@ -562,6 +567,15 @@ async function deleteGlobalTag(tag) {
   }
 }
 
+function toggleTagFilter() {
+  if (showTagFilter.value) {
+    showTagFilter.value = false
+    selectedTags.value = []
+  } else {
+    showTagFilter.value = true
+  }
+}
+
 function toggleTag(tag) {
   const idx = selectedTags.value.indexOf(tag)
   if (idx >= 0) selectedTags.value.splice(idx, 1)
@@ -744,15 +758,36 @@ function calcDilutionFromIngs() {
 }
 
 function editRecipe(recipe) {
-  editingRecipe.value = recipe
+  editingRecipe.value = { _id: recipe._id, _version: recipe._version, name: recipe.name }
   formName.value = recipe.name
   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 }
+  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
+    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)
+      const options = [3,4,5,6,7,8,9,10,12,15,20]
+      formDilution.value = options.reduce((a, b) => Math.abs(b - ratio) < Math.abs(a - ratio) ? b : a)
+    }
+  } else {
+    formCocoRow.value = null
+    formVolume.value = ''
+  }
   formNote.value = recipe.note || ''
   formTags.value = [...(recipe.tags || [])]
-  calcDilutionFromIngs(recipe.ingredients)
   showAddOverlay.value = true
 }
 
@@ -765,11 +800,12 @@ function closeOverlay() {
 function resetForm() {
   formName.value = ''
   formIngredients.value = [{ oil: '', drops: 1, _search: '', _open: false }]
-  formCocoRow.value = { oil: '椰子油', drops: 10, _search: '椰子油', _open: false }
+  formCocoRow.value = null
   formNote.value = ''
   formTags.value = []
   smartPasteText.value = ''
   parsedRecipes.value = []
+  parsedCurrentIndex.value = -1
   showAddIngRow.value = false
   newIngOil.value = ''
   newIngSearch.value = ''
@@ -797,9 +833,10 @@ function handleSmartPaste() {
     }
     parsedRecipes.value = []
   } else {
-    // Multiple recipes: show preview cards
+    // Multiple recipes: store queue, load first into form
     parsedRecipes.value = results
-    ui.showToast(`识别出 ${results.length} 条配方`)
+    loadParsedIntoForm(0)
+    ui.showToast(`识别出 ${results.length} 条配方，逐条编辑保存`)
   }
 }
 
@@ -944,6 +981,44 @@ function toggleFormTag(tag) {
   else formTags.value.push(tag)
 }
 
+/**
+ * Check name against public + personal recipes.
+ * Same name + same content → toast and return false.
+ * Same name + different content → show diff, prompt rename, loop until unique.
+ * Returns final name or false if cancelled.
+ */
+async function checkDupName(name, ings, target = 'diary') {
+  let currentName = name
+  while (true) {
+    const dup = target === 'public'
+      ? recipeStore.recipes.find(r => r.name === currentName)
+      : diaryStore.userDiary.find(d => d.name === currentName)
+    if (!dup) return currentName
+
+    const dupIngs = (dup.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
+    const myIngs = ings.filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
+    const identical = dupIngs.length === myIngs.length && dupIngs.every((d, i) => d.oil === myIngs[i].oil && d.drops === myIngs[i].drops)
+    const where = target === 'public' ? '公共配方库' : '我的配方'
+
+    if (identical) {
+      ui.showToast(`${where}中已有一模一样的配方「${currentName}」`)
+      return false
+    }
+
+    const existIngs = dupIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
+    const newIngs = myIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
+    const ok = await showConfirm(
+      `${where}中已有同名配方「${currentName}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n请改名后保存`,
+      { okText: '改名', cancelText: '取消' }
+    )
+    if (!ok) return false
+    const newName = await showPrompt('请输入新名称：', currentName)
+    if (!newName || !newName.trim()) return false
+    currentName = newName.trim()
+    // Loop back to check the new name
+  }
+}
+
 async function saveCurrentRecipe() {
   if (formVolume.value === 'custom' && !formCustomVolume.value) {
     ui.showToast('请输入自定义容量')
@@ -971,38 +1046,6 @@ async function saveCurrentRecipe() {
     tags: formTags.value,
   }
 
-  // Dedup check for new recipes (not editing)
-  if (!editingRecipe.value) {
-    const name = formName.value.trim()
-    // Check public library
-    const pubDup = recipeStore.recipes.find(r => r.name === name)
-    // Check personal diary
-    const diaryDup = diaryStore.userDiary.find(d => d.name === name)
-    const dup = pubDup || diaryDup
-    if (dup) {
-      const dupIngs = (dup.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-      const myIngs = cleanIngs.filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-      const identical = dupIngs.length === myIngs.length && dupIngs.every((ing, i) => ing.oil === myIngs[i].oil && ing.drops === myIngs[i].drops)
-      const where = pubDup ? '公共配方库' : '我的配方'
-      if (identical) {
-        ui.showToast(`${where}中已有一模一样的配方「${name}」`)
-        return
-      }
-      // Show difference
-      const existIngs = dupIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-      const newIngs = myIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-      const ok = await showConfirm(
-        `${where}中已有同名配方「${name}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n是否改名后保存？`,
-        { okText: '改名', cancelText: '取消' }
-      )
-      if (!ok) return
-      const newName = await showPrompt('请输入新名称：', name)
-      if (!newName || !newName.trim()) return
-      formName.value = newName.trim()
-      diaryPayload.name = newName.trim()
-    }
-  }
-
   if (editingRecipe.value && editingRecipe.value._diary_id) {
     // Editing an existing diary recipe
     try {
@@ -1016,12 +1059,17 @@ async function saveCurrentRecipe() {
   }
 
   if (editingRecipe.value && editingRecipe.value._id) {
-    // Editing an existing public recipe
+    // Editing an existing public recipe — safety check
+    const mappedIngs = cleanIngs.map(i => ({ oil_name: i.oil, drops: i.drops }))
+    if (mappedIngs.length === 0) {
+      const ok = await showConfirm('配方中没有精油成分，确定保存吗？这将清空所有成分。')
+      if (!ok) return
+    }
     const payload = {
       _id: editingRecipe.value._id,
       _version: editingRecipe.value._version,
       name: formName.value.trim(),
-      ingredients: cleanIngs.map(i => ({ oil_name: i.oil, drops: i.drops })),
+      ingredients: mappedIngs,
       note: formNote.value,
       tags: formTags.value,
     }
@@ -1039,26 +1087,31 @@ async function saveCurrentRecipe() {
   if (auth.canManage) {
     const toPublic = await showConfirm('保存到哪里？', { okText: '公共配方库', cancelText: '个人配方' })
     if (toPublic) {
+      const finalName = await dedupOrSkip(diaryPayload.name, cleanIngs, 'public')
+      if (!finalName) return
       try {
-        const pubPayload = {
+        await recipeStore.saveRecipe({
-          name: formName.value.trim(),
+          name: finalName,
           ingredients: cleanIngs.map(i => ({ oil_name: i.oil, drops: i.drops })),
           note: formNote.value,
           tags: formTags.value,
-        }
+        })
-        await recipeStore.saveRecipe(pubPayload)
         ui.showToast('已添加到公共配方库')
-        closeOverlay()
+        if (!loadNextParsed()) closeOverlay()
       } catch (e) {
         ui.showToast('保存失败: ' + (e.message || '未知错误'))
       }
       return
     }
   }
+  const finalName = await dedupOrSkip(diaryPayload.name, cleanIngs, 'diary')
+  if (!finalName) return
+  diaryPayload.name = finalName
+  formName.value = finalName
   try {
     await diaryStore.createDiary(diaryPayload)
     ui.showToast('已添加到我的配方')
-    closeOverlay()
+    if (!loadNextParsed()) closeOverlay()
   } catch (e) {
     ui.showToast('保存失败: ' + (e.message || '未知错误'))
   }
@@ -1085,25 +1138,143 @@ async function saveParsedRecipe(index) {
 }
 
 async function saveAllParsed() {
-  let saved = 0
+  // Sync current form edits back first
-  for (let i = parsedRecipes.value.length - 1; i >= 0; i--) {
+  syncFormToParsed()
+  const toPublic = auth.canManage && await showConfirm('全部保存到哪里？', { okText: '公共配方库', cancelText: '个人配方' })
+  let saved = 0, skipped = 0
+  for (let i = 0; i < parsedRecipes.value.length; i++) {
     const r = parsedRecipes.value[i]
     if (!r.name.trim() || r.ingredients.length === 0) continue
+    const ings = r.ingredients.map(ing => ({ oil: ing.oil, drops: ing.drops }))
+    const finalName = await checkDupName(r.name.trim(), ings, toPublic ? 'public' : 'diary')
+    if (finalName === false) { skipped++; continue }
     try {
-      await diaryStore.createDiary({
+      if (toPublic) {
-        name: r.name.trim(),
+        await recipeStore.saveRecipe({
-        ingredients: r.ingredients.map(i => ({ oil: i.oil, drops: i.drops })),
+          name: finalName,
-        note: '',
+          ingredients: ings.map(ing => ({ oil_name: ing.oil, drops: ing.drops })),
-        tags: [],
+          note: '',
-      })
+          tags: [],
+        })
+      } else {
+        await diaryStore.createDiary({ name: finalName, ingredients: ings, note: '', tags: [] })
+      }
       saved++
     } catch {}
   }
   parsedRecipes.value = []
-  ui.showToast(`已保存 ${saved} 条配方到我的配方`)
+  parsedCurrentIndex.value = -1
+  ui.showToast(`已保存 ${saved} 条配方到${toPublic ? '公共配方库' : '我的配方'}`)
   closeOverlay()
 }
 
+/** Skip current parsed recipe and load next, or close if none left. */
+function skipCurrentParsed() {
+  if (parsedCurrentIndex.value < 0) return
+  const skipIdx = parsedCurrentIndex.value
+  parsedCurrentIndex.value = -1
+  parsedRecipes.value.splice(skipIdx, 1)
+  if (parsedRecipes.value.length > 0) {
+    const next = Math.min(skipIdx, parsedRecipes.value.length - 1)
+    parsedCurrentIndex.value = next
+    const r = parsedRecipes.value[next]
+    formName.value = r.name
+    const cocoIng = r.ingredients.find(i => i.oil === '椰子油')
+    const eoIngs = r.ingredients.filter(i => i.oil !== '椰子油')
+    formIngredients.value = eoIngs.length > 0
+      ? eoIngs.map(i => ({ ...i, _search: i.oil, _open: false }))
+      : [{ oil: '', drops: 1, _search: '', _open: false }]
+    if (cocoIng) {
+      formCocoRow.value = { oil: '椰子油', drops: cocoIng.drops, _search: '椰子油', _open: false }
+      formVolume.value = 'single'
+    } else {
+      formCocoRow.value = null
+      formVolume.value = ''
+    }
+    ui.showToast('已跳过，请处理下一条')
+  } else {
+    closeOverlay()
+  }
+}
+
+/**
+ * Run dedup check for saveCurrentRecipe. Returns final name or null if should stop.
+ */
+async function dedupOrSkip(name, ings, target) {
+  if (editingRecipe.value) return name
+  const result = await checkDupName(name, ings, target)
+  if (result === false) {
+    if (parsedCurrentIndex.value >= 0) skipCurrentParsed()
+    return null
+  }
+  return result
+}
+
+/** After saving, mark current as done and load next. Returns true if there's a next one. */
+function loadNextParsed() {
+  if (parsedCurrentIndex.value < 0 || parsedRecipes.value.length === 0) return false
+  // Remove the just-saved recipe
+  parsedRecipes.value.splice(parsedCurrentIndex.value, 1)
+  if (parsedRecipes.value.length === 0) {
+    parsedCurrentIndex.value = -1
+    return false
+  }
+  // Load next (same index, or last if was at end)
+  const next = Math.min(parsedCurrentIndex.value, parsedRecipes.value.length - 1)
+  loadParsedIntoForm(next)
+  return true
+}
+
+/** Sync current form edits back to parsedRecipes before switching */
+function syncFormToParsed() {
+  if (parsedCurrentIndex.value < 0) return
+  const r = parsedRecipes.value[parsedCurrentIndex.value]
+  if (!r) return
+  r.name = formName.value
+  // Rebuild ingredients from form (EO + coco)
+  const ings = formIngredients.value.filter(i => i.oil && i.oil !== '椰子油').map(i => ({ oil: i.oil, drops: i.drops }))
+  if (formCocoRow.value && cocoActualDrops.value > 0) {
+    ings.push({ oil: '椰子油', drops: cocoActualDrops.value })
+  }
+  r.ingredients = ings
+}
+
+function loadParsedIntoForm(index) {
+  // Save current edits before switching
+  syncFormToParsed()
+  const r = parsedRecipes.value[index]
+  if (!r) return
+  parsedCurrentIndex.value = index
+  formName.value = r.name
+  const cocoIng = r.ingredients.find(i => i.oil === '椰子油')
+  const eoIngs = r.ingredients.filter(i => i.oil !== '椰子油')
+  formIngredients.value = eoIngs.length > 0
+    ? eoIngs.map(i => ({ ...i, _search: i.oil, _open: false }))
+    : [{ oil: '', drops: 1, _search: '', _open: false }]
+  if (cocoIng) {
+    if (cocoIng._ml) {
+      // Written as ml — use ml volume mode
+      const mlStr = String(cocoIng._ml)
+      const standardMls = ['5', '10', '15', '20', '30']
+      formCocoRow.value = { oil: '椰子油', drops: 0, _search: '椰子油', _open: false }
+      formVolume.value = standardMls.includes(mlStr) ? mlStr : 'custom'
+      if (!standardMls.includes(mlStr)) formCustomVolume.value = cocoIng._ml
+    } else {
+      // Written as drops — use single mode
+      formCocoRow.value = { oil: '椰子油', drops: cocoIng.drops, _search: '椰子油', _open: false }
+      formVolume.value = 'single'
+    }
+  } else {
+    formCocoRow.value = null
+  }
+  formNote.value = ''
+  formTags.value = []
+  if (!cocoIng) formVolume.value = ''
+  if (r.notFound && r.notFound.length > 0) {
+    ui.showToast(`未识别: ${r.notFound.join('、')}`)
+  }
+}
+
 const sharedCount = ref({ adopted: 0, total: 0, adoptedNames: [], pendingNames: [] })
 
 async function loadContribution() {
@@ -1123,6 +1294,11 @@ async function loadContribution() {
 const previewRecipeIndex = ref(null)
 const previewRecipeData = ref(null)
 const showBatchMenu = ref(false)
+const visibleAllTags = computed(() => {
+  const tags = recipeStore.allTags
+  if (auth.canEdit) return tags
+  return tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+})
 const showBatchTagPicker = ref(false)
 const batchTagsSelected = ref([])
 const batchNewTag = ref('')
@@ -1208,10 +1384,29 @@ function editDiaryRecipe(diary) {
   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 }
+  if (coco) {
+    formCocoRow.value = { ...coco, _search: '椰子油', _open: false }
+    const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
+    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) }
+    if (eoDrops > 0 && coco.drops > 0) {
+      const ratio = Math.round(coco.drops / eoDrops)
+      const options = [3,4,5,6,7,8,9,10,12,15,20]
+      formDilution.value = options.reduce((a, b) => Math.abs(b - ratio) < Math.abs(a - ratio) ? b : a)
+    }
+  } else {
+    formCocoRow.value = null
+    formVolume.value = ''
+  }
   formNote.value = diary.note || ''
   formTags.value = [...(diary.tags || [])]
-  calcDilutionFromIngs(diary.ingredients)
   showAddOverlay.value = true
 }
 
@@ -1238,6 +1433,16 @@ function openRecipeDetail(recipe) {
   if (idx >= 0) previewRecipeIndex.value = idx
 }
 
+function getVolumeLabel(ingredients) {
+  const ings = ingredients || []
+  const coco = ings.find(i => i.oil === '椰子油')
+  if (!coco || !coco.drops) return ''
+  const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
+  const ml = totalDrops / 18.6
+  if (ml <= 2) return '单次'
+  return `${Math.round(ml)}ml`
+}
+
 function diaryMatchesPublic(d) {
   const pub = recipeStore.recipes.find(r => r.name === d.name)
   if (!pub) return false
@@ -1247,12 +1452,10 @@ function diaryMatchesPublic(d) {
 }
 
 function getDiaryShareStatus(d) {
-  // Check pending (owned by user in public library, not yet adopted)
+  // Admin/senior_editor share directly — check public match first
-  if (sharedCount.value.pendingNames.includes(d.name)) return 'pending'
-  // Check if public library has same recipe with same content
   if (diaryMatchesPublic(d)) return 'shared'
-  // Check adopted names from audit log
+  // Non-admin: check pending (owned by user, not yet adopted)
-  if (sharedCount.value.adoptedNames.includes(d.name) && diaryMatchesPublic(d)) return 'shared'
+  if (!auth.isAdmin && !auth.canManage && sharedCount.value.pendingNames.includes(d.name)) return 'pending'
   return null
 }
 
@@ -1282,28 +1485,10 @@ async function recommendApprove(recipe) {
 }
 
 async function shareDiaryToPublic(diary) {
-  // Check for duplicates in public library
+  const ings = (diary.ingredients || []).map(i => ({ oil: i.oil, drops: i.drops }))
-  const dup = recipeStore.recipes.find(r => r.name === diary.name)
+  const result = await checkDupName(diary.name, ings, 'public')
-  if (dup) {
+  if (result === false) return
-    const dIngs = (diary.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
+  if (result !== diary.name) diary = { ...diary, name: result }
-    const pIngs = (dup.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-    const identical = dIngs.length === pIngs.length && dIngs.every((ing, i) => ing.oil === pIngs[i].oil && ing.drops === pIngs[i].drops)
-    if (identical) {
-      ui.showToast('公共配方库中已有一模一样的配方「' + diary.name + '」')
-      return
-    }
-    // Same name, different content — show details
-    const existIngs = pIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-    const newIngs = dIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-    const action = await showConfirm(
-      `公共配方库中已有同名配方「${diary.name}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n是否改名后共享？`,
-      { okText: '改名', cancelText: '取消' }
-    )
-    if (!action) return
-    const newName = await showPrompt('请输入新名称：', diary.name)
-    if (!newName || !newName.trim()) return
-    diary = { ...diary, name: newName.trim() }
-  }
 
   const ok = await showConfirm(`将「${diary.name}」共享到公共配方库？`)
   if (!ok) return
@@ -1725,6 +1910,7 @@ watch(() => recipeStore.recipes, () => {
 }
 .share-tag.shared { background: #e8f5e9; color: #2e7d32; }
 .share-tag.pending { background: #fff3e0; color: #e65100; }
+.row-volume { font-size: 10px; color: #b0aab5; white-space: nowrap; }
 
 .review-history { max-height: 300px; overflow-y: auto; }
 .review-log-item {
@@ -1847,25 +2033,18 @@ watch(() => recipeStore.recipes, () => {
   border-color: #7ec6a4;
 }
 
-.parsed-results { margin: 12px 0; }
+.parsed-queue { margin: 12px 0; background: #f8faf8; border: 1.5px solid #d4e8d4; border-radius: 10px; padding: 10px 12px; }
-.parsed-recipe-card {
+.parsed-queue-header { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
-  background: #f8faf8;
+.parsed-queue-label { font-size: 13px; font-weight: 600; color: #2e7d5a; flex: 1; }
-  border: 1.5px solid #d4e8d4;
+.parsed-queue-list { display: flex; flex-wrap: wrap; gap: 6px; }
-  border-radius: 10px;
+.parsed-queue-item {
-  padding: 12px;
+  display: flex; align-items: center; gap: 4px; padding: 4px 10px; border-radius: 8px;
-  margin-bottom: 10px;
+  border: 1.5px solid #e5e4e7; background: #fff; font-size: 12px; cursor: pointer; font-family: inherit;
 }
-.parsed-header { display: flex; gap: 8px; align-items: center; margin-bottom: 8px; }
+.parsed-queue-item.active { border-color: #7ec6a4; background: #e8f5e9; font-weight: 600; }
-.parsed-name { flex: 1; font-weight: 600; }
+.parsed-queue-item:hover { border-color: #d4cfc7; }
-.parsed-ings { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 6px; }
+.parsed-queue-name { color: #3e3a44; max-width: 120px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.parsed-ing {
+.parsed-queue-count { color: #b0aab5; font-size: 11px; }
-  display: flex; align-items: center; gap: 4px;
-  background: #fff; border: 1px solid #e5e4e7; border-radius: 8px; padding: 4px 8px; font-size: 13px;
-}
-.parsed-oil { color: #3e3a44; font-weight: 500; }
-.parsed-ing .form-input-sm { width: 50px; padding: 4px 6px; font-size: 12px; }
-.parsed-warn { color: #e65100; font-size: 12px; margin-bottom: 6px; }
-.parsed-actions { display: flex; gap: 8px; justify-content: center; margin-top: 8px; }
 
 .editor-header { display: flex; align-items: center; gap: 10px; margin-bottom: 12px; }
 .editor-name-input { width: 100%; font-size: 17px; font-weight: 600; border: none; border-bottom: 2px solid #e5e4e7; padding: 6px 0; outline: none; font-family: inherit; background: transparent; color: #3e3a44; }

frontend/src/views/RecipeSearch.vue

@@ -169,12 +169,13 @@ import { ref, computed, onMounted, nextTick, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useAuthStore } from '../stores/auth'
 import { useOilsStore } from '../stores/oils'
-import { useRecipesStore } from '../stores/recipes'
+import { useRecipesStore, EDITOR_ONLY_TAGS } from '../stores/recipes'
 import { useDiaryStore } from '../stores/diary'
 import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
 import RecipeCard from '../components/RecipeCard.vue'
 import RecipeDetailOverlay from '../components/RecipeDetailOverlay.vue'
+import { oilEn } from '../composables/useOilTranslation'
 
 const auth = useAuthStore()
 const oils = useOilsStore()
@@ -238,6 +239,8 @@ onMounted(async () => {
 
 function selectCategory(cat) {
   selectedCategory.value = cat.tag_name || cat.name
+  searchQuery.value = ''
+  reportedMissing.value = false
 }
 
 function slideCat(dir) {
@@ -313,10 +316,14 @@ function expandQuery(q) {
 const exactResults = computed(() => {
   if (!searchQuery.value.trim()) return []
   const q = searchQuery.value.trim().toLowerCase()
+  const isEn = /^[a-zA-Z\s]+$/.test(q)
   return recipeStore.recipes.filter(r => {
     const nameMatch = r.name.toLowerCase().includes(q)
-    const tagMatch = r.tags && r.tags.some(t => t.toLowerCase().includes(q))
+    const enNameMatch = isEn && (r.en_name || '').toLowerCase().includes(q)
-    return nameMatch || tagMatch
+    const oilEnMatch = isEn && r.ingredients.some(ing => (oilEn(ing.oil) || '').toLowerCase().includes(q))
+    const visibleTags = auth.canEdit ? (r.tags || []) : (r.tags || []).filter(t => !EDITOR_ONLY_TAGS.includes(t))
+    const tagMatch = visibleTags.some(t => t.toLowerCase().includes(q))
+    return nameMatch || enNameMatch || oilEnMatch || tagMatch
   }).sort((a, b) => a.name.localeCompare(b.name, 'zh'))
 })
 

frontend/src/views/UserManagement.vue

@@ -30,10 +30,11 @@
             <div class="review-info">
               <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>
+              <span class="biz-status-tag" :class="'biz-' + group.effectiveStatus">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.effectiveStatus] }}</span>
+              <img v-if="group.latest.document && group.latest.document.startsWith('data:image')" :src="group.latest.document" class="biz-doc-preview" @click="showDocFull = group.latest.document" />
             </div>
             <div class="review-actions">
-              <template v-if="group.latest.status === 'pending'">
+              <template v-if="group.effectiveStatus === 'pending'">
                 <button class="btn-sm btn-approve" @click="approveBusiness(group.latest)">通过</button>
                 <button class="btn-sm btn-reject" @click="rejectBusiness(group.latest)">拒绝</button>
               </template>
@@ -111,6 +112,11 @@
     </div>
 
     <div class="user-count">共 {{ users.length }} 个用户</div>
+
+    <!-- Full-size document preview -->
+    <div v-if="showDocFull" class="doc-overlay" @click="showDocFull = null">
+      <img :src="showDocFull" class="doc-full-img" />
+    </div>
   </div>
 </template>
 
@@ -128,6 +134,7 @@ const users = ref([])
 const searchQuery = ref('')
 const filterRole = ref('')
 const translations = ref([])
+const showDocFull = ref(null)
 const businessApps = ref([])
 import { reactive } from 'vue'
 
@@ -141,6 +148,13 @@ const groupedBizApps = computed(() => {
   return Object.values(map).map(g => {
     g.history.sort((a, b) => b.id - a.id)
     g.latest = g.history[0]
+    // Check if user is already verified (from users list)
+    const user = users.value.find(u => (u._id || u.id) === g.user_id)
+    if (user && user.business_verified) {
+      g.effectiveStatus = 'approved'
+    } else {
+      g.effectiveStatus = g.latest.status
+    }
     return reactive(g)
   }).filter(g => g.latest)
 })
@@ -436,6 +450,10 @@ onMounted(() => {
 }
 .biz-reject-reason { color: #c62828; font-size: 11px; }
 .biz-time { color: #bbb; font-size: 11px; margin-left: auto; }
+.biz-doc-preview { width: 60px; height: 60px; object-fit: cover; border-radius: 6px; cursor: pointer; border: 1px solid #e5e4e7; margin-top: 6px; }
+.biz-doc-preview:hover { border-color: #7ec6a4; }
+.doc-overlay { position: fixed; inset: 0; background: rgba(0,0,0,0.7); z-index: 1000; display: flex; align-items: center; justify-content: center; cursor: pointer; }
+.doc-full-img { max-width: 90vw; max-height: 90vh; border-radius: 10px; }
 
 .btn-approve {
   background: #4a9d7e;

frontend/vite.config.js

@@ -1,12 +1,17 @@
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 
+const buildTime = new Date().toLocaleString('en-GB', { timeZone: 'Europe/London', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })
+
 export default defineConfig({
+  define: {
+    __BUILD_TIME__: JSON.stringify(buildTime),
+  },
   plugins: [vue()],
   server: {
     proxy: {
-      '/api': 'http://localhost:8000',
+      '/api': `http://localhost:${process.env.VITE_API_PORT || 8000}`,
-      '/uploads': 'http://localhost:8000'
+      '/uploads': `http://localhost:${process.env.VITE_API_PORT || 8000}`
     }
   },
   build: {