Merge branch 'dev' into feature/qr-upload-hint

# Conflicts: # frontend/src/components/RecipeDetailOverlay.vue
Raise LoginModal z-index above recipe overlay
2026-04-07 22:25:15 +00:00 · 2026-04-07 22:19:48 +00:00 · 2026-04-07 22:13:42 +00:00 · 2026-04-07 21:58:17 +00:00
2 changed files with 13 additions and 1 deletions
--- a/frontend/src/components/LoginModal.vue
+++ b/frontend/src/components/LoginModal.vue
@@ -119,7 +119,7 @@ async function submit() {
  position: fixed;
  inset: 0;
  background: rgba(0, 0, 0, 0.35);
-  z-index: 5000;
+  z-index: 6000;
  display: flex;
  align-items: center;
  justify-content: center;
--- a/frontend/src/components/RecipeDetailOverlay.vue
+++ b/frontend/src/components/RecipeDetailOverlay.vue
@@ -36,6 +36,17 @@
          >English</button>
        </div>

+        <!-- Volume selector -->
+        <div class="volume-controls card-volume-controls">
+          <button
+            v-for="(drops, ml) in VOLUME_DROPS"
+            :key="ml"
+            class="volume-btn"
+            :class="{ active: selectedCardVolume === ml }"
+            @click="onCardVolumeChange(ml)"
+          >{{ ml === '单次' ? '单次' : ml + 'ml' }}</button>
+        </div>
+
        <!-- QR / brand upload hint -->
        <div v-if="showBrandHint" class="brand-upload-hint">
          <span class="hint-icon">✨</span>
@@ -382,6 +393,7 @@ const viewMode = ref('card')
 const cardRef = ref(null)
 const cardImageUrl = ref(null)
 const cardLang = ref('zh')
+const selectedCardVolume = ref('单次')
 const showTranslationEditor = ref(false)
 const customRecipeNameEn = ref('')
 const customOilNameEn = ref({})
Author	SHA1	Message	Date
Hera Zhao	7599599910	Merge branch 'dev' into feature/qr-upload-hint Some checks failed PR Preview / teardown-preview (pull_request) Has been skipped Details Test / e2e-test (push) Has been cancelled Details Test / build-check (push) Has been cancelled Details Test / unit-test (push) Has been cancelled Details PR Preview / test (pull_request) Successful in 4s Details PR Preview / deploy-preview (pull_request) Successful in 14s Details # Conflicts: # frontend/src/components/RecipeDetailOverlay.vue	2026-04-07 22:25:15 +00:00
Hera Zhao	846058fa0f	Raise LoginModal z-index above recipe overlay Some checks failed Test / unit-test (push) Successful in 4s Details Test / build-check (push) Successful in 4s Details Test / e2e-test (push) Failing after 1m5s Details Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 22:19:48 +00:00
YoYo	08c2d5bd75	feat: 未登录用户也显示二维码上传提示，点击时引导登录/注册 Some checks failed PR Preview / teardown-preview (pull_request) Has been skipped Details Test / unit-test (push) Successful in 5s Details Test / build-check (push) Successful in 4s Details PR Preview / test (pull_request) Successful in 4s Details PR Preview / deploy-preview (pull_request) Successful in 13s Details Test / e2e-test (push) Failing after 1m7s Details	2026-04-07 22:13:42 +00:00
YoYo	7030dd107c	feat: 配方卡片加入上传个人二维码功能 Some checks failed Test / unit-test (push) Successful in 5s Details Test / build-check (push) Successful in 4s Details PR Preview / teardown-preview (pull_request) Has been skipped Details Test / e2e-test (push) Failing after 1m8s Details PR Preview / test (pull_request) Successful in 5s Details PR Preview / deploy-preview (pull_request) Successful in 13s Details - RecipeDetailOverlay: 未上传二维码/背景图时，卡片上方显示提示横幅，下方出现「上传我的二维码」按钮，点击跳转到 MyDiary 品牌设置页并记录来源配方 - MyDiary: 新增二维码图片上传区域（直接上传图片文件，存为 base64 → PUT /api/brand qr_code 字段）；上传成功后若有待返回配方则自动跳回配方卡片；修复 loadBrandSettings 字段名与后端不一致的问题 - RecipeSearch: 支持 ?openRecipe= 查询参数，页面挂载时自动打开指定配方卡片，实现从 MyDiary 上传后无缝返回 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-07 21:58:17 +00:00