diff --git a/src/app/(root)/channel/page.tsx b/src/app/(root)/channel/page.tsx index 002f8e2..5054516 100644 --- a/src/app/(root)/channel/page.tsx +++ b/src/app/(root)/channel/page.tsx @@ -118,6 +118,7 @@ export default function ChannelPage() { const onFilter = handleSubmit(() => { table.pagination.onPageChange(1) }) + console.log(table, "table") return ( @@ -291,56 +292,63 @@ export default function ChannelPage() { accessorFn: row => row.user?.phone || "-", }, { - header: "套餐号", + header: "套餐号/提取编号", accessorKey: "resource.resource_no", cell: ({ row }) => { const resource_no = row.original.resource?.resource_no + const batchNo = row.original.batch_no const type = row.original.resource?.type return ( - - {resource_no} - +
+ + 套餐号  : + + {resource_no} + + + + 提取编号: + + {batchNo} + + +
) }, }, { - header: "提取编号", - accessorKey: "batch_no", + header: "网关", + accessorKey: "host", cell: ({ row }) => { - const batchNo = row.original.batch_no return ( - - {batchNo} - + + {row.original.host}:{row.original.port} + ) }, }, { header: "节点", - accessorFn: row => row.ip || row.edge_ref || row.edge_id, + accessorFn: row => row.edge_ref || row.ip || row.edge_id, }, { - header: "自动配置", + header: "地区", cell: ({ row }) => { const prov = row.original.filter_prov const city = row.original.filter_city - const isp = row.original.filter_isp const parts = [] if (prov && prov !== "all") parts.push(prov) if (city && city !== "all") parts.push(city) - if (isp && isp !== "all") { - parts.push(ispMap[Number(isp)] || isp) - } return (
{parts.length > 0 ? parts.join(" / ") : "不限"} @@ -349,14 +357,11 @@ export default function ChannelPage() { }, }, { - header: "网关地址", - accessorKey: "host", + header: "运营商", + // accessorFn: row => row.filter_isp || "", cell: ({ row }) => { - return ( - - {row.original.host}:{row.original.port} - - ) + const isp = row.original.filter_isp + return ispMap[Number(isp)] || isp }, }, {