From 8a1388608c49f2050be060eb8bfd5c2b175fb455 Mon Sep 17 00:00:00 2001
From: sexygoat <1538832180@qq.com>
Date: Fri, 30 Jan 2026 15:39:19 +0800
Subject: [PATCH] =?UTF-8?q?fetch(add):=20=E6=96=B0=E5=A2=9E=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E8=AE=BE=E5=A4=87=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                                    |   2 +
 src/api/modules/index.ts                      |   1 -
 src/api/modules/myPackage.ts                  |  45 ---
 src/assets/fonts/DMSans.woff2                 | Bin 12128 -> 0 bytes
 src/assets/fonts/Montserrat.woff2             | Bin 12700 -> 0 bytes
 src/assets/styles/app.scss                    |  15 +-
 src/assets/styles/el-ui.scss                  |  30 ++
 src/assets/styles/reset.scss                  |   4 +-
 .../core/layouts/art-header-bar/index.vue     |  26 +-
 src/locales/langs/en.json                     |   7 +-
 src/locales/langs/zh.json                     |   8 +-
 src/router/routes/asyncRoutes.ts              |  48 +--
 src/router/routesAlias.ts                     |   8 +-
 src/types/api/card.ts                         |  28 +-
 src/types/api/packageManagement.ts            |  86 ++--
 .../asset-management/device-task/index.vue    | 310 ++++++++++++++
 .../index.vue                                 | 143 +++++--
 .../{card-search => iot-card-query}/index.vue |   0
 .../index.vue                                 | 181 +++------
 src/views/dashboard/analysis/index.vue        |  61 +--
 src/views/dashboard/console/index.vue         |  43 +-
 src/views/dashboard/ecommerce/index.vue       | 103 ++---
 .../package-management/my-packages/index.vue  | 382 ------------------
 .../package-assign/index.vue                  |  40 +-
 .../series-assign/index.vue                   | 329 ++++++++++-----
 25 files changed, 978 insertions(+), 922 deletions(-)
 delete mode 100644 src/api/modules/myPackage.ts
 delete mode 100644 src/assets/fonts/DMSans.woff2
 delete mode 100644 src/assets/fonts/Montserrat.woff2
 create mode 100644 src/views/asset-management/device-task/index.vue
 rename src/views/asset-management/{card-list => iot-card-management}/index.vue (90%)
 rename src/views/asset-management/{card-search => iot-card-query}/index.vue (100%)
 rename src/views/asset-management/{task-management => iot-card-task}/index.vue (62%)
 delete mode 100644 src/views/package-management/my-packages/index.vue

diff --git a/index.html b/index.html
index 8e03a02..4803c3a 100644
--- a/index.html
+++ b/index.html
@@ -4,6 +4,8 @@
     <title>君鸿卡管系统</title>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
+    <!-- 引入小米字体 CSS 文件 -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/misans@4.1.0/lib/Normal/MiSans-Regular.min.css"/>
     <link rel="shortcut icon" type="image/x-icon" href="src/assets/img/logo.png" />
   </head>
 
diff --git a/src/api/modules/index.ts b/src/api/modules/index.ts
index a229e8c..690c767 100644
--- a/src/api/modules/index.ts
+++ b/src/api/modules/index.ts
@@ -23,7 +23,6 @@ export { DeviceService } from './device'
 export { CarrierService } from './carrier'
 export { PackageSeriesService } from './packageSeries'
 export { PackageManageService } from './packageManage'
-export { MyPackageService } from './myPackage'
 export { ShopPackageAllocationService } from './shopPackageAllocation'
 export { ShopSeriesAllocationService } from './shopSeriesAllocation'
 export { OrderService } from './order'
diff --git a/src/api/modules/myPackage.ts b/src/api/modules/myPackage.ts
deleted file mode 100644
index 8d465f4..0000000
--- a/src/api/modules/myPackage.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 代理可售套餐 API 服务
- */
-
-import { BaseService } from '../BaseService'
-import type {
-  MyPackageResponse,
-  MyPackageQueryParams,
-  MySeriesAllocationResponse,
-  BaseResponse,
-  PaginationResponse
-} from '@/types/api'
-
-export class MyPackageService extends BaseService {
-  /**
-   * 获取我的可售套餐列表
-   * GET /api/admin/my-packages
-   * @param params 查询参数
-   */
-  static getMyPackages(
-    params?: MyPackageQueryParams
-  ): Promise<PaginationResponse<MyPackageResponse>> {
-    return this.getPage<MyPackageResponse>('/api/admin/my-packages', params)
-  }
-
-  /**
-   * 获取我的可售套餐详情
-   * GET /api/admin/my-packages/{id}
-   * @param id 套餐ID
-   */
-  static getMyPackageDetail(id: number): Promise<BaseResponse<MyPackageResponse>> {
-    return this.getOne<MyPackageResponse>(`/api/admin/my-packages/${id}`)
-  }
-
-  /**
-   * 获取我的被分配系列列表
-   * GET /api/admin/my-series-allocations
-   * @param params 查询参数（支持分页）
-   */
-  static getMySeriesAllocations(
-    params?: Record<string, any>
-  ): Promise<PaginationResponse<MySeriesAllocationResponse>> {
-    return this.getPage<MySeriesAllocationResponse>('/api/admin/my-series-allocations', params)
-  }
-}
diff --git a/src/assets/fonts/DMSans.woff2 b/src/assets/fonts/DMSans.woff2
deleted file mode 100644
index a358ff373c245586a3cfa03b2955b50f3086cd31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12128
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

diff --git a/src/assets/fonts/Montserrat.woff2 b/src/assets/fonts/Montserrat.woff2
deleted file mode 100644
index 6db06d182800f3b09ecdf81a8ee3a9c3c723e08a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12700
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
WQb<Q3wX{F8JXLT2?K>VU0002(yLrR_

diff --git a/src/assets/styles/app.scss b/src/assets/styles/app.scss
index 3062781..041be08 100644
--- a/src/assets/styles/app.scss
+++ b/src/assets/styles/app.scss
@@ -1,17 +1,8 @@
 // 全局样式
 
-@font-face {
-  font-family: 'DMSans';
-  font-style: normal;
-  font-weight: 400;
-  src: url(../fonts/DMSans.woff2) format('woff2');
-}
-
-@font-face {
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 400;
-  src: url(../fonts/Montserrat.woff2) format('woff2');
+// 强制所有元素使用小米字体
+* {
+  font-family: 'MiSans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif !important;
 }
 
 .btn-icon {
diff --git a/src/assets/styles/el-ui.scss b/src/assets/styles/el-ui.scss
index 95bcab0..4e623f9 100644
--- a/src/assets/styles/el-ui.scss
+++ b/src/assets/styles/el-ui.scss
@@ -9,6 +9,8 @@
   // --el-border-color: #E4E4E7 !important; // DCDFE6
   // 按钮粗度
   --el-font-weight-primary: 400 !important;
+  // Element Plus 全局字体
+  --el-font-family: 'MiSans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif !important;
 
   --el-component-custom-height: 36px !important;
 
@@ -180,6 +182,8 @@
 
 // 修改el-button样式
 .el-button {
+  font-family: 'MiSans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif !important;
+
   &.el-button--text {
     background-color: transparent !important;
     padding: 0 !important;
@@ -198,6 +202,32 @@
   border-radius: 6px !important;
   font-weight: bold;
   transition: all 0s !important;
+  font-family: 'MiSans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif !important;
+}
+
+// 为所有 Element Plus 组件添加小米字体
+.el-input,
+.el-input__wrapper,
+.el-select,
+.el-select__wrapper,
+.el-form-item__label,
+.el-table,
+.el-pagination,
+.el-dialog,
+.el-message,
+.el-message-box,
+.el-dropdown-menu,
+.el-menu,
+.el-radio,
+.el-checkbox,
+.el-switch,
+.el-date-picker,
+.el-cascader,
+.el-tree-select,
+.el-upload,
+.el-card,
+.el-divider {
+  font-family: 'MiSans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif !important;
 }
 
 .el-checkbox-group {
diff --git a/src/assets/styles/reset.scss b/src/assets/styles/reset.scss
index 9a25580..c81c5ca 100644
--- a/src/assets/styles/reset.scss
+++ b/src/assets/styles/reset.scss
@@ -34,9 +34,7 @@ h5 {
 body {
   color: var(--art-text-gray-700);
   text-align: left;
-  font-family:
-    Inter, 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei',
-    '微软雅黑', Arial, sans-serif;
+  font-family: 'MiSans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
 }
 
 select {
diff --git a/src/components/core/layouts/art-header-bar/index.vue b/src/components/core/layouts/art-header-bar/index.vue
index 0be6dc2..2d2600c 100644
--- a/src/components/core/layouts/art-header-bar/index.vue
+++ b/src/components/core/layouts/art-header-bar/index.vue
@@ -24,7 +24,7 @@
         </div>
 
         <!-- 快速入口 -->
-        <ArtFastEnter v-if="width >= 1200" />
+        <!--<ArtFastEnter v-if="width >= 1200" />-->
 
         <!-- 面包屑 -->
         <ArtBreadcrumb
@@ -65,19 +65,19 @@
           </div>
         </div>
         <!-- 通知 -->
-        <div class="btn-box notice-btn" @click="visibleNotice">
-          <div class="btn notice-button">
-            <i class="iconfont-sys notice-btn">&#xe6c2;</i>
-            <span class="count notice-btn"></span>
-          </div>
-        </div>
+        <!--<div class="btn-box notice-btn" @click="visibleNotice">-->
+        <!--  <div class="btn notice-button">-->
+        <!--    <i class="iconfont-sys notice-btn">&#xe6c2;</i>-->
+        <!--    <span class="count notice-btn"></span>-->
+        <!--  </div>-->
+        <!--</div>-->
         <!-- 聊天 -->
-        <div class="btn-box chat-btn" @click="openChat">
-          <div class="btn chat-button">
-            <i class="iconfont-sys">&#xe89a;</i>
-            <span class="dot"></span>
-          </div>
-        </div>
+        <!--<div class="btn-box chat-btn" @click="openChat">-->
+        <!--  <div class="btn chat-button">-->
+        <!--    <i class="iconfont-sys">&#xe89a;</i>-->
+        <!--    <span class="dot"></span>-->
+        <!--  </div>-->
+        <!--</div>-->
         <!-- 语言 -->
         <div class="btn-box" v-if="showLanguage">
           <el-dropdown @command="changeLanguage" popper-class="langDropDownStyle">
diff --git a/src/locales/langs/en.json b/src/locales/langs/en.json
index 47eef9b..26ba8d8 100644
--- a/src/locales/langs/en.json
+++ b/src/locales/langs/en.json
@@ -433,11 +433,12 @@
     },
     "assetManagement": {
       "title": "Asset Management",
-      "cardSearch": "Card Search",
+      "cardSearch": "IoT Card Query",
       "deviceSearch": "Device Search",
       "singleCard": "Single Card Info",
-      "standaloneCardList": "Standalone Card List",
-      "taskManagement": "Task Management",
+      "standaloneCardList": "IoT Card Management",
+      "iotCardTask": "IoT Card Tasks",
+      "deviceTask": "Device Tasks",
       "taskDetail": "Task Details",
       "devices": "Device Management",
       "deviceDetail": "Device Details",
diff --git a/src/locales/langs/zh.json b/src/locales/langs/zh.json
index 6430cac..559f820 100644
--- a/src/locales/langs/zh.json
+++ b/src/locales/langs/zh.json
@@ -406,7 +406,6 @@
       "packageAssign": "单套餐分配",
       "seriesAssign": "套餐系列分配",
       "packageSeries": "套餐系列",
-      "myPackages": "代理可售套餐",
       "packageCommission": "套餐佣金网卡"
     },
     "accountManagement": {
@@ -437,11 +436,12 @@
     },
     "assetManagement": {
       "title": "资产管理",
-      "cardSearch": "单卡查询",
+      "cardSearch": "IoT卡查询",
       "deviceSearch": "设备查询",
       "singleCard": "单卡信息",
-      "standaloneCardList": "单卡列表",
-      "taskManagement": "任务管理",
+      "standaloneCardList": "IoT卡管理",
+      "iotCardTask": "IoT卡任务",
+      "deviceTask": "设备任务",
       "taskDetail": "任务详情",
       "devices": "设备管理",
       "deviceDetail": "设备详情",
diff --git a/src/router/routes/asyncRoutes.ts b/src/router/routes/asyncRoutes.ts
index 0b28ada..04dcd17 100644
--- a/src/router/routes/asyncRoutes.ts
+++ b/src/router/routes/asyncRoutes.ts
@@ -620,15 +620,15 @@ export const asyncRoutes: AppRouteRecord[] = [
       icon: '&#xe81a;'
     },
     children: [
-      {
-        path: 'card-detail',
-        name: 'CardDetail',
-        component: RoutesAlias.CardDetail,
-        meta: {
-          title: 'menus.cardManagement.cardDetail',
-          keepAlive: true
-        }
-      },
+      // {
+      //   path: 'card-detail',
+      //   name: 'CardDetail',
+      //   component: RoutesAlias.CardDetail,
+      //   meta: {
+      //     title: 'menus.cardManagement.cardDetail',
+      //     keepAlive: true
+      //   }
+      // },
       {
         path: 'card-assign',
         name: 'CardAssign',
@@ -721,15 +721,6 @@ export const asyncRoutes: AppRouteRecord[] = [
           keepAlive: true
         }
       },
-      {
-        path: 'my-packages',
-        name: 'MyPackages',
-        component: RoutesAlias.MyPackages,
-        meta: {
-          title: 'menus.packageManagement.myPackages',
-          keepAlive: true
-        }
-      },
       {
         path: 'package-assign',
         name: 'PackageAssign',
@@ -900,7 +891,7 @@ export const asyncRoutes: AppRouteRecord[] = [
     },
     children: [
       {
-        path: 'card-search',
+        path: 'iot-card-query',
         name: 'CardSearch',
         component: RoutesAlias.CardSearch,
         meta: {
@@ -918,7 +909,7 @@ export const asyncRoutes: AppRouteRecord[] = [
         }
       },
       {
-        path: 'card-list',
+        path: 'iot-card-management',
         name: 'StandaloneCardList',
         component: RoutesAlias.StandaloneCardList,
         meta: {
@@ -927,11 +918,20 @@ export const asyncRoutes: AppRouteRecord[] = [
         }
       },
       {
-        path: 'task-management',
-        name: 'TaskManagement',
-        component: RoutesAlias.TaskManagement,
+        path: 'iot-card-task',
+        name: 'IotCardTask',
+        component: RoutesAlias.IotCardTask,
         meta: {
-          title: 'menus.assetManagement.taskManagement',
+          title: 'menus.assetManagement.iotCardTask',
+          keepAlive: true
+        }
+      },
+      {
+        path: 'device-task',
+        name: 'DeviceTask',
+        component: RoutesAlias.DeviceTask,
+        meta: {
+          title: 'menus.assetManagement.deviceTask',
           keepAlive: true
         }
       },
diff --git a/src/router/routesAlias.ts b/src/router/routesAlias.ts
index 9c69d28..5f28e20 100644
--- a/src/router/routesAlias.ts
+++ b/src/router/routesAlias.ts
@@ -72,7 +72,6 @@ export enum RoutesAlias {
   PackageAssign = '/package-management/package-assign', // 单套餐分配
   SeriesAssign = '/package-management/series-assign', // 套餐系列分配
   PackageSeries = '/package-management/package-series', // 套餐系列
-  MyPackages = '/package-management/my-packages', // 代理可售套餐
   PackageCommission = '/package-management/package-commission', // 套餐佣金网卡
 
   // 账号管理
@@ -92,10 +91,11 @@ export enum RoutesAlias {
   SimCardAssign = '/product/sim-card-assign', // 号卡分配
 
   // 资产管理
-  CardSearch = '/asset-management/card-search', // 单卡查询
+  CardSearch = '/asset-management/iot-card-query', // IoT卡查询
   DeviceSearch = '/asset-management/device-search', // 设备查询
-  StandaloneCardList = '/asset-management/card-list', // 单卡列表(未绑定设备)
-  TaskManagement = '/asset-management/task-management', // 任务管理
+  StandaloneCardList = '/asset-management/iot-card-management', // IoT卡管理
+  IotCardTask = '/asset-management/iot-card-task', // IoT卡任务
+  DeviceTask = '/asset-management/device-task', // 设备任务
   TaskDetail = '/asset-management/task-detail', // 任务详情
   DeviceList = '/asset-management/device-list', // 设备列表
   DeviceDetail = '/asset-management/device-detail', // 设备详情
diff --git a/src/types/api/card.ts b/src/types/api/card.ts
index 40acc9b..e4fa7a8 100644
--- a/src/types/api/card.ts
+++ b/src/types/api/card.ts
@@ -256,8 +256,9 @@ export interface ImportIotCardResponse {
 export interface IotCardImportTask {
   id: number // 任务ID
   task_no: string // 任务编号
-  batch_no: string // 批次号
+  batch_no?: string // 批次号 (可选)
   carrier_id: number // 运营商ID
+  carrier_type: string // 运营商类型 (CMCC:中国移动, CUCC:中国联通, CTCC:中国电信)
   carrier_name: string // 运营商名称
   file_name: string // 文件名
   status: IotCardImportTaskStatus // 任务状态
@@ -266,10 +267,10 @@ export interface IotCardImportTask {
   success_count: number // 成功数
   fail_count: number // 失败数
   skip_count: number // 跳过数
-  error_message: string // 错误信息
+  error_message?: string // 错误信息 (可选)
   created_at: string // 创建时间
-  started_at: string | null // 开始处理时间
-  completed_at: string | null // 完成时间
+  started_at?: string | null // 开始处理时间 (可选)
+  completed_at?: string | null // 完成时间 (可选)
 }
 
 // 导入任务查询参数
@@ -323,24 +324,27 @@ export interface StandaloneCardQueryParams extends PaginationParams {
 export interface StandaloneIotCard {
   id: number // 卡ID
   iccid: string // ICCID
-  imsi: string // IMSI
-  msisdn: string // 卡接入号
+  imsi?: string // IMSI (可选)
+  msisdn?: string // 卡接入号 (可选)
   carrier_id: number // 运营商ID
+  carrier_type: string // 运营商类型 (CMCC:中国移动, CUCC:中国联通, CTCC:中国电信, CBN:中国广电)
   carrier_name: string // 运营商名称
-  card_type: string // 卡类型
+  card_type: string // 卡类型 (physical:物理卡, data_card:流量卡, voice_card:语音卡等)
   card_category: string // 卡业务类型 (normal:普通卡, industry:行业卡)
   status: StandaloneCardStatus // 状态
   activation_status: number // 激活状态 (0:未激活, 1:已激活)
   network_status: number // 网络状态 (0:停机, 1:开机)
   real_name_status: number // 实名状态 (0:未实名, 1:已实名)
-  batch_no: string // 批次号
-  supplier: string // 供应商
-  shop_id: number | null // 店铺ID
-  shop_name: string // 店铺名称
+  batch_no?: string // 批次号 (可选)
+  supplier?: string // 供应商 (可选)
+  shop_id?: number | null // 店铺ID (可选)
+  shop_name?: string // 店铺名称 (可选)
   cost_price: number // 成本价(分)
   distribute_price: number // 分销价(分)
   data_usage_mb: number // 累计流量使用(MB)
-  activated_at: string | null // 激活时间
+  first_commission_paid: boolean // 是否已支付首次佣金
+  accumulated_recharge: number // 累计充值金额(分)
+  activated_at?: string | null // 激活时间 (可选)
   created_at: string // 创建时间
   updated_at: string // 更新时间
 }
diff --git a/src/types/api/packageManagement.ts b/src/types/api/packageManagement.ts
index 8d862ac..87deeaf 100644
--- a/src/types/api/packageManagement.ts
+++ b/src/types/api/packageManagement.ts
@@ -144,58 +144,6 @@ export interface SeriesSelectOption {
   series_code: string
 }
 
-// ==================== 代理可售套餐 ====================
-
-/**
- * 我的可售套餐响应
- */
-export interface MyPackageResponse {
-  id: number
-  package_code: string
-  package_name: string
-  series_id: number
-  series_name: string
-  package_type: string
-  data_type: string
-  real_data_mb: number // 真流量额度（MB）
-  virtual_data_mb: number // 虚流量额度（MB）
-  duration_months: number
-  price: number // 套餐原价（分）
-  cost_price: number // 成本价（分）
-  suggested_retail_price: number // 建议售价（分）
-  profit_margin: number // 利润空间（分）
-  price_source: string // 价格来源：'series_pricing':系列加价, 'package_override':单套餐覆盖
-  shelf_status: number
-  status: number
-  description?: string
-  created_at: string
-  updated_at: string
-}
-
-/**
- * 我的可售套餐查询参数
- */
-export interface MyPackageQueryParams extends PaginationParams {
-  series_id?: number // 系列ID筛选
-  package_type?: string // 套餐类型筛选
-}
-
-/**
- * 我的被分配系列响应
- */
-export interface MySeriesAllocationResponse {
-  id: number // 分配ID
-  series_id: number
-  series_code: string
-  series_name: string
-  pricing_mode: string // 定价模式：'fixed':固定金额, 'percent':百分比
-  pricing_value: number // 定价值
-  allocator_shop_name: string // 分配者店铺名称
-  package_count: number // 可售套餐数量
-  status: number
-  created_at: string
-}
-
 // ==================== 单套餐分配 ====================
 
 /**
@@ -276,6 +224,28 @@ export interface TierCommissionConfig {
   tiers: TierEntry[] // 梯度档位数组
 }
 
+/**
+ * 一次性佣金梯度档位配置
+ */
+export interface OneTimeCommissionTierEntry {
+  tier_type: 'sales_count' | 'sales_amount' // 梯度类型：销量或销售额
+  threshold: number // 阈值
+  mode: 'fixed' | 'percent' // 返佣模式
+  value: number // 返佣值
+}
+
+/**
+ * 一次性佣金配置
+ */
+export interface OneTimeCommissionConfig {
+  type: 'fixed' | 'tiered' // 佣金类型：'fixed':固定佣金, 'tiered':梯度佣金
+  trigger: 'single_recharge' | 'accumulated_recharge' // 触发方式：'single_recharge':单笔充值, 'accumulated_recharge':累计充值
+  threshold: number // 最低阈值（分）
+  mode?: 'fixed' | 'percent' // 返佣模式（固定佣金时必填）
+  value?: number // 返佣值（固定佣金时必填）
+  tiers?: OneTimeCommissionTierEntry[] | null // 梯度档位数组（梯度佣金时必填）
+}
+
 /**
  * 套餐系列分配响应
  */
@@ -288,8 +258,8 @@ export interface ShopSeriesAllocationResponse {
   allocator_shop_id: number // 分配者店铺ID
   allocator_shop_name: string // 分配者店铺名称
   base_commission: BaseCommissionConfig // 基础返佣配置
-  enable_tier_commission: boolean // 是否启用梯度返佣
-  tier_config?: TierCommissionConfig // 梯度返佣配置（可选）
+  enable_one_time_commission: boolean // 是否启用一次性佣金
+  one_time_commission_config?: OneTimeCommissionConfig // 一次性佣金配置（可选）
   status: number // 1:启用, 2:禁用
   created_at: string
   updated_at: string
@@ -311,8 +281,8 @@ export interface CreateShopSeriesAllocationRequest {
   series_id: number // 套餐系列ID，必填
   shop_id: number // 店铺ID，必填
   base_commission: BaseCommissionConfig // 基础返佣配置，必填
-  enable_tier_commission?: boolean // 是否启用梯度返佣，可选（默认false）
-  tier_config?: TierCommissionConfig // 梯度返佣配置，当enable_tier_commission为true时必填
+  enable_one_time_commission?: boolean // 是否启用一次性佣金，可选（默认false）
+  one_time_commission_config?: OneTimeCommissionConfig // 一次性佣金配置，当enable_one_time_commission为true时必填
 }
 
 /**
@@ -320,8 +290,8 @@ export interface CreateShopSeriesAllocationRequest {
  */
 export interface UpdateShopSeriesAllocationRequest {
   base_commission?: BaseCommissionConfig // 基础返佣配置
-  enable_tier_commission?: boolean // 是否启用梯度返佣
-  tier_config?: TierCommissionConfig // 梯度返佣配置
+  enable_one_time_commission?: boolean // 是否启用一次性佣金
+  one_time_commission_config?: OneTimeCommissionConfig // 一次性佣金配置
 }
 
 /**
diff --git a/src/views/asset-management/device-task/index.vue b/src/views/asset-management/device-task/index.vue
new file mode 100644
index 0000000..60f054a
--- /dev/null
+++ b/src/views/asset-management/device-task/index.vue
@@ -0,0 +1,310 @@
+<template>
+  <ArtTableFullScreen>
+    <div class="device-task-page" id="table-full-screen">
+      <!-- 搜索栏 -->
+      <ArtSearchBar
+        v-model:filter="searchForm"
+        :items="searchFormItems"
+        @reset="handleReset"
+        @search="handleSearch"
+      ></ArtSearchBar>
+
+      <ElCard shadow="never" class="art-table-card">
+        <!-- 表格头部 -->
+        <ArtTableHeader
+          :columnList="columnOptions"
+          v-model:columns="columnChecks"
+          @refresh="handleRefresh"
+        />
+
+        <!-- 表格 -->
+        <ArtTable
+          ref="tableRef"
+          row-key="id"
+          :loading="loading"
+          :data="taskList"
+          :currentPage="pagination.page"
+          :pageSize="pagination.pageSize"
+          :total="pagination.total"
+          :marginTop="10"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        >
+          <template #default>
+            <ElTableColumn v-for="col in columns" :key="col.prop || col.type" v-bind="col" />
+          </template>
+        </ArtTable>
+      </ElCard>
+    </div>
+  </ArtTableFullScreen>
+</template>
+
+<script setup lang="ts">
+  import { h } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { DeviceService } from '@/api/modules'
+  import { ElMessage, ElTag } from 'element-plus'
+  import type { SearchFormItem } from '@/types'
+  import { useCheckedColumns } from '@/composables/useCheckedColumns'
+  import { formatDateTime } from '@/utils/business/format'
+  import ArtButtonTable from '@/components/core/forms/ArtButtonTable.vue'
+  import type { DeviceImportTask, DeviceImportTaskStatus } from '@/types/api/device'
+
+  defineOptions({ name: 'DeviceTask' })
+
+  const router = useRouter()
+  const loading = ref(false)
+  const tableRef = ref()
+
+  // 搜索表单初始值
+  const initialSearchState = {
+    status: undefined,
+    batch_no: '',
+    start_time: '',
+    end_time: ''
+  }
+
+  // 搜索表单
+  const searchForm = reactive({ ...initialSearchState })
+
+  // 分页
+  const pagination = reactive({
+    page: 1,
+    pageSize: 20,
+    total: 0
+  })
+
+  // 搜索表单配置
+  const searchFormItems: SearchFormItem[] = [
+    {
+      label: '任务状态',
+      prop: 'status',
+      type: 'select',
+      config: {
+        clearable: true,
+        placeholder: '全部'
+      },
+      options: () => [
+        { label: '待处理', value: 1 },
+        { label: '处理中', value: 2 },
+        { label: '已完成', value: 3 },
+        { label: '失败', value: 4 }
+      ]
+    },
+    {
+      label: '批次号',
+      prop: 'batch_no',
+      type: 'input',
+      config: {
+        clearable: true,
+        placeholder: '请输入批次号'
+      }
+    },
+    {
+      label: '创建时间',
+      prop: 'dateRange',
+      type: 'daterange',
+      config: {
+        type: 'daterange',
+        startPlaceholder: '开始时间',
+        endPlaceholder: '结束时间',
+        valueFormat: 'YYYY-MM-DDTHH:mm:ssZ'
+      }
+    }
+  ]
+
+  // 列配置
+  const columnOptions = [
+    { label: '任务编号', prop: 'task_no' },
+    { label: '批次号', prop: 'batch_no' },
+    { label: '文件名', prop: 'file_name' },
+    { label: '任务状态', prop: 'status' },
+    { label: '总数', prop: 'total_count' },
+    { label: '成功数', prop: 'success_count' },
+    { label: '失败数', prop: 'fail_count' },
+    { label: '跳过数', prop: 'skip_count' },
+    { label: '创建时间', prop: 'created_at' },
+    { label: '完成时间', prop: 'completed_at' },
+    { label: '操作', prop: 'operation' }
+  ]
+
+  const taskList = ref<DeviceImportTask[]>([])
+
+  // 获取状态标签类型
+  const getStatusType = (status: DeviceImportTaskStatus) => {
+    switch (status) {
+      case 1:
+        return 'info'
+      case 2:
+        return 'warning'
+      case 3:
+        return 'success'
+      case 4:
+        return 'danger'
+      default:
+        return 'info'
+    }
+  }
+
+  // 查看详情
+  const viewDetail = (row: DeviceImportTask) => {
+    router.push({
+      path: '/asset-management/task-detail',
+      query: {
+        id: row.id,
+        task_type: 'device'
+      }
+    })
+  }
+
+  // 动态列配置
+  const { columnChecks, columns } = useCheckedColumns(() => [
+    {
+      prop: 'task_no',
+      label: '任务编号',
+      width: 150
+    },
+    {
+      prop: 'batch_no',
+      label: '批次号',
+      width: 120
+    },
+    {
+      prop: 'file_name',
+      label: '文件名',
+      minWidth: 200
+    },
+    {
+      prop: 'status',
+      label: '任务状态',
+      width: 100,
+      formatter: (row: DeviceImportTask) => {
+        return h(ElTag, { type: getStatusType(row.status) }, () => row.status_text)
+      }
+    },
+    {
+      prop: 'total_count',
+      label: '总数',
+      width: 80
+    },
+    {
+      prop: 'success_count',
+      label: '成功数',
+      width: 80
+    },
+    {
+      prop: 'fail_count',
+      label: '失败数',
+      width: 80,
+      formatter: (row: DeviceImportTask) => {
+        const type = row.fail_count > 0 ? 'danger' : 'success'
+        return h(ElTag, { type, size: 'small' }, () => row.fail_count)
+      }
+    },
+    {
+      prop: 'skip_count',
+      label: '跳过数',
+      width: 80
+    },
+    {
+      prop: 'created_at',
+      label: '创建时间',
+      width: 160,
+      formatter: (row: DeviceImportTask) => formatDateTime(row.created_at)
+    },
+    {
+      prop: 'completed_at',
+      label: '完成时间',
+      width: 160,
+      formatter: (row: DeviceImportTask) => (row.completed_at ? formatDateTime(row.completed_at) : '-')
+    },
+    {
+      prop: 'operation',
+      label: '操作',
+      width: 100,
+      fixed: 'right',
+      formatter: (row: DeviceImportTask) => {
+        return h(ArtButtonTable, {
+          type: 'view',
+          onClick: () => viewDetail(row)
+        })
+      }
+    }
+  ])
+
+  onMounted(() => {
+    getTableData()
+  })
+
+  // 获取设备任务列表
+  const getTableData = async () => {
+    loading.value = true
+    try {
+      const params: any = {
+        page: pagination.page,
+        page_size: pagination.pageSize,
+        status: searchForm.status,
+        batch_no: searchForm.batch_no || undefined
+      }
+
+      // 处理时间范围
+      if (searchForm.dateRange && Array.isArray(searchForm.dateRange)) {
+        params.start_time = searchForm.dateRange[0]
+        params.end_time = searchForm.dateRange[1]
+      }
+
+      // 清理空值
+      Object.keys(params).forEach((key) => {
+        if (params[key] === '' || params[key] === undefined) {
+          delete params[key]
+        }
+      })
+
+      const res = await DeviceService.getImportTasks(params)
+      if (res.code === 0) {
+        taskList.value = res.data.list || []
+        pagination.total = res.data.total || 0
+      }
+    } catch (error) {
+      console.error(error)
+      ElMessage.error('获取设备任务列表失败')
+    } finally {
+      loading.value = false
+    }
+  }
+
+  // 重置搜索
+  const handleReset = () => {
+    Object.assign(searchForm, { ...initialSearchState })
+    pagination.page = 1
+    getTableData()
+  }
+
+  // 搜索
+  const handleSearch = () => {
+    pagination.page = 1
+    getTableData()
+  }
+
+  // 刷新表格
+  const handleRefresh = () => {
+    getTableData()
+  }
+
+  // 处理表格分页变化
+  const handleSizeChange = (newPageSize: number) => {
+    pagination.pageSize = newPageSize
+    getTableData()
+  }
+
+  const handleCurrentChange = (newCurrentPage: number) => {
+    pagination.page = newCurrentPage
+    getTableData()
+  }
+</script>
+
+<style lang="scss" scoped>
+  .device-task-page {
+    // Device task page styles
+  }
+</style>
diff --git a/src/views/asset-management/card-list/index.vue b/src/views/asset-management/iot-card-management/index.vue
similarity index 90%
rename from src/views/asset-management/card-list/index.vue
rename to src/views/asset-management/iot-card-management/index.vue
index 0e6f998..67b113f 100644
--- a/src/views/asset-management/card-list/index.vue
+++ b/src/views/asset-management/iot-card-management/index.vue
@@ -28,6 +28,11 @@
             <ElButton type="info" :disabled="selectedCards.length === 0" @click="showSeriesBindingDialog">
               批量设置套餐系列
             </ElButton>
+            <ElButton type="primary" @click="cardDistribution">网卡分销</ElButton>
+            <ElButton type="success" @click="batchRecharge">批量充值</ElButton>
+            <ElButton type="danger" @click="cardRecycle">网卡回收</ElButton>
+            <ElButton type="info" @click="batchDownload">批量下载</ElButton>
+            <ElButton type="warning" @click="changePackage">变更套餐</ElButton>
           </template>
         </ArtTableHeader>
 
@@ -404,15 +409,10 @@
   const initialSearchState = {
     status: undefined,
     carrier_id: undefined,
-    shop_id: undefined,
     iccid: '',
     msisdn: '',
     batch_no: '',
-    package_id: undefined,
-    is_distributed: undefined,
-    is_replaced: undefined,
-    iccid_start: '',
-    iccid_end: ''
+    is_distributed: undefined
   }
 
   // 搜索表单
@@ -603,14 +603,19 @@
   // 列配置
   const columnOptions = [
     { label: 'ICCID', prop: 'iccid' },
-    { label: 'IMSI', prop: 'imsi' },
     { label: '卡接入号', prop: 'msisdn' },
-    { label: '运营商', prop: 'carrier_name' },
     { label: '卡类型', prop: 'card_type' },
+    { label: '卡业务类型', prop: 'card_category' },
+    { label: '运营商', prop: 'carrier_name' },
+    { label: '成本价', prop: 'cost_price' },
+    { label: '分销价', prop: 'distribute_price' },
     { label: '状态', prop: 'status' },
-    { label: '批次号', prop: 'batch_no' },
-    { label: '店铺名称', prop: 'shop_name' },
-    { label: '激活时间', prop: 'activated_at' },
+    { label: '激活状态', prop: 'activation_status' },
+    { label: '网络状态', prop: 'network_status' },
+    { label: '实名状态', prop: 'real_name_status' },
+    { label: '累计流量(MB)', prop: 'data_usage_mb' },
+    { label: '首次佣金', prop: 'first_commission_paid' },
+    { label: '累计充值', prop: 'accumulated_recharge' },
     { label: '创建时间', prop: 'created_at' }
   ]
 
@@ -653,28 +658,40 @@
     {
       prop: 'iccid',
       label: 'ICCID',
-      minWidth: 180
-    },
-    {
-      prop: 'imsi',
-      label: 'IMSI',
-      width: 150
+      minWidth: 190
     },
     {
       prop: 'msisdn',
       label: '卡接入号',
-      width: 120
-    },
-    {
-      prop: 'carrier_name',
-      label: '运营商',
-      width: 100
+      width: 130
     },
     {
       prop: 'card_type',
       label: '卡类型',
       width: 100
     },
+    {
+      prop: 'card_category',
+      label: '卡业务类型',
+      width: 100
+    },
+    {
+      prop: 'carrier_name',
+      label: '运营商',
+      width: 150
+    },
+    {
+      prop: 'cost_price',
+      label: '成本价',
+      width: 100,
+      formatter: (row: StandaloneIotCard) => `¥${(row.cost_price / 100).toFixed(2)}`
+    },
+    {
+      prop: 'distribute_price',
+      label: '分销价',
+      width: 100,
+      formatter: (row: StandaloneIotCard) => `¥${(row.distribute_price / 100).toFixed(2)}`
+    },
     {
       prop: 'status',
       label: '状态',
@@ -684,20 +701,55 @@
       }
     },
     {
-      prop: 'batch_no',
-      label: '批次号',
+      prop: 'activation_status',
+      label: '激活状态',
+      width: 100,
+      formatter: (row: StandaloneIotCard) => {
+        const type = row.activation_status === 1 ? 'success' : 'info'
+        const text = row.activation_status === 1 ? '已激活' : '未激活'
+        return h(ElTag, { type }, () => text)
+      }
+    },
+    {
+      prop: 'network_status',
+      label: '网络状态',
+      width: 100,
+      formatter: (row: StandaloneIotCard) => {
+        const type = row.network_status === 1 ? 'success' : 'danger'
+        const text = row.network_status === 1 ? '开机' : '停机'
+        return h(ElTag, { type }, () => text)
+      }
+    },
+    {
+      prop: 'real_name_status',
+      label: '实名状态',
+      width: 100,
+      formatter: (row: StandaloneIotCard) => {
+        const type = row.real_name_status === 1 ? 'success' : 'warning'
+        const text = row.real_name_status === 1 ? '已实名' : '未实名'
+        return h(ElTag, { type }, () => text)
+      }
+    },
+    {
+      prop: 'data_usage_mb',
+      label: '累计流量(MB)',
       width: 120
     },
     {
-      prop: 'shop_name',
-      label: '店铺名称',
-      width: 150
+      prop: 'first_commission_paid',
+      label: '首次佣金',
+      width: 100,
+      formatter: (row: StandaloneIotCard) => {
+        const type = row.first_commission_paid ? 'success' : 'info'
+        const text = row.first_commission_paid ? '已支付' : '未支付'
+        return h(ElTag, { type, size: 'small' }, () => text)
+      }
     },
     {
-      prop: 'activated_at',
-      label: '激活时间',
-      width: 160,
-      formatter: (row: StandaloneIotCard) => (row.activated_at ? formatDateTime(row.activated_at) : '-')
+      prop: 'accumulated_recharge',
+      label: '累计充值',
+      width: 100,
+      formatter: (row: StandaloneIotCard) => `¥${(row.accumulated_recharge / 100).toFixed(2)}`
     },
     {
       prop: 'created_at',
@@ -729,7 +781,7 @@
 
       const res = await CardService.getStandaloneIotCards(params)
       if (res.code === 0) {
-        cardList.value = res.data.list || []
+        cardList.value = res.data.items || []
         pagination.total = res.data.total || 0
       }
     } catch (error) {
@@ -1127,6 +1179,31 @@
       }
     })
   }
+
+  // 网卡分销 - 正在开发中
+  const cardDistribution = () => {
+    ElMessage.info('功能正在开发中')
+  }
+
+  // 批量充值 - 正在开发中
+  const batchRecharge = () => {
+    ElMessage.info('功能正在开发中')
+  }
+
+  // 网卡回收 - 正在开发中
+  const cardRecycle = () => {
+    ElMessage.info('功能正在开发中')
+  }
+
+  // 批量下载 - 正在开发中
+  const batchDownload = () => {
+    ElMessage.info('功能正在开发中')
+  }
+
+  // 变更套餐 - 正在开发中
+  const changePackage = () => {
+    ElMessage.info('功能正在开发中')
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/asset-management/card-search/index.vue b/src/views/asset-management/iot-card-query/index.vue
similarity index 100%
rename from src/views/asset-management/card-search/index.vue
rename to src/views/asset-management/iot-card-query/index.vue
diff --git a/src/views/asset-management/task-management/index.vue b/src/views/asset-management/iot-card-task/index.vue
similarity index 62%
rename from src/views/asset-management/task-management/index.vue
rename to src/views/asset-management/iot-card-task/index.vue
index f5e77a6..6a2a17a 100644
--- a/src/views/asset-management/task-management/index.vue
+++ b/src/views/asset-management/iot-card-task/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ArtTableFullScreen>
-    <div class="task-management-page" id="table-full-screen">
+    <div class="iot-card-task-page" id="table-full-screen">
       <!-- 搜索栏 -->
       <ArtSearchBar
         v-model:filter="searchForm"
@@ -42,33 +42,26 @@
 <script setup lang="ts">
   import { h } from 'vue'
   import { useRouter } from 'vue-router'
-  import { CardService, DeviceService } from '@/api/modules'
+  import { CardService } from '@/api/modules'
   import { ElMessage, ElTag } from 'element-plus'
   import type { SearchFormItem } from '@/types'
   import { useCheckedColumns } from '@/composables/useCheckedColumns'
   import { formatDateTime } from '@/utils/business/format'
   import ArtButtonTable from '@/components/core/forms/ArtButtonTable.vue'
   import type { IotCardImportTask, IotCardImportTaskStatus } from '@/types/api/card'
-  import type { DeviceImportTask } from '@/types/api/device'
 
-  defineOptions({ name: 'TaskManagement' })
+  defineOptions({ name: 'IotCardTask' })
 
   const router = useRouter()
   const loading = ref(false)
   const tableRef = ref()
 
-  // 任务类型
-  type TaskType = 'card' | 'device'
-  type ImportTask = IotCardImportTask | DeviceImportTask
-
   // 搜索表单初始值
   const initialSearchState = {
-    task_type: undefined as TaskType | undefined,
     status: undefined,
     carrier_id: undefined,
     batch_no: '',
-    start_time: '',
-    end_time: ''
+    dateRange: undefined as any
   }
 
   // 搜索表单
@@ -83,19 +76,6 @@
 
   // 搜索表单配置
   const searchFormItems: SearchFormItem[] = [
-    {
-      label: '任务类型',
-      prop: 'task_type',
-      type: 'select',
-      config: {
-        clearable: true,
-        placeholder: '全部'
-      },
-      options: () => [
-        { label: 'ICCID导入', value: 'card' },
-        { label: '设备导入', value: 'device' }
-      ]
-    },
     {
       label: '任务状态',
       prop: 'status',
@@ -150,21 +130,21 @@
   // 列配置
   const columnOptions = [
     { label: '任务编号', prop: 'task_no' },
-    { label: '任务类型', prop: 'task_type' },
-    { label: '批次号', prop: 'batch_no' },
+    { label: '任务状态', prop: 'status' },
     { label: '运营商', prop: 'carrier_name' },
     { label: '文件名', prop: 'file_name' },
-    { label: '任务状态', prop: 'status' },
     { label: '总数', prop: 'total_count' },
     { label: '成功数', prop: 'success_count' },
     { label: '失败数', prop: 'fail_count' },
     { label: '跳过数', prop: 'skip_count' },
-    { label: '创建时间', prop: 'created_at' },
+    { label: '开始时间', prop: 'started_at' },
     { label: '完成时间', prop: 'completed_at' },
+    { label: '错误信息', prop: 'error_message' },
+    { label: '创建时间', prop: 'created_at' },
     { label: '操作', prop: 'operation' }
   ]
 
-  const taskList = ref<ImportTask[]>([])
+  const taskList = ref<IotCardImportTask[]>([])
 
   // 获取状态标签类型
   const getStatusType = (status: IotCardImportTaskStatus) => {
@@ -182,27 +162,13 @@
     }
   }
 
-  // 获取任务类型
-  const getTaskType = (row: ImportTask): TaskType => {
-    // 判断是否为设备导入任务（设备导入任务有 device_no 字段，卡导入任务有 carrier_name 字段）
-    if ('device_no' in row || (row.batch_no && row.batch_no.startsWith('DEV-'))) {
-      return 'device'
-    }
-    return 'card'
-  }
-
-  // 获取任务类型文本
-  const getTaskTypeText = (taskType: TaskType) => {
-    return taskType === 'device' ? '设备导入' : 'ICCID导入'
-  }
-
   // 查看详情
-  const viewDetail = (row: ImportTask) => {
+  const viewDetail = (row: IotCardImportTask) => {
     router.push({
       path: '/asset-management/task-detail',
       query: {
         id: row.id,
-        task_type: getTaskType(row)
+        task_type: 'card'
       }
     })
   }
@@ -212,44 +178,26 @@
     {
       prop: 'task_no',
       label: '任务编号',
-      width: 150
-    },
-    {
-      prop: 'task_type',
-      label: '任务类型',
-      width: 100,
-      formatter: (row: ImportTask) => {
-        const taskType = getTaskType(row)
-        const tagType = taskType === 'device' ? 'warning' : 'primary'
-        return h(ElTag, { type: tagType, size: 'small' }, () => getTaskTypeText(taskType))
-      }
-    },
-    {
-      prop: 'batch_no',
-      label: '批次号',
-      width: 120
-    },
-    {
-      prop: 'carrier_name',
-      label: '运营商',
-      width: 100,
-      formatter: (row: ImportTask) => {
-        return (row as IotCardImportTask).carrier_name || '-'
-      }
-    },
-    {
-      prop: 'file_name',
-      label: '文件名',
-      minWidth: 200
+      width: 180
     },
     {
       prop: 'status',
       label: '任务状态',
       width: 100,
-      formatter: (row: ImportTask) => {
+      formatter: (row: IotCardImportTask) => {
         return h(ElTag, { type: getStatusType(row.status) }, () => row.status_text)
       }
     },
+    {
+      prop: 'carrier_name',
+      label: '运营商',
+      width: 120
+    },
+    {
+      prop: 'file_name',
+      label: '文件名',
+      minWidth: 250
+    },
     {
       prop: 'total_count',
       label: '总数',
@@ -264,7 +212,7 @@
       prop: 'fail_count',
       label: '失败数',
       width: 80,
-      formatter: (row: ImportTask) => {
+      formatter: (row: IotCardImportTask) => {
         const type = row.fail_count > 0 ? 'danger' : 'success'
         return h(ElTag, { type, size: 'small' }, () => row.fail_count)
       }
@@ -275,25 +223,37 @@
       width: 80
     },
     {
-      prop: 'created_at',
-      label: '创建时间',
+      prop: 'started_at',
+      label: '开始时间',
       width: 160,
-      formatter: (row: ImportTask) => formatDateTime(row.created_at)
+      formatter: (row: IotCardImportTask) => (row.started_at ? formatDateTime(row.started_at) : '-')
     },
     {
       prop: 'completed_at',
       label: '完成时间',
       width: 160,
-      formatter: (row: ImportTask) => (row.completed_at ? formatDateTime(row.completed_at) : '-')
+      formatter: (row: IotCardImportTask) => (row.completed_at ? formatDateTime(row.completed_at) : '-')
+    },
+    {
+      prop: 'error_message',
+      label: '错误信息',
+      minWidth: 200,
+      formatter: (row: IotCardImportTask) => row.error_message || '-'
+    },
+    {
+      prop: 'created_at',
+      label: '创建时间',
+      width: 160,
+      formatter: (row: IotCardImportTask) => formatDateTime(row.created_at)
     },
     {
       prop: 'operation',
       label: '操作',
-      width: 100,
+      width: 120,
       fixed: 'right',
-      formatter: (row: ImportTask) => {
+      formatter: (row: IotCardImportTask) => {
         return h(ArtButtonTable, {
-          type: 'view',
+          text: '查看详情',
           onClick: () => viewDetail(row)
         })
       }
@@ -304,7 +264,7 @@
     getTableData()
   })
 
-  // 获取任务列表
+  // 获取IoT卡任务列表
   const getTableData = async () => {
     loading.value = true
     try {
@@ -312,6 +272,7 @@
         page: pagination.page,
         page_size: pagination.pageSize,
         status: searchForm.status,
+        carrier_id: searchForm.carrier_id,
         batch_no: searchForm.batch_no || undefined
       }
 
@@ -328,52 +289,14 @@
         }
       })
 
-      // 根据任务类型获取不同的数据
-      if (searchForm.task_type === 'device') {
-        // 仅获取设备导入任务
-        const res = await DeviceService.getImportTasks(params)
-        if (res.code === 0) {
-          taskList.value = res.data.list || []
-          pagination.total = res.data.total || 0
-        }
-      } else if (searchForm.task_type === 'card') {
-        // 仅获取ICCID导入任务（需要carrier_id参数）
-        const cardParams = {
-          ...params,
-          carrier_id: searchForm.carrier_id
-        }
-        const res = await CardService.getIotCardImportTasks(cardParams)
-        if (res.code === 0) {
-          taskList.value = res.data.list || []
-          pagination.total = res.data.total || 0
-        }
-      } else {
-        // 获取所有类型任务 - 分别调用两个API然后合并结果
-        const [cardRes, deviceRes] = await Promise.all([
-          CardService.getIotCardImportTasks({
-            ...params,
-            carrier_id: searchForm.carrier_id
-          }),
-          DeviceService.getImportTasks(params)
-        ])
-
-        const cardTasks = cardRes.code === 0 ? cardRes.data.list || [] : []
-        const deviceTasks = deviceRes.code === 0 ? deviceRes.data.list || [] : []
-
-        // 合并并按创建时间排序
-        const allTasks = [...cardTasks, ...deviceTasks].sort((a, b) => {
-          return new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
-        })
-
-        // 前端分页
-        const start = (pagination.page - 1) * pagination.pageSize
-        const end = start + pagination.pageSize
-        taskList.value = allTasks.slice(start, end)
-        pagination.total = allTasks.length
+      const res = await CardService.getIotCardImportTasks(params)
+      if (res.code === 0) {
+        taskList.value = res.data.items || []
+        pagination.total = res.data.total || 0
       }
     } catch (error) {
       console.error(error)
-      ElMessage.error('获取任务列表失败')
+      ElMessage.error('获取IoT卡任务列表失败')
     } finally {
       loading.value = false
     }
@@ -410,7 +333,7 @@
 </script>
 
 <style lang="scss" scoped>
-  .task-management-page {
-    // Task management page styles
+  .iot-card-task-page {
+    // IoT card task page styles
   }
 </style>
diff --git a/src/views/dashboard/analysis/index.vue b/src/views/dashboard/analysis/index.vue
index f14bca4..bac095c 100644
--- a/src/views/dashboard/analysis/index.vue
+++ b/src/views/dashboard/analysis/index.vue
@@ -1,37 +1,38 @@
 <template>
   <div class="analysis-dashboard">
-    <el-row :gutter="20">
-      <el-col :xl="14" :lg="15" :xs="24">
-        <TodaySales />
-      </el-col>
-      <el-col :xl="10" :lg="9" :xs="24">
-        <VisitorInsights />
-      </el-col>
-    </el-row>
+    开发中敬请期待...
+    <!--<el-row :gutter="20">-->
+    <!--  <el-col :xl="14" :lg="15" :xs="24">-->
+    <!--    <TodaySales />-->
+    <!--  </el-col>-->
+    <!--  <el-col :xl="10" :lg="9" :xs="24">-->
+    <!--    <VisitorInsights />-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
 
-    <el-row :gutter="20" class="mt-20">
-      <el-col :xl="10" :lg="10" :xs="24">
-        <TotalRevenue />
-      </el-col>
-      <el-col :xl="7" :lg="7" :xs="24">
-        <CustomerSatisfaction />
-      </el-col>
-      <el-col :xl="7" :lg="7" :xs="24">
-        <TargetVsReality />
-      </el-col>
-    </el-row>
+    <!--<el-row :gutter="20" class="mt-20">-->
+    <!--  <el-col :xl="10" :lg="10" :xs="24">-->
+    <!--    <TotalRevenue />-->
+    <!--  </el-col>-->
+    <!--  <el-col :xl="7" :lg="7" :xs="24">-->
+    <!--    <CustomerSatisfaction />-->
+    <!--  </el-col>-->
+    <!--  <el-col :xl="7" :lg="7" :xs="24">-->
+    <!--    <TargetVsReality />-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
 
-    <el-row :gutter="20" class="mt-20">
-      <el-col :xl="10" :lg="10" :xs="24">
-        <TopProducts />
-      </el-col>
-      <el-col :xl="7" :lg="7" :xs="24">
-        <SalesMappingByCountry />
-      </el-col>
-      <el-col :xl="7" :lg="7" :xs="24">
-        <VolumeServiceLevel />
-      </el-col>
-    </el-row>
+    <!--<el-row :gutter="20" class="mt-20">-->
+    <!--  <el-col :xl="10" :lg="10" :xs="24">-->
+    <!--    <TopProducts />-->
+    <!--  </el-col>-->
+    <!--  <el-col :xl="7" :lg="7" :xs="24">-->
+    <!--    <SalesMappingByCountry />-->
+    <!--  </el-col>-->
+    <!--  <el-col :xl="7" :lg="7" :xs="24">-->
+    <!--    <VolumeServiceLevel />-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
   </div>
 </template>
 
diff --git a/src/views/dashboard/console/index.vue b/src/views/dashboard/console/index.vue
index a2e8784..d9d44a8 100644
--- a/src/views/dashboard/console/index.vue
+++ b/src/views/dashboard/console/index.vue
@@ -1,29 +1,30 @@
 <template>
   <div class="console">
-    <CardList></CardList>
+    开发中敬请期待...
+    <!--<CardList></CardList>-->
 
-    <el-row :gutter="20">
-      <el-col :sm="24" :md="12" :lg="10">
-        <ActiveUser />
-      </el-col>
-      <el-col :sm="24" :md="12" :lg="14">
-        <SalesOverview />
-      </el-col>
-    </el-row>
+    <!--<el-row :gutter="20">-->
+    <!--  <el-col :sm="24" :md="12" :lg="10">-->
+    <!--    <ActiveUser />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="24" :md="12" :lg="14">-->
+    <!--    <SalesOverview />-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
 
-    <el-row :gutter="20">
-      <el-col :sm="24" :md="24" :lg="12">
-        <NewUser />
-      </el-col>
-      <el-col :sm="24" :md="12" :lg="6">
-        <Dynamic />
-      </el-col>
-      <el-col :sm="24" :md="12" :lg="6">
-        <TodoList />
-      </el-col>
-    </el-row>
+    <!--<el-row :gutter="20">-->
+    <!--  <el-col :sm="24" :md="24" :lg="12">-->
+    <!--    <NewUser />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="24" :md="12" :lg="6">-->
+    <!--    <Dynamic />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="24" :md="12" :lg="6">-->
+    <!--    <TodoList />-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
 
-    <AboutProject />
+    <!--<AboutProject />-->
   </div>
 </template>
 
diff --git a/src/views/dashboard/ecommerce/index.vue b/src/views/dashboard/ecommerce/index.vue
index ec22e04..3fde32a 100644
--- a/src/views/dashboard/ecommerce/index.vue
+++ b/src/views/dashboard/ecommerce/index.vue
@@ -1,59 +1,60 @@
 <template>
   <div class="ecommerce">
-    <el-row :gutter="20">
-      <el-col :sm="24" :md="24" :lg="16">
-        <Banner />
-      </el-col>
-      <el-col :sm="12" :md="12" :lg="4">
-        <TotalOrderVolume />
-      </el-col>
-      <el-col :sm="12" :md="12" :lg="4">
-        <TotalProducts />
-      </el-col>
-    </el-row>
+    开发中敬请期待...
+    <!--<el-row :gutter="20">-->
+    <!--  <el-col :sm="24" :md="24" :lg="16">-->
+    <!--    <Banner />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="12" :md="12" :lg="4">-->
+    <!--    <TotalOrderVolume />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="12" :md="12" :lg="4">-->
+    <!--    <TotalProducts />-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
 
-    <el-row :gutter="20">
-      <el-col :sm="12" :md="12" :lg="8">
-        <SalesTrend />
-      </el-col>
-      <el-col :sm="12" :md="12" :lg="8">
-        <SalesClassification />
-      </el-col>
-      <el-col :sm="24" :md="24" :lg="8">
-        <el-row :gutter="20">
-          <el-col :sm="24" :md="12" :lg="12">
-            <ProductSales />
-          </el-col>
-          <el-col :sm="24" :md="12" :lg="12">
-            <SalesGrowth />
-          </el-col>
-          <el-col :span="24" class="no-margin-bottom">
-            <CartConversionRate />
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
+    <!--<el-row :gutter="20">-->
+    <!--  <el-col :sm="12" :md="12" :lg="8">-->
+    <!--    <SalesTrend />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="12" :md="12" :lg="8">-->
+    <!--    <SalesClassification />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="24" :md="24" :lg="8">-->
+    <!--    <el-row :gutter="20">-->
+    <!--      <el-col :sm="24" :md="12" :lg="12">-->
+    <!--        <ProductSales />-->
+    <!--      </el-col>-->
+    <!--      <el-col :sm="24" :md="12" :lg="12">-->
+    <!--        <SalesGrowth />-->
+    <!--      </el-col>-->
+    <!--      <el-col :span="24" class="no-margin-bottom">-->
+    <!--        <CartConversionRate />-->
+    <!--      </el-col>-->
+    <!--    </el-row>-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
 
-    <el-row :gutter="20">
-      <el-col :sm="24" :md="12" :lg="8">
-        <HotCommodity />
-      </el-col>
-      <el-col :sm="24" :md="12" :lg="8">
-        <AnnualSales />
-      </el-col>
-      <el-col :sm="24" :md="24" :lg="8">
-        <TransactionList />
-      </el-col>
-    </el-row>
+    <!--<el-row :gutter="20">-->
+    <!--  <el-col :sm="24" :md="12" :lg="8">-->
+    <!--    <HotCommodity />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="24" :md="12" :lg="8">-->
+    <!--    <AnnualSales />-->
+    <!--  </el-col>-->
+    <!--  <el-col :sm="24" :md="24" :lg="8">-->
+    <!--    <TransactionList />-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
 
-    <el-row :gutter="20">
-      <el-col :md="24" :lg="8">
-        <RecentTransaction />
-      </el-col>
-      <el-col :md="24" :lg="16" class="no-margin-bottom">
-        <HotProductsList />
-      </el-col>
-    </el-row>
+    <!--<el-row :gutter="20">-->
+    <!--  <el-col :md="24" :lg="8">-->
+    <!--    <RecentTransaction />-->
+    <!--  </el-col>-->
+    <!--  <el-col :md="24" :lg="16" class="no-margin-bottom">-->
+    <!--    <HotProductsList />-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
   </div>
 </template>
 
diff --git a/src/views/package-management/my-packages/index.vue b/src/views/package-management/my-packages/index.vue
deleted file mode 100644
index e0b7d9b..0000000
--- a/src/views/package-management/my-packages/index.vue
+++ /dev/null
@@ -1,382 +0,0 @@
-<template>
-  <ArtTableFullScreen>
-    <div class="my-packages-page" id="table-full-screen">
-      <!-- 搜索栏 -->
-      <ArtSearchBar
-        v-model:filter="searchForm"
-        :items="searchFormItems"
-        :show-expand="false"
-        @reset="handleReset"
-        @search="handleSearch"
-      ></ArtSearchBar>
-
-      <ElCard shadow="never" class="art-table-card">
-        <!-- 表格头部 -->
-        <ArtTableHeader
-          :columnList="columnOptions"
-          v-model:columns="columnChecks"
-          @refresh="handleRefresh"
-        >
-        </ArtTableHeader>
-
-        <!-- 表格 -->
-        <ArtTable
-          ref="tableRef"
-          row-key="id"
-          :loading="loading"
-          :data="packageList"
-          :currentPage="pagination.page"
-          :pageSize="pagination.page_size"
-          :total="pagination.total"
-          :marginTop="10"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        >
-          <template #default>
-            <ElTableColumn v-for="col in columns" :key="col.prop || col.type" v-bind="col" />
-          </template>
-        </ArtTable>
-
-        <!-- 详情对话框 -->
-        <ElDialog v-model="detailDialogVisible" title="套餐详情" width="600px">
-          <ElDescriptions :column="2" border v-if="currentPackage">
-            <ElDescriptionsItem label="套餐编码">{{
-              currentPackage.package_code
-            }}</ElDescriptionsItem>
-            <ElDescriptionsItem label="套餐名称">{{
-              currentPackage.package_name
-            }}</ElDescriptionsItem>
-            <ElDescriptionsItem label="所属系列">{{
-              currentPackage.series_name
-            }}</ElDescriptionsItem>
-            <ElDescriptionsItem label="套餐类型">
-              <ElTag :type="getPackageTypeTag(currentPackage.package_type)">{{
-                getPackageTypeLabel(currentPackage.package_type)
-              }}</ElTag>
-            </ElDescriptionsItem>
-            <ElDescriptionsItem label="流量类型">
-              <ElTag :type="getDataTypeTag(currentPackage.data_type)">{{
-                getDataTypeLabel(currentPackage.data_type)
-              }}</ElTag>
-            </ElDescriptionsItem>
-            <ElDescriptionsItem label="真流量">{{
-              currentPackage.real_data_mb
-            }}MB</ElDescriptionsItem>
-            <ElDescriptionsItem label="虚流量">{{
-              currentPackage.virtual_data_mb
-            }}MB</ElDescriptionsItem>
-            <ElDescriptionsItem label="有效期">{{
-              currentPackage.duration_months
-            }}月</ElDescriptionsItem>
-            <ElDescriptionsItem label="套餐价格">¥{{
-              (currentPackage.price / 100).toFixed(2)
-            }}</ElDescriptionsItem>
-            <ElDescriptionsItem label="上架状态">
-              <ElTag :type="currentPackage.shelf_status === 1 ? 'success' : 'info'">{{
-                currentPackage.shelf_status === 1 ? '上架' : '下架'
-              }}</ElTag>
-            </ElDescriptionsItem>
-            <ElDescriptionsItem label="状态">
-              <ElTag :type="currentPackage.status === 1 ? 'success' : 'danger'">{{
-                currentPackage.status === 1 ? '启用' : '禁用'
-              }}</ElTag>
-            </ElDescriptionsItem>
-            <ElDescriptionsItem label="描述" :span="2">{{
-              currentPackage.description || '无'
-            }}</ElDescriptionsItem>
-          </ElDescriptions>
-          <template #footer>
-            <div class="dialog-footer">
-              <ElButton type="primary" @click="detailDialogVisible = false">关闭</ElButton>
-            </div>
-          </template>
-        </ElDialog>
-      </ElCard>
-    </div>
-  </ArtTableFullScreen>
-</template>
-
-<script setup lang="ts">
-  import { h } from 'vue'
-  import { PackageManageService, PackageSeriesService } from '@/api/modules'
-  import { ElMessage, ElTag, ElDescriptions, ElDescriptionsItem } from 'element-plus'
-  import type { PackageResponse } from '@/types/api'
-  import type { SearchFormItem } from '@/types'
-  import { useCheckedColumns } from '@/composables/useCheckedColumns'
-  import ArtButtonTable from '@/components/core/forms/ArtButtonTable.vue'
-  import { formatDateTime } from '@/utils/business/format'
-  import {
-    PACKAGE_TYPE_OPTIONS,
-    getPackageTypeLabel,
-    getPackageTypeTag,
-    getDataTypeLabel,
-    getDataTypeTag
-  } from '@/config/constants'
-
-  defineOptions({ name: 'MyPackages' })
-
-  const loading = ref(false)
-  const seriesLoading = ref(false)
-  const detailDialogVisible = ref(false)
-  const tableRef = ref()
-  const currentPackage = ref<PackageResponse | null>(null)
-  const seriesOptions = ref<any[]>([])
-
-  // 搜索表单初始值
-  const initialSearchState = {
-    series_id: undefined as number | undefined,
-    package_type: undefined as string | undefined
-  }
-
-  // 搜索表单
-  const searchForm = reactive({ ...initialSearchState })
-
-  // 搜索表单配置
-  const searchFormItems = computed<SearchFormItem[]>(() => [
-    {
-      label: '套餐系列',
-      prop: 'series_id',
-      type: 'select',
-      config: {
-        clearable: true,
-        filterable: true,
-        remote: true,
-        remoteMethod: searchSeries,
-        loading: seriesLoading.value,
-        placeholder: '请选择或搜索套餐系列'
-      },
-      options: () =>
-        seriesOptions.value.map((s: any) => ({
-          label: s.series_name,
-          value: s.id
-        }))
-    },
-    {
-      label: '套餐类型',
-      prop: 'package_type',
-      type: 'select',
-      config: {
-        clearable: true,
-        placeholder: '请选择套餐类型'
-      },
-      options: () =>
-        PACKAGE_TYPE_OPTIONS.map((o) => ({
-          label: o.label,
-          value: o.value
-        }))
-    }
-  ])
-
-  // 分页
-  const pagination = reactive({
-    page: 1,
-    page_size: 20,
-    total: 0
-  })
-
-  // 列配置
-  const columnOptions = [
-    { label: 'ID', prop: 'id' },
-    { label: '套餐编码', prop: 'package_code' },
-    { label: '套餐名称', prop: 'package_name' },
-    { label: '所属系列', prop: 'series_name' },
-    { label: '套餐类型', prop: 'package_type' },
-    { label: '流量类型', prop: 'data_type' },
-    { label: '真流量', prop: 'real_data_mb' },
-    { label: '虚流量', prop: 'virtual_data_mb' },
-    { label: '有效期', prop: 'duration_months' },
-    { label: '操作', prop: 'operation' }
-  ]
-
-  const packageList = ref<PackageResponse[]>([])
-
-  // 动态列配置
-  const { columnChecks, columns } = useCheckedColumns(() => [
-    {
-      prop: 'id',
-      label: 'ID',
-      width: 80
-    },
-    {
-      prop: 'package_code',
-      label: '套餐编码',
-      minWidth: 150
-    },
-    {
-      prop: 'package_name',
-      label: '套餐名称',
-      minWidth: 180
-    },
-    {
-      prop: 'series_name',
-      label: '所属系列',
-      width: 120
-    },
-    {
-      prop: 'package_type',
-      label: '套餐类型',
-      width: 100,
-      formatter: (row: PackageResponse) => {
-        return h(
-          ElTag,
-          { type: getPackageTypeTag(row.package_type), size: 'small' },
-          () => getPackageTypeLabel(row.package_type)
-        )
-      }
-    },
-    {
-      prop: 'data_type',
-      label: '流量类型',
-      width: 100,
-      formatter: (row: PackageResponse) => {
-        return h(
-          ElTag,
-          { type: getDataTypeTag(row.data_type), size: 'small' },
-          () => getDataTypeLabel(row.data_type)
-        )
-      }
-    },
-    {
-      prop: 'real_data_mb',
-      label: '真流量',
-      width: 100,
-      formatter: (row: PackageResponse) => `${row.real_data_mb}MB`
-    },
-    {
-      prop: 'virtual_data_mb',
-      label: '虚流量',
-      width: 100,
-      formatter: (row: PackageResponse) => `${row.virtual_data_mb}MB`
-    },
-    {
-      prop: 'duration_months',
-      label: '有效期',
-      width: 100,
-      formatter: (row: PackageResponse) => `${row.duration_months}月`
-    },
-    {
-      prop: 'operation',
-      label: '操作',
-      width: 100,
-      fixed: 'right',
-      formatter: (row: PackageResponse) => {
-        return h(ArtButtonTable, {
-          text: '查看详情',
-          onClick: () => showDetail(row)
-        })
-      }
-    }
-  ])
-
-  onMounted(() => {
-    loadSeriesOptions()
-    getTableData()
-  })
-
-  // 加载套餐系列选项(默认加载10条)
-  const loadSeriesOptions = async (seriesName?: string) => {
-    seriesLoading.value = true
-    try {
-      const params: any = {
-        page: 1,
-        page_size: 10,
-        status: 1
-      }
-      if (seriesName) {
-        params.series_name = seriesName
-      }
-      const res = await PackageSeriesService.getPackageSeries(params)
-      if (res.code === 0) {
-        seriesOptions.value = res.data.items || []
-      }
-    } catch (error) {
-      console.error('加载系列选项失败:', error)
-    } finally {
-      seriesLoading.value = false
-    }
-  }
-
-  // 搜索系列
-  const searchSeries = (query: string) => {
-    if (query) {
-      loadSeriesOptions(query)
-    } else {
-      loadSeriesOptions()
-    }
-  }
-
-  // 获取我的可售套餐列表
-  const getTableData = async () => {
-    loading.value = true
-    try {
-      const params = {
-        page: pagination.page,
-        page_size: pagination.page_size,
-        series_id: searchForm.series_id || undefined,
-        package_type: searchForm.package_type || undefined
-      }
-      const res = await PackageManageService.getPackages(params)
-      if (res.code === 0) {
-        packageList.value = res.data.items || []
-        pagination.total = res.data.total || 0
-      }
-    } catch (error) {
-      console.error(error)
-    } finally {
-      loading.value = false
-    }
-  }
-
-  // 重置搜索
-  const handleReset = () => {
-    Object.assign(searchForm, { ...initialSearchState })
-    pagination.page = 1
-    getTableData()
-  }
-
-  // 搜索
-  const handleSearch = () => {
-    pagination.page = 1
-    getTableData()
-  }
-
-  // 刷新表格
-  const handleRefresh = () => {
-    getTableData()
-  }
-
-  // 处理表格分页变化
-  const handleSizeChange = (newPageSize: number) => {
-    pagination.page_size = newPageSize
-    getTableData()
-  }
-
-  const handleCurrentChange = (newCurrentPage: number) => {
-    pagination.page = newCurrentPage
-    getTableData()
-  }
-
-  // 显示详情
-  const showDetail = async (row: PackageResponse) => {
-    try {
-      const res = await PackageManageService.getPackageDetail(row.id)
-      if (res.code === 0) {
-        currentPackage.value = res.data
-        detailDialogVisible.value = true
-      }
-    } catch (error) {
-      console.error(error)
-      ElMessage.error('获取套餐详情失败')
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .my-packages-page {
-    // 可以添加特定样式
-  }
-
-  .dialog-footer {
-    text-align: right;
-  }
-</style>
diff --git a/src/views/package-management/package-assign/index.vue b/src/views/package-management/package-assign/index.vue
index a6d4344..25fef19 100644
--- a/src/views/package-management/package-assign/index.vue
+++ b/src/views/package-management/package-assign/index.vue
@@ -97,6 +97,7 @@
                 :remote-method="searchPackage"
                 :loading="packageLoading"
                 clearable
+                @change="handlePackageChange"
               >
                 <ElOption
                   v-for="pkg in packageOptions"
@@ -273,7 +274,21 @@
   const rules = reactive<FormRules>({
     package_id: [{ required: true, message: '请选择套餐', trigger: 'change' }],
     shop_id: [{ required: true, message: '请选择店铺', trigger: 'change' }],
-    cost_price: [{ required: true, message: '请输入成本价', trigger: 'blur' }]
+    cost_price: [
+      { required: true, message: '请输入成本价', trigger: 'blur' },
+      {
+        validator: (rule: any, value: any, callback: any) => {
+          if (value === undefined || value === null || value === '') {
+            callback(new Error('请输入成本价'))
+          } else if (form.package_base_price && value < form.package_base_price) {
+            callback(new Error(`成本价不能低于套餐价格 ¥${(form.package_base_price / 100).toFixed(2)}`))
+          } else {
+            callback()
+          }
+        },
+        trigger: 'blur'
+      }
+    ]
   })
 
   // 表单数据
@@ -281,7 +296,8 @@
     id: 0,
     package_id: undefined,
     shop_id: undefined,
-    cost_price: 0
+    cost_price: 0,
+    package_base_price: 0 // 存储选中套餐的成本价，用于验证
   })
 
   // 成本价表单验证规则
@@ -589,11 +605,13 @@
       form.package_id = row.package_id
       form.shop_id = row.shop_id
       form.cost_price = row.cost_price
+      form.package_base_price = 0
     } else {
       form.id = 0
       form.package_id = undefined
       form.shop_id = undefined
       form.cost_price = 0
+      form.package_base_price = 0
     }
 
     // 重置表单验证状态
@@ -602,6 +620,23 @@
     })
   }
 
+  // 处理套餐选择变化
+  const handlePackageChange = (packageId: number | undefined) => {
+    if (packageId) {
+      // 从套餐选项中找到选中的套餐
+      const selectedPackage = packageOptions.value.find(pkg => pkg.id === packageId)
+      if (selectedPackage) {
+        // 将套餐的价格设置为成本价
+        form.cost_price = selectedPackage.price
+        form.package_base_price = selectedPackage.price
+      }
+    } else {
+      // 清空时重置成本价
+      form.cost_price = 0
+      form.package_base_price = 0
+    }
+  }
+
   // 处理弹窗关闭事件
   const handleDialogClosed = () => {
     // 清除表单验证状态
@@ -611,6 +646,7 @@
     form.package_id = undefined
     form.shop_id = undefined
     form.cost_price = 0
+    form.package_base_price = 0
   }
 
   // 删除分配
diff --git a/src/views/package-management/series-assign/index.vue b/src/views/package-management/series-assign/index.vue
index 410da4d..2b61e67 100644
--- a/src/views/package-management/series-assign/index.vue
+++ b/src/views/package-management/series-assign/index.vue
@@ -69,6 +69,20 @@
                 />
               </ElSelect>
             </ElFormItem>
+            <div v-if="dialogType === 'edit'" class="info-row">
+              <div class="info-item">
+                <span class="info-label">系列名称:</span>
+                <span class="info-value">{{ form.series_name || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">店铺名称:</span>
+                <span class="info-value">{{ form.shop_name || '-' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-label">分配者店铺:</span>
+                <span class="info-value">{{ form.allocator_shop_name || '-' }}</span>
+              </div>
+            </div>
             <ElFormItem label="选择店铺" prop="shop_id" v-if="dialogType === 'add'">
               <ElSelect
                 v-model="form.shop_id"
@@ -121,52 +135,97 @@
               </div>
             </ElFormItem>
 
-            <!-- 梯度返佣配置 -->
-            <ElDivider content-position="left">梯度返佣设置（可选）</ElDivider>
-            <ElFormItem label="启用梯度返佣">
-              <ElSwitch v-model="form.enable_tier_commission" />
+            <!-- 一次性佣金配置 -->
+            <ElDivider content-position="left">一次性佣金设置（可选）</ElDivider>
+            <ElFormItem label="启用一次性佣金">
+              <ElSwitch v-model="form.enable_one_time_commission" />
             </ElFormItem>
 
-            <template v-if="form.enable_tier_commission">
-              <ElFormItem label="周期类型" prop="tier_config.period_type">
-                <ElSelect v-model="form.tier_config.period_type" placeholder="请选择周期类型" style="width: 100%">
-                  <ElOption label="月度" value="monthly" />
-                  <ElOption label="季度" value="quarterly" />
-                  <ElOption label="年度" value="yearly" />
-                </ElSelect>
+            <template v-if="form.enable_one_time_commission">
+              <ElFormItem label="一次性佣金类型" prop="one_time_commission_config.type">
+                <ElRadioGroup v-model="form.one_time_commission_config.type">
+                  <ElRadio value="fixed">固定</ElRadio>
+                  <ElRadio value="tiered">梯度</ElRadio>
+                </ElRadioGroup>
               </ElFormItem>
-              <ElFormItem label="梯度类型" prop="tier_config.tier_type">
-                <ElSelect v-model="form.tier_config.tier_type" placeholder="请选择梯度类型" style="width: 100%">
-                  <ElOption label="按销量" value="sales_count" />
-                  <ElOption label="按销售额" value="sales_amount" />
-                </ElSelect>
+
+              <ElFormItem label="触发条件" prop="one_time_commission_config.trigger">
+                <ElRadioGroup v-model="form.one_time_commission_config.trigger">
+                  <ElRadio value="single_recharge">单次充值</ElRadio>
+                  <ElRadio value="accumulated_recharge">累计充值</ElRadio>
+                </ElRadioGroup>
               </ElFormItem>
-              <ElFormItem label="梯度档位">
-                <div class="tier-list">
-                  <div v-for="(tier, index) in form.tier_config.tiers" :key="index" class="tier-item">
-                    <ElInputNumber
-                      v-model="tier.threshold"
-                      :min="1"
-                      :controls="false"
-                      placeholder="阈值"
-                      style="width: 120px"
-                    />
-                    <ElSelect v-model="tier.mode" placeholder="模式" style="width: 100px">
-                      <ElOption label="固定" value="fixed" />
-                      <ElOption label="百分比" value="percent" />
-                    </ElSelect>
-                    <ElInputNumber
-                      v-model="tier.value"
-                      :min="0"
-                      :controls="false"
-                      placeholder="返佣值"
-                      style="width: 120px"
-                    />
-                    <ElButton type="danger" @click="removeTier(index)">删除</ElButton>
+
+              <ElFormItem label="最低阈值(分)" prop="one_time_commission_config.threshold">
+                <ElInputNumber
+                  v-model="form.one_time_commission_config.threshold"
+                  :min="1"
+                  :controls="false"
+                  style="width: 100%"
+                  placeholder="请输入最低阈值(分)"
+                />
+              </ElFormItem>
+
+              <!-- 固定类型配置 -->
+              <template v-if="form.one_time_commission_config.type === 'fixed'">
+                <ElFormItem label="返佣模式" prop="one_time_commission_config.mode">
+                  <ElRadioGroup v-model="form.one_time_commission_config.mode">
+                    <ElRadio value="fixed">固定金额</ElRadio>
+                    <ElRadio value="percent">百分比</ElRadio>
+                  </ElRadioGroup>
+                </ElFormItem>
+
+                <ElFormItem
+                  :label="form.one_time_commission_config.mode === 'fixed' ? '佣金金额(分)' : '佣金比例(千分比)'"
+                  prop="one_time_commission_config.value"
+                >
+                  <ElInputNumber
+                    v-model="form.one_time_commission_config.value"
+                    :min="1"
+                    :controls="false"
+                    style="width: 100%"
+                    :placeholder="
+                      form.one_time_commission_config.mode === 'fixed'
+                        ? '请输入佣金金额(分)'
+                        : '请输入佣金比例的千分比(如200表示20%)'
+                    "
+                  />
+                </ElFormItem>
+              </template>
+
+              <!-- 梯度类型配置 -->
+              <template v-if="form.one_time_commission_config.type === 'tiered'">
+                <ElFormItem label="梯度档位">
+                  <div class="tier-list">
+                    <div v-for="(tier, index) in form.one_time_commission_config.tiers" :key="index" class="tier-item">
+                      <ElSelect v-model="tier.tier_type" placeholder="梯度类型" style="width: 120px">
+                        <ElOption label="销量" value="sales_count" />
+                        <ElOption label="销售额" value="sales_amount" />
+                      </ElSelect>
+                      <ElInputNumber
+                        v-model="tier.threshold"
+                        :min="1"
+                        :controls="false"
+                        placeholder="阈值"
+                        style="width: 120px"
+                      />
+                      <ElSelect v-model="tier.mode" placeholder="返佣模式" style="width: 120px">
+                        <ElOption label="固定金额" value="fixed" />
+                        <ElOption label="百分比" value="percent" />
+                      </ElSelect>
+                      <ElInputNumber
+                        v-model="tier.value"
+                        :min="1"
+                        :controls="false"
+                        placeholder="返佣值"
+                        style="width: 120px"
+                      />
+                      <ElButton type="danger" @click="removeTier(index)">删除</ElButton>
+                    </div>
+                    <ElButton type="primary" @click="addTier">添加档位</ElButton>
                   </div>
-                  <ElButton type="primary" @click="addTier">添加档位</ElButton>
-                </div>
-              </ElFormItem>
+                </ElFormItem>
+              </template>
             </template>
           </ElForm>
           <template #footer>
@@ -295,7 +354,7 @@
     { label: '店铺名称', prop: 'shop_name' },
     { label: '分配者店铺', prop: 'allocator_shop_name' },
     { label: '基础返佣', prop: 'base_commission' },
-    { label: '梯度返佣', prop: 'enable_tier_commission' },
+    { label: '一次性佣金', prop: 'enable_one_time_commission' },
     { label: '状态', prop: 'status' },
     { label: '创建时间', prop: 'created_at' },
     { label: '操作', prop: 'operation' }
@@ -306,14 +365,20 @@
     id: 0,
     series_id: undefined,
     shop_id: undefined,
+    series_name: '',
+    shop_name: '',
+    allocator_shop_name: '',
     base_commission: {
       mode: 'fixed',
       value: 0
     },
-    enable_tier_commission: false,
-    tier_config: {
-      period_type: 'monthly',
-      tier_type: 'sales_count',
+    enable_one_time_commission: false,
+    one_time_commission_config: {
+      type: 'fixed',
+      trigger: 'single_recharge',
+      threshold: 0,
+      mode: 'fixed',
+      value: 0,
       tiers: []
     }
   })
@@ -341,14 +406,27 @@
       ]
     }
 
-    // 如果启用了梯度返佣，添加梯度返佣的验证规则
-    if (form.enable_tier_commission) {
-      baseRules['tier_config.period_type'] = [
-        { required: true, message: '请选择周期类型', trigger: 'change' }
+    // 如果启用了一次性佣金，添加验证规则
+    if (form.enable_one_time_commission) {
+      baseRules['one_time_commission_config.type'] = [
+        { required: true, message: '请选择一次性佣金类型', trigger: 'change' }
       ]
-      baseRules['tier_config.tier_type'] = [
-        { required: true, message: '请选择梯度类型', trigger: 'change' }
+      baseRules['one_time_commission_config.trigger'] = [
+        { required: true, message: '请选择触发条件', trigger: 'change' }
       ]
+      baseRules['one_time_commission_config.threshold'] = [
+        { required: true, message: '请输入最低阈值', trigger: 'blur' }
+      ]
+
+      // 固定类型验证
+      if (form.one_time_commission_config.type === 'fixed') {
+        baseRules['one_time_commission_config.mode'] = [
+          { required: true, message: '请选择返佣模式', trigger: 'change' }
+        ]
+        baseRules['one_time_commission_config.value'] = [
+          { required: true, message: '请输入佣金值', trigger: 'blur' }
+        ]
+      }
     }
 
     return baseRules
@@ -397,14 +475,14 @@
       }
     },
     {
-      prop: 'enable_tier_commission',
-      label: '梯度返佣',
-      width: 100,
+      prop: 'enable_one_time_commission',
+      label: '一次性佣金',
+      width: 120,
       formatter: (row: ShopSeriesAllocationResponse) => {
         return h(
           ElTag,
-          { type: row.enable_tier_commission ? 'success' : 'info', size: 'small' },
-          () => (row.enable_tier_commission ? '已启用' : '未启用')
+          { type: row.enable_one_time_commission ? 'success' : 'info', size: 'small' },
+          () => (row.enable_one_time_commission ? '已启用' : '未启用')
         )
       }
     },
@@ -647,7 +725,8 @@
 
   // 添加档位
   const addTier = () => {
-    form.tier_config.tiers.push({
+    form.one_time_commission_config.tiers.push({
+      tier_type: 'sales_count',
       threshold: 0,
       mode: 'fixed',
       value: 0
@@ -656,7 +735,7 @@
 
   // 删除档位
   const removeTier = (index: number) => {
-    form.tier_config.tiers.splice(index, 1)
+    form.one_time_commission_config.tiers.splice(index, 1)
   }
 
   // 显示新增/编辑对话框
@@ -668,21 +747,30 @@
       form.id = row.id
       form.series_id = row.series_id
       form.shop_id = row.shop_id
+      form.series_name = row.series_name
+      form.shop_name = row.shop_name
+      form.allocator_shop_name = row.allocator_shop_name
       form.base_commission = {
         mode: row.base_commission.mode,
         value: row.base_commission.value
       }
-      form.enable_tier_commission = row.enable_tier_commission
-      if (row.enable_tier_commission && row.tier_config) {
-        form.tier_config = {
-          period_type: row.tier_config.period_type,
-          tier_type: row.tier_config.tier_type,
-          tiers: row.tier_config.tiers.map((t) => ({ ...t }))
+      form.enable_one_time_commission = row.enable_one_time_commission
+      if (row.enable_one_time_commission && row.one_time_commission_config) {
+        form.one_time_commission_config = {
+          type: row.one_time_commission_config.type,
+          trigger: row.one_time_commission_config.trigger,
+          threshold: row.one_time_commission_config.threshold,
+          mode: row.one_time_commission_config.mode || 'fixed',
+          value: row.one_time_commission_config.value || 0,
+          tiers: row.one_time_commission_config.tiers?.map((t) => ({ ...t })) || []
         }
       } else {
-        form.tier_config = {
-          period_type: 'monthly',
-          tier_type: 'sales_count',
+        form.one_time_commission_config = {
+          type: 'fixed',
+          trigger: 'single_recharge',
+          threshold: 0,
+          mode: 'fixed',
+          value: 0,
           tiers: []
         }
       }
@@ -690,14 +778,20 @@
       form.id = 0
       form.series_id = undefined
       form.shop_id = undefined
+      form.series_name = ''
+      form.shop_name = ''
+      form.allocator_shop_name = ''
       form.base_commission = {
         mode: 'fixed',
         value: 0
       }
-      form.enable_tier_commission = false
-      form.tier_config = {
-        period_type: 'monthly',
-        tier_type: 'sales_count',
+      form.enable_one_time_commission = false
+      form.one_time_commission_config = {
+        type: 'fixed',
+        trigger: 'single_recharge',
+        threshold: 0,
+        mode: 'fixed',
+        value: 0,
         tiers: []
       }
     }
@@ -716,14 +810,20 @@
     form.id = 0
     form.series_id = undefined
     form.shop_id = undefined
+    form.series_name = ''
+    form.shop_name = ''
+    form.allocator_shop_name = ''
     form.base_commission = {
       mode: 'fixed',
       value: 0
     }
-    form.enable_tier_commission = false
-    form.tier_config = {
-      period_type: 'monthly',
-      tier_type: 'sales_count',
+    form.enable_one_time_commission = false
+    form.one_time_commission_config = {
+      type: 'fixed',
+      trigger: 'single_recharge',
+      threshold: 0,
+      mode: 'fixed',
+      value: 0,
       tiers: []
     }
   }
@@ -759,20 +859,22 @@
 
     await formEl.validate(async (valid) => {
       if (valid) {
-        // 验证梯度档位
-        if (form.enable_tier_commission) {
-          if (form.tier_config.tiers.length === 0) {
-            ElMessage.warning('启用梯度返佣时至少需要添加一个档位')
-            return
-          }
-
-          // 验证档位阈值递增
-          const thresholds = form.tier_config.tiers.map((t: any) => t.threshold)
-          for (let i = 1; i < thresholds.length; i++) {
-            if (thresholds[i] <= thresholds[i - 1]) {
-              ElMessage.warning('档位阈值必须递增')
+        // 验证一次性佣金配置
+        if (form.enable_one_time_commission) {
+          if (form.one_time_commission_config.type === 'tiered') {
+            if (form.one_time_commission_config.tiers.length === 0) {
+              ElMessage.warning('启用梯度类型时至少需要添加一个档位')
               return
             }
+
+            // 验证档位阈值递增
+            const thresholds = form.one_time_commission_config.tiers.map((t: any) => t.threshold)
+            for (let i = 1; i < thresholds.length; i++) {
+              if (thresholds[i] <= thresholds[i - 1]) {
+                ElMessage.warning('档位阈值必须递增')
+                return
+              }
+            }
           }
         }
 
@@ -783,15 +885,26 @@
               mode: form.base_commission.mode,
               value: form.base_commission.value
             },
-            enable_tier_commission: form.enable_tier_commission
+            enable_one_time_commission: form.enable_one_time_commission
           }
 
-          // 如果启用了梯度返佣，加入梯度配置
-          if (form.enable_tier_commission) {
-            data.tier_config = {
-              period_type: form.tier_config.period_type,
-              tier_type: form.tier_config.tier_type,
-              tiers: form.tier_config.tiers.map((t: any) => ({
+          // 如果启用了一次性佣金，加入配置
+          if (form.enable_one_time_commission) {
+            data.one_time_commission_config = {
+              type: form.one_time_commission_config.type,
+              trigger: form.one_time_commission_config.trigger,
+              threshold: form.one_time_commission_config.threshold
+            }
+
+            // 固定类型配置
+            if (form.one_time_commission_config.type === 'fixed') {
+              data.one_time_commission_config.mode = form.one_time_commission_config.mode
+              data.one_time_commission_config.value = form.one_time_commission_config.value
+            }
+            // 梯度类型配置
+            else if (form.one_time_commission_config.type === 'tiered') {
+              data.one_time_commission_config.tiers = form.one_time_commission_config.tiers.map((t: any) => ({
+                tier_type: t.tier_type,
                 threshold: t.threshold,
                 mode: t.mode,
                 value: t.value
@@ -864,4 +977,30 @@
     align-items: center;
     margin-bottom: 8px;
   }
+
+  .info-row {
+    display: flex;
+    gap: 20px;
+    margin-bottom: 18px;
+    padding: 12px;
+    border-radius: 4px;
+  }
+
+  .info-item {
+    flex: 1;
+    display: flex;
+    align-items: center;
+  }
+
+  .info-label {
+    font-size: 14px;
+    margin-right: 8px;
+    white-space: nowrap;
+  }
+
+  .info-value {
+    font-size: 14px;
+    color: var(--art-primary);
+    font-weight: 500;
+  }
 </style>