4 Commits

Author SHA1 Message Date
955512d344 feat: 未登录用户也显示二维码上传提示,点击时引导登录/注册
Some checks failed
PR Preview / teardown-preview (pull_request) Has been skipped
PR Preview / test (pull_request) Successful in 4s
Test / unit-test (push) Successful in 5s
Test / build-check (push) Successful in 4s
PR Preview / deploy-preview (pull_request) Successful in 12s
Test / e2e-test (push) Failing after 1m8s
2026-04-07 22:25:10 +00:00
81ec5987b3 feat: 配方卡片加入上传个人二维码功能
- 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 22:25:10 +00:00
70413971e3 Merge pull request 'dev' (#2) from dev into main
Some checks failed
Deploy Production / test (push) Successful in 5s
Test / unit-test (push) Successful in 5s
Test / build-check (push) Successful in 3s
Deploy Production / deploy (push) Successful in 5s
Test / e2e-test (push) Failing after 1m7s
Reviewed-on: #2
2026-04-07 22:12:00 +00:00
fam
7ba1e28370 Merge pull request 'Refactor: 前端重构为 Vue 3 + Vite + Pinia + Cypress E2E' (#1) from dev into main
Reviewed-on: #1
2026-04-06 19:22:19 +00:00
2 changed files with 1 additions and 13 deletions

View File

@@ -119,7 +119,7 @@ async function submit() {
position: fixed; position: fixed;
inset: 0; inset: 0;
background: rgba(0, 0, 0, 0.35); background: rgba(0, 0, 0, 0.35);
z-index: 6000; z-index: 5000;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

View File

@@ -36,17 +36,6 @@
>English</button> >English</button>
</div> </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 --> <!-- QR / brand upload hint -->
<div v-if="showBrandHint" class="brand-upload-hint"> <div v-if="showBrandHint" class="brand-upload-hint">
<span class="hint-icon"></span> <span class="hint-icon"></span>
@@ -393,7 +382,6 @@ const viewMode = ref('card')
const cardRef = ref(null) const cardRef = ref(null)
const cardImageUrl = ref(null) const cardImageUrl = ref(null)
const cardLang = ref('zh') const cardLang = ref('zh')
const selectedCardVolume = ref('单次')
const showTranslationEditor = ref(false) const showTranslationEditor = ref(false)
const customRecipeNameEn = ref('') const customRecipeNameEn = ref('')
const customOilNameEn = ref({}) const customOilNameEn = ref({})