fix: 修改客户列表

boyang
1 parent 55b538f1
Showing 1 changed file with 20 additions and 47 deletions
src/pages/Client/Client/index.tsx
@@ -409,55 +409,28 @@ export default () =&gt; {
             // 获取分页参数
             const { current, pageSize, ...restParams } = params;
  
-            try {
-              const res = await postAdminClientQueryClientPage({
-                data: {
-                  ...restParams,
-                  groupFilter: groupFilter,
-                  // 明确传递分页参数
-                  current: current,
-                  pageSize: pageSize,
-                },
-              });
+            const res = await postAdminClientQueryClientPage({
+              data: {
+                ...restParams,
+                groupFilter: groupFilter,
+                // 明确传递分页参数
+                current: current,
+                pageSize: pageSize,
+              },
+            });
  
-              console.log('API Response:', res); // 添加日志来查看API返回的数据结构
-              console.log('API Response data:', res.data); // 查看data部分的结构
+            // 处理后端返回的实际数据格式
+            // 根据提供的JSON，格式已经是 {records, total, current, pages, size, count}
+            const result = {
+              data: res.data?.records || [], // 数据源是 records 数组
+              success: true,
+              total: res.data?.total || 0, // 总记录数
+              // 返回服务器端的分页信息，让ProTable使用
+              current: res.data?.current || 1,
+              pageSize: res.data?.size || 10,
+            };
  
-              // 检查返回数据结构
-              if (!res.data) {
-                console.error('API response data is undefined');
-                return { data: [], success: false, total: 0 };
-              }
-
-              // 根据API返回的数据结构调整处理方式
-              let records = [];
-              let total = 0;
-
-              // 处理两种可能的数据结构
-              if (res.data.records) {
-                // 标准分页结构 {records, total, current, pages, size}
-                records = res.data.records;
-                total = res.data.total || 0;
-              } else if (Array.isArray(res.data)) {
-                // 直接返回数组的情况
-                records = res.data;
-                total = res.data.length;
-              }
-
-              const result = {
-                data: records,
-                success: true,
-                total: total,
-                current: res.data.current || current || 1,
-                pageSize: res.data.size || pageSize || 10,
-              };
-
-              console.log('Processed result for ProTable:', result);
-              return result;
-            } catch (error) {
-              console.error('Error fetching client data:', error);
-              return { data: [], success: false, total: 0 };
-            }
+            return result;
           }}
           search={{
             labelWidth: 'auto',