diff --git a/Server/application/superadmin/controller/TrafficPool.php b/Server/application/superadmin/controller/TrafficPool.php index 83a96155..6f53170a 100644 --- a/Server/application/superadmin/controller/TrafficPool.php +++ b/Server/application/superadmin/controller/TrafficPool.php @@ -27,7 +27,7 @@ class TrafficPool extends Controller ->join('wechat_account wa', 'tp.wechatId = wa.wechatId', 'LEFT') ->join('wechat_tag wt', 'wa.wechatId = wt.wechatId') ->field([ - 'tp.id', + 'ts.id', 'tp.wechatId', 'tp.createTime as addTime', 'ts.fromd as source', diff --git a/SuperAdmin/app/dashboard/customers/page.tsx b/SuperAdmin/app/dashboard/customers/page.tsx index 908f1f64..478bd3e1 100644 --- a/SuperAdmin/app/dashboard/customers/page.tsx +++ b/SuperAdmin/app/dashboard/customers/page.tsx @@ -13,7 +13,7 @@ import { DropdownMenuSeparator, } from "@/components/ui/dropdown-menu" import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select" -import { Search, MoreHorizontal, Eye, UserPlus, Filter, ChevronLeft, ChevronRight } from "lucide-react" +import { Search, MoreHorizontal, Eye, UserPlus, Filter, ChevronLeft, ChevronRight, RefreshCw } from "lucide-react" import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar" import { Badge } from "@/components/ui/badge" import { getTrafficPoolList } from "@/lib/traffic-pool-api" @@ -126,6 +126,15 @@ export default function CustomersPage() { const [pageSize, setPageSize] = useState(30) const [jumpToPage, setJumpToPage] = useState("") + // 添加重置函数 + const handleReset = () => { + setSearchTerm("") + setSelectedRegion("") + setSelectedGender("") + setSelectedSource("") + setSelectedProject("") + } + // 获取客户列表数据 useEffect(() => { const fetchCustomers = async () => { @@ -201,102 +210,105 @@ export default function CustomersPage() { const projects = [...new Set(customers.map((c) => c.projectName))] return ( -
地区
- -性别
- -来源
- -所属项目
- -地区
+ +性别
+ +来源
+ +所属项目
+ +