From 756832f3003eb5acf8403b9d903f3396459e2e85 Mon Sep 17 00:00:00 2001
From: xiaoaojiao <h.yingzi@gmail.com>
Date: Fri, 19 Sep 2025 10:09:49 +0800
Subject: [PATCH] merge

---
 src/components/HomePage.vue | 6 ++----
 src/components/TodoList.vue | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/HomePage.vue b/src/components/HomePage.vue
index 4ce80aa..f8e3f6d 100644
--- a/src/components/HomePage.vue
+++ b/src/components/HomePage.vue
@@ -310,7 +310,7 @@ const initUserGameInfos = async (refresh_official, refresh_cap_scan) => {
 const handleLoginSuccess = async () => {
   console.log("已登录")
   loginShow.value = false
-  console.log(111)
+
   await initUserGameInfos(true, true)
 }
 
@@ -338,9 +338,7 @@ globalToastEvent.on(ToastType.SHOW_LOTTERY, () => {
 })
 
 watch(() => lotteryShow.value, async (newVal) => {
-  if (newVal) {
-    initUserGameInfos(true, true)
-  }
+  initUserGameInfos(true, true);
 }, { immediate: true })
 
 </script>
diff --git a/src/components/TodoList.vue b/src/components/TodoList.vue
index 0a2378c..20f6b61 100644
--- a/src/components/TodoList.vue
+++ b/src/components/TodoList.vue
@@ -129,7 +129,7 @@ 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) {
+  if (!globalStore.result_url && !mergeId) {
     fetch(url.toString(), {
       method: 'GET',
       headers: {