From be06c06f43134a5cb3335175966ee21056bd886a Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Wed, 17 Sep 2025 16:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E6=8C=81=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E6=89=BE-=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../institutionalStructure/donationRecord.vue |  7 ++++++-
 .../mixins/data-manager.js                    | 20 ++++++++++++++-----
 .../mixins/donation-mixin.js                  | 12 +++++++----
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/pages/institutionalStructure/donationRecord.vue b/pages/institutionalStructure/donationRecord.vue
index 7ec4dd8..017eb82 100644
--- a/pages/institutionalStructure/donationRecord.vue
+++ b/pages/institutionalStructure/donationRecord.vue
@@ -9,7 +9,7 @@
           :width="'100%'"
           btn-text="搜索"
           placeholder="请输入搜索关键词"
-          @search="onSearch"
+          @search="onSearch()"
         />
         <view class="filter-btn" @click="show = true">
           <image
@@ -204,6 +204,11 @@ export default {
       this.initData(options.formedId);
     }
   },
+  onReachBottom() {
+    // 触底事件
+
+    this.loadMoreDonationRecords();
+  },
   methods: {
     changeSortAmount(order) {
       this.filter.sortAmount = order;
diff --git a/pages/institutionalStructure/mixins/data-manager.js b/pages/institutionalStructure/mixins/data-manager.js
index b724f5c..22a5db3 100644
--- a/pages/institutionalStructure/mixins/data-manager.js
+++ b/pages/institutionalStructure/mixins/data-manager.js
@@ -61,21 +61,23 @@ export const dataManagerMixin = {
       }
 
       try {
+        console.log("isLoadMore", isLoadMore);
         // 更新页码
         if (isLoadMore) {
           this.pageNum++;
+          console.log("this.pageNum", this.pageNum);
         } else {
           this.pageNum = 1;
         }
 
         // 构建请求参数
         const requestParams = {
-          pageNum: this.pageNum,
-          pageSize: this.pageSize,
           ...this.currentParams,
           ...params,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
         };
-
+        console.log("requestParams", requestParams);
         // 调用API
         const response = await apiCall(requestParams);
 
@@ -109,8 +111,16 @@ export const dataManagerMixin = {
 
           // 更新状态
           this.total = total;
-          this.hasMore = newData.length === this.pageSize;
+
           this.currentParams = { ...requestParams };
+          console.log("@@@hasMore", this.hasMore);
+          this.hasMore =
+            this.pageSize * this.currentParams.pageNum < this.total;
+
+          console.log("this.hasMore", this.hasMore);
+          console.log("this.total", this.total);
+          console.log("this.pageSize", this.pageSize);
+          console.log("this.currentParams.pageNum", this.currentParams.pageNum);
 
           // 成功回调
           if (onSuccess) {
@@ -178,7 +188,7 @@ export const dataManagerMixin = {
      */
     searchData(searchParams = {}, options = {}) {
       return this.fetchData({
-        isLoadMore: false,
+        // isLoadMore: false,
         params: searchParams,
         ...options,
       });
diff --git a/pages/institutionalStructure/mixins/donation-mixin.js b/pages/institutionalStructure/mixins/donation-mixin.js
index 9f91fb1..37321fd 100644
--- a/pages/institutionalStructure/mixins/donation-mixin.js
+++ b/pages/institutionalStructure/mixins/donation-mixin.js
@@ -122,7 +122,7 @@ export const donationMixin = {
         dataTransformer: this.transformDonationData,
         params: baseParams,
         dataPath: "data.list.rows",
-        totalPath: "data.total",
+        totalPath: "data.list.total",
         onSuccess: (data, response) => {
           console.log("捐款记录加载成功:", data.length, "条");
         },
@@ -137,14 +137,18 @@ export const donationMixin = {
      * @param {string} val 搜索关键词
      */
     async onSearch(val) {
+      console.log("@@@@@@@@@@val", val);
       this.searchKeyword = val;
+
+      console.log("@@@@@@@@@@", this.searchKeyword);
+
       await this.searchData(
-        { ...this.getBaseParams(), realName: val },
+        { ...this.getBaseParams(), realName: val.trim() },
         {
           apiCall: getDonorList,
           dataTransformer: this.transformDonationData,
           dataPath: "data.list.rows",
-          totalPath: "data.total",
+          totalPath: "data.list.total",
           onSuccess: (data, response) => {
             console.log("搜索完成，找到:", data.length, "条记录");
           },
@@ -167,7 +171,7 @@ export const donationMixin = {
         dataTransformer: this.transformDonationData,
         params: currentParams,
         dataPath: "data.list.rows",
-        totalPath: "data.total",
+        totalPath: "data.list.total",
         onSuccess: (data, response) => {
           console.log("加载更多完成，新增:", data.length, "条记录");
         },