merge

src/components/Lottery.vue

@@ -357,6 +357,7 @@ onUnmounted(() => {
   position: absolute;
   width: 100%;
   height: 100%;
+  top: -14vw;
   transform-style: preserve-3d;
 }
 

src/components/PhotoSquare.vue

@@ -393,6 +393,7 @@ const getBackgroundImage = (item) => {
   font-size: 3vw;
   width: 100%;
   padding: 0 4vw;
+  left: 2vw;
 }
 .flex-container {
   display: flex;

src/components/TodoList.vue

@@ -129,15 +129,15 @@ const openHaibao = async (e) => {
   url.searchParams.append('my_only', '1');
   url.searchParams.append('page', '1');
   url.searchParams.append('per_page', '100');
-  if (!globalStore.result_url && !mergeId) {
   fetch(url.toString(), {
     method: 'GET',
     headers: {
       'Authorization': `Bearer ${Storage.get("userinfos").api_token}`
     }
   })
-      .then(response => response.json())
-      .then(data => {
+    .then(async response => {
+      const data = await response.json()
+      if (response.status == 200 || response.status == 201) {
         const foundItem = data.data.find(item => item.is_public === true);
         if (foundItem) {
           globalStore.result_url = foundItem.result_url;
@@ -153,15 +153,13 @@ const openHaibao = async (e) => {
           return weui.alert("请先参与活动合成图片并打榜！")
         }
         return { success: true, data };
+      } else {
+        ElMessage.error(data.message);
+      }
     })
     .catch((error) => {
-        console.error('Error:', error);
       return { success: false, error };
     });
-  } else {
-    haibaoShow.value = true
-    handleHaibao()
-  }
 }
 const openPeifang = (e) => {
   const target = e.currentTarget