From de89ccebac56a127b7a68589d2bcea87b4d4f44a Mon Sep 17 00:00:00 2001
From: Hera Zhao <hera@euphon.net>
Date: Sat, 11 Apr 2026 18:04:03 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B2=BE=E6=B2=B9=E6=8E=92=E5=BA=8F+?=
 =?UTF-8?q?=E5=AE=B9=E9=87=8F=E6=98=BE=E7=A4=BA+=E5=85=B1=E4=BA=AB?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81+=E6=B3=A8=E5=86=8C=E6=97=A5=E5=BF=97+?=
 =?UTF-8?q?=E9=98=B2=E8=AF=AF=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 配方卡片精油按字母排序
- 配方卡片显示容量（单次/Xml）
- 管理员共享直接显示已共享
- 编辑overlay不会误关（去掉backdrop点击关闭）
- 注册记入活动日志
- 轮播分类已按tag_name匹配

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 backend/main.py                        |  2 ++
 frontend/src/components/RecipeCard.vue | 20 +++++++++++++++++++-
 frontend/src/views/AuditLog.vue        |  1 +
 frontend/src/views/RecipeManager.vue   | 10 ++++------
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/backend/main.py b/backend/main.py
index 275bd84..cfcb282 100644
--- a/backend/main.py
+++ b/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()
diff --git a/frontend/src/components/RecipeCard.vue b/frontend/src/components/RecipeCard.vue
index 5471295..d3420f6 100644
--- a/frontend/src/components/RecipeCard.vue
+++ b/frontend/src/components/RecipeCard.vue
@@ -5,6 +5,7 @@
       <span v-for="tag in visibleTags" :key="tag" class="tag" :class="{ 'tag-reviewed': tag === '已审核' }">{{ tag }}</span>
     </div>
     <div class="recipe-card-oils">{{ oilNames }}</div>
+    <span v-if="volumeLabel" class="recipe-card-volume">{{ volumeLabel }}</span>
     <div class="recipe-card-bottom">
       <div class="recipe-card-price">💰 {{ priceInfo.cost }}</div>
       <button
@@ -41,10 +42,20 @@ const visibleTags = computed(() => {
 })
 
 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>
@@ -98,6 +109,13 @@ const isFav = computed(() => recipesStore.isFavorite(props.recipe))
   line-height: 1.7;
 }
 
+.recipe-card-volume {
+  font-size: 10px;
+  color: #b0aab5;
+  display: block;
+  margin-bottom: 4px;
+}
+
 .recipe-card-bottom {
   display: flex;
   justify-content: space-between;
diff --git a/frontend/src/views/AuditLog.vue b/frontend/src/views/AuditLog.vue
index 71a9034..294965b 100644
--- a/frontend/src/views/AuditLog.vue
+++ b/frontend/src/views/AuditLog.vue
@@ -96,6 +96,7 @@ const ACTION_MAP = {
   reject_business: '拒绝商业认证',
   grant_business: '开通商业认证',
   revoke_business: '撤销商业认证',
+  register: '用户注册',
 }
 
 const actionTypes = [
diff --git a/frontend/src/views/RecipeManager.vue b/frontend/src/views/RecipeManager.vue
index d28c917..8513a6c 100644
--- a/frontend/src/views/RecipeManager.vue
+++ b/frontend/src/views/RecipeManager.vue
@@ -178,7 +178,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>
@@ -1312,12 +1312,10 @@ function diaryMatchesPublic(d) {
 }
 
 function getDiaryShareStatus(d) {
-  // Check pending (owned by user in public library, not yet adopted)
-  if (sharedCount.value.pendingNames.includes(d.name)) return 'pending'
-  // Check if public library has same recipe with same content
+  // Admin/senior_editor share directly — check public match first
   if (diaryMatchesPublic(d)) return 'shared'
-  // Check adopted names from audit log
-  if (sharedCount.value.adoptedNames.includes(d.name) && diaryMatchesPublic(d)) return 'shared'
+  // Non-admin: check pending (owned by user, not yet adopted)
+  if (!auth.isAdmin && !auth.canManage && sharedCount.value.pendingNames.includes(d.name)) return 'pending'
   return null
 }