From d4cbc2c562aa23803786bf839b5990f3d01efae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=82=85=E5=85=89=E5=AD=9F?= <fgmfjf@163.com>
Date: Thu, 12 Feb 2026 22:33:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=92=8C=E5=88=86=E9=A1=B5=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/foreign/index.vue     | 33 +++++++++++++++++++++++---
 src/pages/macroscopic/index.vue | 38 +++++++++++++++++++++++++----
 src/pages/recommend/index.vue   | 42 ++++++++++++++++++++++++++++-----
 3 files changed, 99 insertions(+), 14 deletions(-)

diff --git a/src/pages/foreign/index.vue b/src/pages/foreign/index.vue
index 60a5b78..977b363 100644
--- a/src/pages/foreign/index.vue
+++ b/src/pages/foreign/index.vue
@@ -75,6 +75,15 @@
           </view>
         </view>
       </view>
+      <u-loading-icon
+        v-if="!isBottom && loading"
+        mode="circle"
+        text="加载中..."
+        textSize="26rpx"
+        textColor="#999999"
+        color="rgba(23, 119, 255, 1)"
+        size="28rpx"
+      ></u-loading-icon>
     </view>
 
     <!-- 登录弹窗 start -->
@@ -91,8 +100,9 @@
 <script setup lang="ts">
 import { getForeignList } from "@/api";
 import { useUserStore } from "@/stores/user";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import LoginDialog from "@/components/loginPopup/index.vue";
+import { onReachBottom } from "@dcloudio/uni-app";
 
 // 导航栏路由返回
 const handleBack = () => {
@@ -143,23 +153,40 @@ function goDetail(item: any) {
 }
 
 const data = ref([]);
+const loading = ref(false);
+const keyword = ref("");
+const isBottom = ref(false);
+const pages = reactive({
+  page: 1,
+  size: 20,
+  total: 0,
+});
 const getList = async () => {
   const result = await getForeignList({
     keyword: keyword.value,
+    page: pages.page,
+    size: pages.size,
   });
   if (result.code === 200) {
     const { list, total } = result.data;
-    data.value = list;
+    data.value = [...data.value, ...list];
+    pages.total = Math.ceil(total / pages.size);
+    isBottom.value = pages.page >= pages.total;
   } else {
     data.value = [];
   }
 };
 
-const keyword = ref("");
 const handleSearch = () => {
   getList();
 };
 
+onReachBottom(() => {
+  if (isBottom.value) return;
+  pages.page++;
+  getList();
+});
+
 onMounted(async () => {
   if (!userStore.isLogin) {
     handleShowLogin();
diff --git a/src/pages/macroscopic/index.vue b/src/pages/macroscopic/index.vue
index 5f9b68d..2485341 100644
--- a/src/pages/macroscopic/index.vue
+++ b/src/pages/macroscopic/index.vue
@@ -16,8 +16,7 @@
     <!-- 标题 end -->
 
     <view class="page-main">
-      <u-loading-icon v-if="loading"></u-loading-icon>
-      <view class="news-list" v-else-if="data?.length > 0">
+      <view class="news-list" v-if="data?.length > 0">
         <template v-for="(item, index) in data" :key="index">
           <view
             :class="['news-item', { mask: !userStore.isLogin }]"
@@ -42,6 +41,15 @@
         </template>
       </view>
       <u-empty v-else />
+      <u-loading-icon
+        v-if="!isBottom && loading"
+        mode="circle"
+        text="加载中..."
+        textSize="26rpx"
+        textColor="#999999"
+        color="rgba(23, 119, 255, 1)"
+        size="28rpx"
+      ></u-loading-icon>
     </view>
     <!-- 登录弹窗 start -->
     <LoginDialog
@@ -57,8 +65,9 @@
 <script setup lang="ts">
 import { getMacroList } from "@/api";
 import { useUserStore } from "@/stores/user";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import LoginDialog from "@/components/loginPopup/index.vue";
+import { onReachBottom } from "@dcloudio/uni-app";
 // 导航栏路由返回
 const handleBack = () => {
   uni.navigateBack({
@@ -109,18 +118,37 @@ function goDetail(item: any) {
 
 const data = ref([]);
 const loading = ref(false);
+const keyword = ref("");
+const isBottom = ref(false);
+const pages = reactive({
+  page: 1,
+  size: 20,
+  total: 0,
+});
 const getList = async () => {
   loading.value = true;
-  const result = await getMacroList({});
+  const result = await getMacroList({
+    keyword: keyword.value,
+    page: pages.page,
+    size: pages.size,
+  });
   loading.value = false;
   if (result.code === 200) {
     const { list, total } = result.data;
-    data.value = list;
+    data.value = [...data.value, ...list];
+    pages.total = Math.ceil(total / pages.size);
+    isBottom.value = pages.page >= pages.total;
   } else {
     data.value = [];
   }
 };
 
+onReachBottom(() => {
+  if (isBottom.value) return;
+  pages.page++;
+  getList();
+});
+
 onMounted(async () => {
   if (!userStore.isLogin) {
     handleShowLogin();
diff --git a/src/pages/recommend/index.vue b/src/pages/recommend/index.vue
index e44ad49..064daf8 100644
--- a/src/pages/recommend/index.vue
+++ b/src/pages/recommend/index.vue
@@ -35,6 +35,7 @@
       </view>
 
       <!-- 时间轴 start -->
+
       <view class="page-timeline">
         <view
           :class="['timeline', { mask: !userStore.isLogin }]"
@@ -110,6 +111,15 @@
             </view>
           </view>
         </view>
+        <u-loading-icon
+          v-if="!isBottom && loading"
+          mode="circle"
+          text="加载中..."
+          textSize="26rpx"
+          textColor="#999999"
+          color="rgba(23, 119, 255, 1)"
+          size="28rpx"
+        ></u-loading-icon>
       </view>
       <!-- 时间轴 end -->
     </view>
@@ -128,8 +138,9 @@
 <script setup lang="ts">
 import { getRecommendList } from "@/api";
 import { useUserStore } from "@/stores/user";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import LoginDialog from "@/components/loginPopup/index.vue";
+import { onReachBottom } from "@dcloudio/uni-app";
 // 导航栏路由返回
 const handleBack = () => {
   uni.navigateBack({
@@ -192,29 +203,46 @@ function goDetail(item: any) {
 }
 
 const data = ref([]);
+const loading = ref(false);
+const keyword = ref("");
+const isBottom = ref(false);
+const pages = reactive({
+  page: 1,
+  size: 20,
+  total: 0,
+});
 const getList = async () => {
+  loading.value = true;
   const result = await getRecommendList({
     keyword: keyword.value,
+    page: pages.page,
+    size: pages.size,
   });
+  loading.value = false;
   if (result.code === 200) {
     const { list, total } = result.data;
-    data.value = list;
+    data.value = [...data.value, ...list];
     list.forEach((o) => {
       o.list.forEach((n) => {
-        selectKeys.value.push(n.id)
+        selectKeys.value.push(n.id);
       });
     });
-    
+    pages.total = Math.ceil(total / pages.size);
+    isBottom.value = pages.page >= pages.total;
   } else {
     data.value = [];
   }
 };
-
-const keyword = ref("");
 const handleSearch = () => {
   getList();
 };
 
+onReachBottom(() => {
+  if (isBottom.value) return;
+  pages.page++;
+  getList();
+});
+
 onMounted(async () => {
   if (!userStore.isLogin) {
     handleShowLogin();
@@ -327,6 +355,7 @@ onMounted(async () => {
 .page-timeline {
   position: relative;
   z-index: 3;
+  padding-bottom: 20rpx;
 
   .mask {
     filter: blur(5px);
@@ -364,6 +393,7 @@ onMounted(async () => {
     }
 
     .content {
+      flex: 1;
       padding: 0 0 30rpx 15rpx;
     }