ip管理表格添加提取地区列 & 提取IP取消运营商字段选项 & 调整购买页价格显示问题

src/app/admin/channels/page.tsx

@@ -178,6 +178,21 @@ export default function ChannelsPage(props: ChannelsPageProps) {
               header: '代理地址',
               cell: ({row}) => <Addr channel={row.original}/>,
             },
+            {
+              header: '地区',
+              cell: ({row}) => {
+                const prov = row.original.filter_prov
+                const city = row.original.filter_city
+                const parts = []
+                if (prov && prov !== 'all') parts.push(prov)
+                if (city && city !== 'all') parts.push(city)
+                return (
+                  <div className="text-sm">
+                    {parts.length > 0 ? parts.join(' / ') : '不限'}
+                  </div>
+                )
+              },
+            },
             {
               header: '认证方式',
               cell: ({row}) => {

src/components/composites/extract/index.tsx

@@ -26,7 +26,7 @@ const schema = z.object({
   prov: z.string().optional(),
   city: z.string().optional(),
   regionType: z.enum(['unlimited', 'specific']).default('unlimited'),
-  isp: z.enum(['all', '1', '2', '3'], {required_error: '请选择运营商'}),
+  // isp: z.enum(['all', '1', '2', '3'], {required_error: '请选择运营商'}),
   proto: z.enum(['all', '1', '2'], {required_error: '请选择协议'}),
   authType: z.enum(['1', '2'], {required_error: '请选择认证方式'}),
   distinct: z.enum(['1', '0'], {required_error: '请选择去重选项'}),
@@ -48,7 +48,7 @@ export default function Extract(props: ExtractProps) {
     resolver: zodResolver(schema),
     defaultValues: {
       regionType: 'unlimited',
-      isp: 'all',
+      // isp: 'all',
       proto: 'all',
       authType: '1',
       count: 1,
@@ -108,7 +108,7 @@ const FormFields = memo(() => {
       <SelectRegion/>
 
       {/* 运营商筛选 */}
-      <FormField name="isp" label="运营商筛选" classNames={{label: 'max-md:text-sm'}}>
+      {/* <FormField name="isp" label="运营商筛选" classNames={{label: 'max-md:text-sm'}}>
         {({id, field}) => (
           <RadioGroup
             onValueChange={field.onChange}
@@ -133,7 +133,7 @@ const FormFields = memo(() => {
             </FormLabel>
           </RadioGroup>
         )}
-      </FormField>
+      </FormField> */}
 
       {/* 协议类型 */}
       <FormField name="proto" label="协议类型" classNames={{label: 'max-md:text-sm'}}>
@@ -711,7 +711,7 @@ function ApplyLink() {
 }
 
 function link(values: Schema) {
-  const {resource, prov, city, isp, proto, authType, distinct, format: formatType, separator, breaker, count} = values
+  const {resource, prov, city, proto, authType, distinct, format: formatType, separator, breaker, count} = values
   console.log(values, 'values')
 
   const sp = new URLSearchParams()
@@ -721,7 +721,7 @@ function link(values: Schema) {
   if (prov) sp.set('b', prov)
   if (city) sp.set('b', city)
 
-  if (isp != 'all') sp.set('s', isp)
+  sp.set('s', 'all')
   sp.set('d', distinct)
   sp.set('rt', formatType)
   sp.set('rh', 'ip')

src/components/composites/purchase/long/center.tsx

@@ -134,7 +134,7 @@ export default function Center({skuData}: {
                 setValue('expire', nextExpireList[0])
               }
             }}
-            className="grid grid-cols-[repeat(auto-fill,minmax(120px,1fr))] gap-4">
+            className="grid grid-cols-[repeat(auto-fill,minmax(150px,1fr))] gap-4">
             {liveList.map((live) => {
               const priceExpire = type === '1' && !hasPurchaseSku(skuData, {mode: type, live, expire})
                 ? getAvailablePurchaseExpires(skuData, {mode: type, live})[0] || '0'

src/components/composites/purchase/option.tsx

@@ -57,7 +57,7 @@ export default function FormOption(props: FormOptionProps) {
               <p className="text-sm text-gray-500">{props.description}</p>
             )}
             {isValidPrice && (
-              <div className="flex items-center gap-2 flex-wrap">
+              <div className="flex items-center flex-col">
                 {hasDiscount ? (
                   <>
                     <p className="text-sm  font-medium">￥{formatPrice(discountedPrice!)}/IP</p>

src/components/composites/purchase/short/center.tsx

@@ -135,7 +135,7 @@ export default function Center({
                 setValue('expire', nextExpireList[0])
               }
             }}
-            className="grid grid-cols-[repeat(auto-fill,minmax(120px,1fr))] gap-4">
+            className="grid grid-cols-[repeat(auto-fill,minmax(150px,1fr))] gap-4">
             {liveList.map((live) => {
               const priceExpire = type === '1' && !hasPurchaseSku(skuData, {mode: type, live, expire})
                 ? getAvailablePurchaseExpires(skuData, {mode: type, live})[0] || '0'

src/lib/models/models.ts

@@ -104,6 +104,8 @@ export type Channel = {
   expired_at: Date
   host: string
   batch_no: string
+  filter_prov: string
+  filter_city: string
 }
 export type Proxy = {
   id: number