diff --git a/src/components/HomePage.vue b/src/components/HomePage.vue index 4ce80aa..12216d9 100644 --- a/src/components/HomePage.vue +++ b/src/components/HomePage.vue @@ -338,9 +338,7 @@ globalToastEvent.on(ToastType.SHOW_LOTTERY, () => { }) watch(() => lotteryShow.value, async (newVal) => { - if (newVal) { - initUserGameInfos(true, true) - } + initUserGameInfos(true, true) }, { immediate: true }) diff --git a/src/components/Lottery.vue b/src/components/Lottery.vue index 48b5a58..6658986 100644 --- a/src/components/Lottery.vue +++ b/src/components/Lottery.vue @@ -357,6 +357,7 @@ onUnmounted(() => { position: absolute; width: 100%; height: 100%; + top: -14vw; transform-style: preserve-3d; } diff --git a/src/components/PhotoSquare.vue b/src/components/PhotoSquare.vue index 4f3d4d4..5766ae4 100644 --- a/src/components/PhotoSquare.vue +++ b/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; diff --git a/src/components/TodoList.vue b/src/components/TodoList.vue index ad8d941..ac0359c 100644 --- a/src/components/TodoList.vue +++ b/src/components/TodoList.vue @@ -129,42 +129,37 @@ 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}` + fetch(url.toString(), { + method: 'GET', + headers: { + 'Authorization': `Bearer ${Storage.get("userinfos").api_token}` + } + }) + .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; + mergeId = foundItem.id; + haibaoShow.value = true + + if (!globalStore.first_share_today) { + Request(`face/share/${mergeId}`) + } + + handleHaibao() + } else { + return weui.alert("请先参与活动合成图片并打榜!") + } + return { success: true, data }; + } else { + ElMessage.error(data.message); } }) - .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; - mergeId = foundItem.id; - haibaoShow.value = true - - if (!globalStore.first_share_today) { - Request(`face/share/${mergeId}`) - } - - handleHaibao() - } else { - return weui.alert("请先参与活动合成图片并打榜!") - } - return { success: true, data }; - } else { - ElMessage.error(data.message); - } - }) - .catch((error) => { - return { success: false, error }; - }); - } else { - haibaoShow.value = true - handleHaibao() - } + .catch((error) => { + return { success: false, error }; + }); } const openPeifang = (e) => { const target = e.currentTarget