hera/oil-formula-calculator
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: 新功能改进 #20

Merged
hera merged 57 commits from feat/next-improvements into main 2026-04-10 20:30:37 +00:00
Conversation 60 Commits 57 Files Changed 18 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97c53bb3c3 - Show all commits

2
frontend/src/components/RecipeDetailOverlay.vue
View File

@@ -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>

2
frontend/src/views/MyDiary.vue
View File

@@ -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)
}