From 01f4f5343d1e1041cfe378f52a03c19ddaa2b402 Mon Sep 17 00:00:00 2001
From: Eamon <17516219072@163.com>
Date: Fri, 12 Jun 2026 16:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=95=B4IP=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(root)/channel/page.tsx | 71 ++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 33 deletions(-)

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 (
     <Page>
@@ -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 (
-                  <Link
-                    href={`./resources?resource_no=${resource_no}&type=${type}`}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-blue-600"
-                  >
-                    {resource_no}
-                  </Link>
+                  <div className="flex flex-col font-mono text-xs">
+                    <span>
+                      套餐号&ensp;&ensp;：
+                      <Link
+                        href={`./resources?resource_no=${resource_no}&type=${type}`}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="text-blue-600"
+                      >
+                        {resource_no}
+                      </Link>
+                    </span>
+                    <span>
+                      提取编号：
+                      <Link
+                        href={`./batch?batch_no=${batchNo}`}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="text-blue-600"
+                      >
+                        {batchNo}
+                      </Link>
+                    </span>
+                  </div>
                 )
               },
             },
             {
-              header: "提取编号",
-              accessorKey: "batch_no",
+              header: "网关",
+              accessorKey: "host",
               cell: ({ row }) => {
-                const batchNo = row.original.batch_no
                 return (
-                  <Link
-                    href={`./batch?batch_no=${batchNo}`}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-blue-600"
-                  >
-                    {batchNo}
-                  </Link>
+                  <span>
+                    {row.original.host}:{row.original.port}
+                  </span>
                 )
               },
             },
             {
               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 (
                   <div className="text-sm">
                     {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 (
-                  <span>
-                    {row.original.host}:{row.original.port}
-                  </span>
-                )
+                const isp = row.original.filter_isp
+                return ispMap[Number(isp)] || isp
               },
             },
             {