From 97c53bb3c32bafc472f15fecb34ed7eadc2fa85d Mon Sep 17 00:00:00 2001
From: Hera Zhao <hera@euphon.net>
Date: Fri, 10 Apr 2026 18:10:43 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=E5=86=85=E5=AE=B9=E5=8C=BA=E5=9F=9F=20+=20=E8=A3=81?=
 =?UTF-8?q?=E5=89=AA=E6=8F=90=E7=A4=BA=E7=B2=BE=E7=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- QR位置改为top:36px right:36px，与内容padding对齐
- doTERRA行和二维码顶端齐平
- 裁剪提示精简为一行

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 frontend/src/components/RecipeDetailOverlay.vue | 2 +-
 frontend/src/views/MyDiary.vue                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/RecipeDetailOverlay.vue b/frontend/src/components/RecipeDetailOverlay.vue
index d18b8fe..ff569a3 100644
--- a/frontend/src/components/RecipeDetailOverlay.vue
+++ b/frontend/src/components/RecipeDetailOverlay.vue
@@ -52,7 +52,7 @@
           <!-- Background image overlay -->
           <div v-if="brand.brand_bg" style="position:absolute;inset:0;width:100%;height:100%;background-size:cover;background-position:center;opacity:0.12;pointer-events:none;z-index:0" :style="{ backgroundImage: `url('${brand.brand_bg}')` }"></div>
           <!-- QR: top-right -->
-          <div v-if="brand.qr_code" style="position:absolute;top:20px;right:0;display:flex;flex-direction:column;gap:3px;z-index:3" :style="{ alignItems: (brand.brand_align === 'left' ? 'flex-start' : brand.brand_align === 'right' ? 'flex-end' : 'center') }">
+          <div v-if="brand.qr_code" style="position:absolute;top:36px;right:36px;display:flex;flex-direction:column;gap:3px;z-index:3" :style="{ alignItems: (brand.brand_align === 'left' ? 'flex-start' : brand.brand_align === 'right' ? 'flex-end' : 'center') }">
             <img :src="brand.qr_code" crossorigin="anonymous" style="width:54px;height:54px;object-fit:cover;border-radius:6px;box-shadow:0 2px 6px rgba(0,0,0,0.1)" />
             <div v-if="brand.brand_name" :style="{ textAlign: brand.brand_align || 'center' }" style="font-size:7px;color:var(--text-light);line-height:1.3;max-width:68px;white-space:pre-line">{{ brand.brand_name }}</div>
           </div>
diff --git a/frontend/src/views/MyDiary.vue b/frontend/src/views/MyDiary.vue
index eab7235..8d2f865 100644
--- a/frontend/src/views/MyDiary.vue
+++ b/frontend/src/views/MyDiary.vue
@@ -610,7 +610,7 @@ async function handleUpload(type, event) {
       const isSquare = await checkSquare(base64)
       if (!isSquare) {
         const { showConfirm: confirm } = await import('../composables/useDialog')
-        const ok = await confirm('二维码图片不是正方形，是否自动裁剪为正方形？\n（取中心区域）')
+        const ok = await confirm('图片非正方形，自动裁剪？')
         if (ok) {
           base64 = await cropToSquare(base64)
         }