From e408fad84d0d8cf4a559c1b85f2530e28d38a23f Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Wed, 17 Sep 2025 18:00:23 +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-=E6=97=B6=E9=97=B4=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=A7=93=E5=90=8D=E4=B8=89=E7=BB=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=81=94=E6=9F=A5-=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../institutionalStructure/donationRecord.vue | 23 ++++++++++++-------
 .../mixins/data-manager.js                    |  6 ++++-
 .../mixins/donation-mixin.js                  | 20 ++++++++++++----
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/pages/institutionalStructure/donationRecord.vue b/pages/institutionalStructure/donationRecord.vue
index a32b480..62fa2ef 100644
--- a/pages/institutionalStructure/donationRecord.vue
+++ b/pages/institutionalStructure/donationRecord.vue
@@ -76,18 +76,18 @@
             <view
               :class="[
                 'custom-radio-button',
-                filter.orderTime === 'desc' ? 'checked' : '',
+                filter.orderTime === 'asc' ? 'checked' : '',
               ]"
-              @click="changeorderTime('desc')"
+              @click="changeorderTime('asc')"
             >
               由远及近
             </view>
             <view
               :class="[
                 'custom-radio-button',
-                filter.orderTime === 'asc' ? 'checked' : '',
+                filter.orderTime === 'desc' ? 'checked' : '',
               ]"
-              @click="changeorderTime('asc')"
+              @click="changeorderTime('desc')"
             >
               由近及远
             </view>
@@ -191,10 +191,10 @@ export default {
       filter: {
         minAmount: "",
         maxAmount: "",
-        orderAmount: "desc",
-        orderTime: "desc",
-        sortAmount: "amount",
-        sortTime: "time",
+        orderAmount: "",
+        orderTime: "",
+        sortAmount: "",
+        sortTime: "",
       },
 
       CommonEnum,
@@ -214,11 +214,18 @@ export default {
   methods: {
     changeorderAmount(order) {
       this.filter.orderAmount = order;
+
+      this.filter.orderTime = "";
+      this.filter.sortTime = "";
+      this.filter.sortAmount = "amount";
       console.log("当前选择的排序方式:", order);
       // 触发排序操作
     },
     changeorderTime(order) {
       this.filter.orderTime = order;
+      this.filter.orderAmount = "";
+      this.filter.sortAmount = "";
+      this.filter.sortTime = "time";
       console.log("当前选择的排序方式:", order);
       // 触发排序操作
     },
diff --git a/pages/institutionalStructure/mixins/data-manager.js b/pages/institutionalStructure/mixins/data-manager.js
index 69a22fe..a5c65b0 100644
--- a/pages/institutionalStructure/mixins/data-manager.js
+++ b/pages/institutionalStructure/mixins/data-manager.js
@@ -37,6 +37,7 @@ export const dataManagerMixin = {
      * @param {boolean} options.showError 是否显示错误提示
      */
     async fetchData(options = {}) {
+      console.log("@@@@@@@@@@@@@@@@@", options);
       const {
         isLoadMore = false,
         apiCall,
@@ -72,7 +73,7 @@ export const dataManagerMixin = {
 
         // 构建请求参数
         const requestParams = {
-          ...this.currentParams,
+          // ...this.currentParams,
           ...params,
           pageNum: this.pageNum,
           pageSize: this.pageSize,
@@ -187,6 +188,9 @@ export const dataManagerMixin = {
      * @param {Object} options 配置选项
      */
     searchData(searchParams = {}, options = {}) {
+      console.log("@@@@@@@@@@@", searchParams);
+      console.log("@@@@@@@@@@@", options);
+
       return this.fetchData({
         // isLoadMore: false,
 
diff --git a/pages/institutionalStructure/mixins/donation-mixin.js b/pages/institutionalStructure/mixins/donation-mixin.js
index a83c6ad..1c2b1cd 100644
--- a/pages/institutionalStructure/mixins/donation-mixin.js
+++ b/pages/institutionalStructure/mixins/donation-mixin.js
@@ -22,8 +22,8 @@ export const donationMixin = {
       getBaseParams: {
         minAmount: 0,
         maxAmount: 10000,
-        sortAmount: "amount",
-        orderAmount: "asc",
+        // sortAmount: "amount",
+        // orderAmount: "asc",
         sortTime: "time",
         orderTime: "desc",
       },
@@ -157,9 +157,20 @@ export const donationMixin = {
     /**
      * 筛选功能
      */
-    async filterSearch(params) {
-      this.getBaseParams = params;
 
+    //过滤空参数
+    filterEmptyParams(obj) {
+      return Object.keys(obj).reduce((acc, key) => {
+        if (obj[key] !== "") {
+          acc[key] = obj[key];
+        }
+        return acc;
+      }, {});
+    },
+
+    async filterSearch(params) {
+      this.getBaseParams = this.filterEmptyParams(params);
+      console.log("@@@@@@@@@@@@@@", this.getBaseParams);
       console.log("this.searchKeyword", this.searchKeyword);
 
       await this.searchData(
@@ -178,6 +189,7 @@ export const donationMixin = {
           },
         },
       );
+      this.show = false;
     },
 
     /**