From e911372e208ddd1bf5abc2ac3a221eb4892b7d69 Mon Sep 17 00:00:00 2001 From: yixu Date: Fri, 19 Sep 2025 17:46:37 +0800 Subject: [PATCH] update --- src/components/MyPhoto.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/MyPhoto.vue b/src/components/MyPhoto.vue index 6cb5dd7..7de8987 100644 --- a/src/components/MyPhoto.vue +++ b/src/components/MyPhoto.vue @@ -39,6 +39,7 @@ const fetchImages = async () => { const foundItem = data.data.find(item => item.is_public === true); if (foundItem) { globalStore.result_url = foundItem.result_url; + globalStore.mergeId = foundItem.id displayZhuli.value = true; } else { displayZhuli.value = false; @@ -76,7 +77,7 @@ import defaultBorderImage from '../assets/images/my-photo-border.webp'; import activeBorderImage from '../assets/images/my-photo-selected-border.webp'; const activeBorders = ref(images.value.map(() => false)); -let mergeId = ''; +let mergeId = globalStore.mergeId; // 切换边框状态 const toggleBorder = (item, index) => { activeBorders.value = activeBorders.value.map(() => false); @@ -205,7 +206,7 @@ const handleHaibao = async (item) => { userHaibaoUrl.value = url const haibaoSave = new Haibao(1080, 2160) - const qrcode = await generateQR(`fromid=${infos.invite_code}&merge_id=${infos.merge_id}`, 200, 200) + const qrcode = await generateQR(`fromid=${infos.invite_code}&merge_id=${mergeId}`, 200, 200) haibaoSave.add(bg, 0, 0) haibaoSave.add(url, 64, 250) haibaoSave.add(qrcode, 115, 1875) @@ -247,7 +248,7 @@ const handleHaibao = async (item) => { haibaoCoverNoTitle.draw('destination-in').then(() => { haibaoCoverNoTitle.generate({ mimeType: 'image/png' }).then(async (url) => { const haibaoSaveNoTitle = new Haibao(1080, 2160) - const qrcode = await generateQR(`fromid=${infos.invite_code}&merge_id=${infos.merge_id}`, 200, 200) + const qrcode = await generateQR(`fromid=${infos.invite_code}&merge_id=${mergeId}`, 200, 200) haibaoSaveNoTitle.add(bg, 0, 0) haibaoSaveNoTitle.add(url, 64, 250) haibaoSaveNoTitle.add(qrcode, 115, 1875)