From eedd68d137626f26923eebe5d5a2304dcd53ee32 Mon Sep 17 00:00:00 2001
From: jiangrui <jiangrui@01lb.com.cn>
Date: Fri, 7 Mar 2025 23:21:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/SearchBar.vue      |  8 ++++++-
 frontend/src/stores/resource.ts            | 28 ++++++++++++++--------
 frontend/src/types/index.ts                |  1 +
 frontend/src/views/ResourceList.vue        | 16 +++++++++++--
 frontend/src/views/mobile/Home.vue         |  8 ++++++-
 frontend/src/views/mobile/ResourceList.vue | 18 +++++++++++---
 6 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/SearchBar.vue b/frontend/src/components/SearchBar.vue
index 855fd1f..5d5545d 100644
--- a/frontend/src/components/SearchBar.vue
+++ b/frontend/src/components/SearchBar.vue
@@ -83,10 +83,16 @@ watch(
       keyword.value = newKeyword;
       handleSearch();
     } else {
-      keyword.value = "";
+      keyword.value = resourcStore.keyword;
     }
   }
 );
+watch(
+  () => resourcStore.keyword,
+  (newKeyword) => {
+    keyword.value = newKeyword;
+  }
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/frontend/src/stores/resource.ts b/frontend/src/stores/resource.ts
index 39dc7c0..d3a32a0 100644
--- a/frontend/src/stores/resource.ts
+++ b/frontend/src/stores/resource.ts
@@ -100,12 +100,12 @@ export const useResourceStore = defineStore("resource", {
       pan115: "danger",
       quark: "success",
     },
+    keyword: "",
     resources: lastResource.list,
     lastUpdateTime: lastResource.lastUpdateTime || "",
     shareInfo: {} as ShareInfoResponse,
     resourceSelect: [] as ShareInfo[],
     loading: false,
-    lastKeyWord: "",
     backupPlan: false,
     loadTree: false,
   }),
@@ -123,35 +123,43 @@ export const useResourceStore = defineStore("resource", {
         if (isLoadMore) {
           const list = this.resources.find((x) => x.id === channelId)?.list || [];
           lastMessageId = list[list.length - 1].messageId || "";
+          if (list[list.length - 1].isLastMessage) {
+            ElMessage.warning("没有更多了~");
+            return;
+          }
           if (!lastMessageId) {
             ElMessage.error("当次搜索源不支持加载更多");
             return;
           }
-          keyword = this.lastKeyWord;
+          keyword = this.keyword;
         }
         let { data = [] } = await resourceApi.search(keyword || "", channelId, lastMessageId);
+        this.keyword = keyword || "";
         data = data.filter((item) => item.list.length > 0);
-        this.lastKeyWord = keyword || "";
         if (isLoadMore) {
           const findedIndex = this.resources.findIndex((item) => item.id === data[0]?.id);
           if (findedIndex !== -1) {
             this.resources[findedIndex].list.push(...data[0].list);
           }
           if (data.length === 0) {
-            ElMessage.warning("没有更多了~");
+            const list = this.resources.find((item) => item.id === channelId)?.list;
+            list && list[list.length - 1] && (list[list.length - 1]!.isLastMessage = true);
           }
+          ElMessage.warning("没有更多了~");
         } else {
           this.resources = data.map((item) => ({ ...item, displayList: true }));
+          if (!keyword) {
+            // 获取当前时间字符串 用于存储到本地
+            this.lastUpdateTime = new Date().toLocaleString();
+            localStorage.setItem(
+              "last_resource_list",
+              JSON.stringify({ list: this.resources, lastUpdateTime: this.lastUpdateTime })
+            );
+          }
           if (this.resources.length === 0) {
             ElMessage.warning("未搜索到相关资源");
           }
         }
-        // 获取当前时间字符串 用于存储到本地
-        this.lastUpdateTime = new Date().toLocaleString();
-        localStorage.setItem(
-          "last_resource_list",
-          JSON.stringify({ list: this.resources, lastUpdateTime: this.lastUpdateTime })
-        );
       } catch (error) {
         this.handleError("搜索失败，请重试", null);
       } finally {
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 9337ccb..cb1fb1d 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -10,6 +10,7 @@ export interface ResourceItem {
   pubDate: string;
   cloudType: string;
   messageId?: string;
+  isLastMessage?: boolean;
 }
 
 export interface Resource {
diff --git a/frontend/src/views/ResourceList.vue b/frontend/src/views/ResourceList.vue
index 7ae9970..c2aa829 100644
--- a/frontend/src/views/ResourceList.vue
+++ b/frontend/src/views/ResourceList.vue
@@ -142,7 +142,7 @@ import ResourceSelect from "@/components/Home/ResourceSelect.vue";
 import ResourceTable from "@/components/Home/ResourceTable.vue";
 import { formattedFileSize } from "@/utils/index";
 import type { ResourceItem, TagColor } from "@/types";
-
+import { onMounted, onBeforeUnmount } from "vue";
 import ResourceCard from "@/components/Home/ResourceCard.vue";
 import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
@@ -212,8 +212,20 @@ const handleLoadMore = (channelId: string) => {
 };
 
 const searchMovieforTag = (tag: string) => {
-  router.push({ path: "/", query: { keyword: tag } });
+  router.push({ path: "/resource", query: { keyword: tag } });
 };
+// 页面进入 设置缓存的数据源
+onMounted(() => {
+  const lastResourceList = localStorage.getItem("last_resource_list");
+  if (lastResourceList) {
+    resourceStore.resources = JSON.parse(lastResourceList).list;
+  }
+});
+
+// 页面销毁 清除搜索词
+onBeforeUnmount(() => {
+  resourceStore.keyword = "";
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/frontend/src/views/mobile/Home.vue b/frontend/src/views/mobile/Home.vue
index 665e627..9e58854 100644
--- a/frontend/src/views/mobile/Home.vue
+++ b/frontend/src/views/mobile/Home.vue
@@ -81,10 +81,16 @@ watch(
       searchForm.value.keyword = keyword;
       handleSearch();
     } else {
-      searchForm.value.keyword = "";
+      searchForm.value.keyword = resourceStore.keyword;
     }
   }
 );
+watch(
+  () => resourceStore.keyword,
+  (newKeyword) => {
+    searchForm.value.keyword = newKeyword;
+  }
+);
 
 // 方法定义
 const handleSearch = async () => {
diff --git a/frontend/src/views/mobile/ResourceList.vue b/frontend/src/views/mobile/ResourceList.vue
index d166d2b..78a3954 100644
--- a/frontend/src/views/mobile/ResourceList.vue
+++ b/frontend/src/views/mobile/ResourceList.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onMounted, onUnmounted, computed } from "vue";
+import { ref, watch, onMounted, onUnmounted, computed, onBeforeUnmount } from "vue";
 import { useRouter } from "vue-router";
 import { showToast } from "vant";
 import { useResourceStore } from "@/stores/resource";
@@ -223,14 +223,14 @@ const searchMovieforTag = (tag: string) => {
 // 使用节流包装加载更多函数
 const throttledLoadMore = throttle((channelId: string) => {
   resourceStore.searchResources("", true, channelId);
-}, 200);
+}, 2000);
 
 // 滚动加载
 const doScroll = () => {
   const appElement = document.querySelector("#app") as HTMLElement;
   if (appElement) {
     const { scrollHeight, scrollTop, clientHeight } = appElement;
-    if (scrollHeight - (clientHeight + scrollTop) <= 200) {
+    if (scrollHeight - (clientHeight + scrollTop) <= 10) {
       throttledLoadMore(currentTab.value);
     }
   }
@@ -258,6 +258,18 @@ watch(currentTab, () => {
     appElement.scrollTo(0, 0);
   }
 });
+// 页面进入 设置缓存的数据源
+onMounted(() => {
+  const lastResourceList = localStorage.getItem("last_resource_list");
+  if (lastResourceList) {
+    resourceStore.resources = JSON.parse(lastResourceList).list;
+  }
+});
+
+// 页面销毁 清除搜索词
+onBeforeUnmount(() => {
+  resourceStore.keyword = "";
+});
 </script>
 
 <style lang="scss" scoped>