From 31cdc895e69bd3e541e36b7695b2745c1ae10aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= <eison.icu@gmail.com>
Date: Fri, 11 Apr 2025 16:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=AE=A1=E5=90=8E=E5=8F=B0=20-=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=B1=A0=E5=88=86=E9=A1=B5=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cunkebao/app/workspace/moments-sync/page.tsx  |  1 +
 .../superadmin/controller/TrafficPool.php     |  1 +
 SuperAdmin/app/dashboard/customers/page.tsx   | 36 +++++++++++++++++--
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/Cunkebao/app/workspace/moments-sync/page.tsx b/Cunkebao/app/workspace/moments-sync/page.tsx
index 5a3a0336..66d81db9 100644
--- a/Cunkebao/app/workspace/moments-sync/page.tsx
+++ b/Cunkebao/app/workspace/moments-sync/page.tsx
@@ -282,6 +282,7 @@ export default function MomentsSyncPage() {
                   </div>
                 </div>
 
+
                 <div className="grid grid-cols-2 gap-4 mb-4">
                   <div className="text-sm text-gray-500">
                     <div>推送设备：{task.deviceCount} 个</div>
diff --git a/Server/application/superadmin/controller/TrafficPool.php b/Server/application/superadmin/controller/TrafficPool.php
index 8c135c25..f773cef7 100644
--- a/Server/application/superadmin/controller/TrafficPool.php
+++ b/Server/application/superadmin/controller/TrafficPool.php
@@ -38,6 +38,7 @@ class TrafficPool extends Controller
             ->join('wechat_friend wf', 'tp.wechatId = wf.wechatId', 'left')
             // 查询字段
             ->field([
+                'distinct ts.identifier',
                 'tp.id',
                 'tp.avatar', 
                 'tp.nickname', 
diff --git a/SuperAdmin/app/dashboard/customers/page.tsx b/SuperAdmin/app/dashboard/customers/page.tsx
index 535936a8..71acd49c 100644
--- a/SuperAdmin/app/dashboard/customers/page.tsx
+++ b/SuperAdmin/app/dashboard/customers/page.tsx
@@ -376,15 +376,47 @@ export default function CustomersPage() {
                 disabled={currentPage <= 1}
               >
                 <ChevronLeft className="h-4 w-4" />
-                上一页
               </Button>
+              
+              {/* 数字分页按钮 */}
+              {Array.from({ length: totalPages }, (_, i) => i + 1).map((page) => {
+                // 显示当前页码前后2页，以及第一页和最后一页
+                const shouldShow = 
+                  page === 1 || 
+                  page === totalPages || 
+                  (page >= currentPage - 2 && page <= currentPage + 2);
+                
+                if (!shouldShow) {
+                  // 显示省略号
+                  if (page === currentPage - 3 || page === currentPage + 3) {
+                    return (
+                      <span key={page} className="px-2">
+                        ...
+                      </span>
+                    );
+                  }
+                  return null;
+                }
+
+                return (
+                  <Button
+                    key={page}
+                    variant={page === currentPage ? "default" : "outline"}
+                    size="sm"
+                    onClick={() => goToPage(page)}
+                    className="min-w-[2.5rem]"
+                  >
+                    {page}
+                  </Button>
+                );
+              })}
+
               <Button
                 variant="outline"
                 size="sm"
                 onClick={() => goToPage(currentPage + 1)}
                 disabled={currentPage >= totalPages}
               >
-                下一页
                 <ChevronRight className="h-4 w-4" />
               </Button>
             </div>