update

src/components/TodoList.vue

@@ -39,6 +39,7 @@ const props = defineProps({
   show: false,
 })
 
+let mergeId = ''
 const emit = defineEmits(['close', 'open'])
 const shareShow = ref(false)
 const qiweiShow = ref(false)
@@ -49,8 +50,6 @@ const userhaibaoCover = computed(() => {
   return { backgroundImage: `url(${userHaibaoUrl.value})` }
 })
 
-
-
 const handleHaibao = async () => {
   if (haibaoUrl.value) {
     return
@@ -70,7 +69,7 @@ const handleHaibao = async () => {
       userHaibaoUrl.value = url
 
       const haibaoSave = new Haibao(1080, 2160)
-      const qrcode = await generateQR(`fromid=${infos.invite_code}&org_id=${infos.org_id}`, 200, 200)
+      const qrcode = await generateQR(`fromid=${infos.invite_code}&org_id=${infos.org_id}&merge_id=${mergeId}}`, 200, 200)
       haibaoSave.add(bg, 0, 0)
       haibaoSave.add(url, 64, 250)
       haibaoSave.add(qrcode, 115, 1875)
@@ -136,6 +135,7 @@ const openHaibao = (e) => {
       const foundItem = data.data.find(item => item.is_public === true);
       if (foundItem) {
         globalStore.result_url = foundItem.result_url;
+        mergeId = foundItem.id;
         haibaoShow.value = true
         handleHaibao()
       } else {