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() { +
推送设备:{task.deviceCount} 个
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} > - 上一页 + + {/* 数字分页按钮 */} + {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 ( + + ... + + ); + } + return null; + } + + return ( + + ); + })} +