diff --git a/src/contentScripts/views/Anime/Anime.vue b/src/contentScripts/views/Anime/Anime.vue index d13660ea..095fbb79 100644 --- a/src/contentScripts/views/Anime/Anime.vue +++ b/src/contentScripts/views/Anime/Anime.vue @@ -40,6 +40,8 @@ function initPageAction() { recommendAnimeList.length = 0 popularAnimeList.length = 0 cursor.value = 0 + noMoreContent.value = false + noMoreContentWarning.value = false getAnimeWatchList() getPopularAnimeList() getRecommendAnimeList() diff --git a/src/contentScripts/views/Favorites/Favorites.vue b/src/contentScripts/views/Favorites/Favorites.vue index 5201ba2e..dc5a2d91 100644 --- a/src/contentScripts/views/Favorites/Favorites.vue +++ b/src/contentScripts/views/Favorites/Favorites.vue @@ -42,6 +42,8 @@ function initPageAction() { return favoriteResources.length = 0 currentPageNum.value = 1 + noMoreContent.value = false + noMoreContentWarning.value = false handleSearch() } } diff --git a/src/contentScripts/views/History/History.vue b/src/contentScripts/views/History/History.vue index 7588819a..aed379fd 100644 --- a/src/contentScripts/views/History/History.vue +++ b/src/contentScripts/views/History/History.vue @@ -42,6 +42,8 @@ function initPageAction() { handlePageRefresh.value = () => { historyList.length = 0 currentPageNum.value = 1 + noMoreContent.value = false + noMoreContentWarning.value = false getHistoryList() } } diff --git a/src/contentScripts/views/Home/components/ForYou.vue b/src/contentScripts/views/Home/components/ForYou.vue index f4415ff5..f7f436a3 100644 --- a/src/contentScripts/views/Home/components/ForYou.vue +++ b/src/contentScripts/views/Home/components/ForYou.vue @@ -13,24 +13,34 @@ const needToLoginFirst = ref(false) const containerRef = ref() as Ref const refreshIdx = ref(1) const noMoreContent = ref(false) +const noMoreContentWarning = ref(false) const { handleReachBottom, handlePageRefresh } = useBewlyApp() function initPageAction() { handleReachBottom.value = async () => { - if (!isLoading.value) { - if (settings.value.recommendationMode === 'web') { - getRecommendVideos() - } - else { - for (let i = 0; i < 3; i++) - await getAppRecommendVideos() - } + if (isLoading.value) + return + if (noMoreContent.value) { + noMoreContentWarning.value = true + return + } + if (settings.value.recommendationMode === 'web') { + getRecommendVideos() + } + else { + for (let i = 0; i < 3; i++) + await getAppRecommendVideos() } } handlePageRefresh.value = async () => { + if (isLoading.value) + return + videoList.length = 0 appVideoList.length = 0 + noMoreContent.value = false + noMoreContentWarning.value = false if (settings.value.recommendationMode === 'web') { await getRecommendVideos() } @@ -75,9 +85,6 @@ onActivated(() => { }) async function getRecommendVideos() { - if (noMoreContent.value) - return - isLoading.value = true try { const response: forYouResult = await browser.runtime.sendMessage({ @@ -217,6 +224,9 @@ function jumpToLoginPage() { + + +