From a09631551b5da04a325fb1dae144403153854ca1 Mon Sep 17 00:00:00 2001
From: wlkjyy <wlkjyy@vip.qq.com>
Date: Mon, 8 Dec 2025 15:18:37 +0800
Subject: [PATCH] xx

---
 src/assets/7.wav                          | Bin 0 -> 16164 bytes
 src/components/UserSelector/index.vue     | 191 ++++++
 src/config/menus.js                       |  90 +--
 src/router/index.js                       |  56 +-
 src/views/marketing/DiscountGoods.vue     |  26 +-
 src/views/marketing/DiscountUsers.vue     | 176 +----
 src/views/marketing/UserVoucher.vue       | 118 +++-
 src/views/marketing/Voucher.vue           |  12 +-
 src/views/marketing/VoucherHistory.vue    | 186 ++----
 src/views/marketing/VoucherHolders.vue    | 215 ++----
 src/views/marketing/VoucherManagement.vue |  69 ++
 src/views/product/ProductList.vue         | 432 +++++++++++-
 src/views/product/ProductParameter.vue    | 771 ----------------------
 src/views/ticket/TicketChat.vue           | 237 ++++---
 src/views/user/UserDetail.vue             |  95 ++-
 15 files changed, 1172 insertions(+), 1502 deletions(-)
 create mode 100644 src/assets/7.wav
 create mode 100644 src/components/UserSelector/index.vue
 create mode 100644 src/views/marketing/VoucherManagement.vue
 delete mode 100644 src/views/product/ProductParameter.vue

diff --git a/src/assets/7.wav b/src/assets/7.wav
new file mode 100644
index 0000000000000000000000000000000000000000..2050e2fbdc71c3611ca152fab7285babdf9e5d65
GIT binary patch
literal 16164
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

literal 0
HcmV?d00001

diff --git a/src/components/UserSelector/index.vue b/src/components/UserSelector/index.vue
new file mode 100644
index 0000000..6be488f
--- /dev/null
+++ b/src/components/UserSelector/index.vue
@@ -0,0 +1,191 @@
+<template>
+  <el-dialog
+    :model-value="visible"
+    title="选择用户"
+    width="800px"
+    class="user-selector-dialog"
+    append-to-body
+    @update:model-value="handleVisibleChange"
+  >
+    <!-- 搜索栏 -->
+    <div class="selector-search">
+      <el-input
+        v-model="searchParams.key"
+        placeholder="搜索用户名或ID"
+        clearable
+        @keyup.enter="handleSearch"
+        style="width: 300px; margin-right: 12px"
+      >
+        <template #prefix>
+          <el-icon><Search /></el-icon>
+        </template>
+      </el-input>
+      <el-button type="primary" @click="handleSearch">
+        <el-icon><Search /></el-icon>
+        搜索
+      </el-button>
+      <el-button @click="handleReset">重置</el-button>
+    </div>
+
+    <!-- 用户表格 -->
+    <el-table
+      v-loading="loading"
+      :data="userList"
+      highlight-current-row
+      @current-change="handleCurrentChange"
+      style="width: 100%; margin-top: 16px"
+      :height="400"
+    >
+      <el-table-column type="index" label="序号" width="60" />
+      <el-table-column prop="UserId" label="用户ID" width="100" />
+      <el-table-column prop="UserName" label="用户名" min-width="150" />
+      <el-table-column prop="Email" label="邮箱" min-width="180" />
+
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      v-model:current-page="searchParams.page"
+      v-model:page-size="searchParams.count"
+      :page-sizes="[10, 20, 50, 100]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handlePageChange"
+      background
+      class="selector-pagination"
+    />
+
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="confirmSelection" :disabled="!selectedUser">
+          确定选择
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, watch } from 'vue'
+import { Search } from '@element-plus/icons-vue'
+import { getUserList } from '@/api/admin/user'
+import { ElMessage } from 'element-plus'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const emit = defineEmits(['update:visible', 'select'])
+
+const loading = ref(false)
+const userList = ref([])
+const total = ref(0)
+const selectedUser = ref(null)
+
+const searchParams = reactive({
+  key: '',
+  page: 1,
+  count: 10
+})
+
+// 监听 visible 变化，打开时加载数据
+watch(() => props.visible, (newVal) => {
+  if (newVal) {
+    selectedUser.value = null
+    if (userList.value.length === 0) {
+      fetchUserList()
+    }
+  }
+})
+
+const handleVisibleChange = (val) => {
+  emit('update:visible', val)
+}
+
+const closeDialog = () => {
+  emit('update:visible', false)
+}
+
+const fetchUserList = async () => {
+  loading.value = true
+  try {
+    const res = await getUserList(searchParams)
+    if (res.data.code === 200) {
+      userList.value = res.data.data?.data || []
+      total.value = res.data.data?.all_count || 0
+    }
+  } catch (error) {
+    console.error('获取用户列表失败:', error)
+    ElMessage.error('获取用户列表失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleSearch = () => {
+  searchParams.page = 1
+  fetchUserList()
+}
+
+const handleReset = () => {
+  searchParams.key = ''
+  searchParams.page = 1
+  fetchUserList()
+}
+
+const handleCurrentChange = (row) => {
+  selectedUser.value = row
+}
+
+const handleSizeChange = (size) => {
+  searchParams.count = size
+  fetchUserList()
+}
+
+const handlePageChange = (page) => {
+  searchParams.page = page
+  fetchUserList()
+}
+
+const confirmSelection = () => {
+  if (!selectedUser.value) {
+    ElMessage.warning('请选择一个用户')
+    return
+  }
+  emit('select', selectedUser.value)
+  closeDialog()
+}
+</script>
+
+<style scoped>
+.selector-search {
+  display: flex;
+  align-items: center;
+  padding: 12px 0;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.selector-pagination {
+  margin-top: 16px;
+  justify-content: flex-end;
+}
+
+:deep(.el-table__row) {
+  cursor: pointer;
+}
+
+:deep(.el-table__row):hover {
+  background-color: #f5f7fa;
+}
+
+:deep(.current-row) {
+  background-color: var(--el-color-primary-light-8) !important;
+  color: var(--el-color-primary);
+  font-weight: bold;
+}
+</style>
diff --git a/src/config/menus.js b/src/config/menus.js
index 9cfc27e..24093e7 100644
--- a/src/config/menus.js
+++ b/src/config/menus.js
@@ -5,20 +5,20 @@ export const menus = [
     icon: 'DataBoard'
   },
   {
-    path : '/ticket',
+    path: '/ticket',
     title: '工单处理',
     icon: 'DataBoard'
   },
   {
-    path:'/user',
+    path: '/user',
     title: '用户管理',
     icon: 'User',
     children: [
-      { 
+      {
         path: '/user/list',
         title: '用户列表'
       },
-      { 
+      {
         path: '/user/balance',
         title: '用户余额管理'
       },
@@ -45,10 +45,7 @@ export const menus = [
         path: '/product/group',
         title: '商品分组'
       },
-      {
-        path: '/product/parameter',
-        title: '商品参数'
-      }
+
     ]
   },
   {
@@ -75,36 +72,7 @@ export const menus = [
         path: '/marketing/voucher',
         title: '代金券管理'
       },
-      {
-        path: '/marketing/user-distribution',
-        title: '用户分发管理'
-      },
-   
-      {
-        id: 'discount-goods',
-        title: '商品关联管理',
-        path: '/marketing/discount-goods',
-        badge: 'NEW'
-      },
-      {
-        id: 'discount-users',
-        title: '用户关联管理',
-        path: '/marketing/discount-users',
-        badge: 'NEW'
-      },
-   
-      {
-        id: 'user-info',
-        title: '用户信息管理',
-        path: '/marketing/user-info',
-        badge: 'NEW'
-      },
-      {
-        id: 'user-history',
-        title: '用户使用记录管理',
-        path: '/marketing/user-history',
-        badge: 'NEW'
-      }
+
     ]
   },
   {
@@ -141,9 +109,9 @@ export const menus = [
           { path: '/acs/images/categories', title: '镜像分类' }
         ]
       },
-      { 
-        path: '/acs/nodes', 
-        title: '节点管理' 
+      {
+        path: '/acs/nodes',
+        title: '节点管理'
       },
       {
         path: '/acs/guacamole',
@@ -158,10 +126,10 @@ export const menus = [
         ]
       },
       {
-        path:'/setting',
-        title:'全局设置管理',
-        children:[
-          {path:'/setting/global',title:'全局设置'}
+        path: '/setting',
+        title: '全局设置管理',
+        children: [
+          { path: '/setting/global', title: '全局设置' }
         ]
       }
     ]
@@ -171,31 +139,31 @@ export const menus = [
     title: '系统管理',
     icon: 'Setting',
     children: [
-      { 
-        path: '/system/permission', 
+      {
+        path: '/system/permission',
         title: '权限管理',
         children: [
           { path: '/system/permission/route', title: '路由权限' },
           { path: '/system/permission/admin', title: '管理员权限' }
         ]
       },
-     
-      { 
-        path: '/system/file', 
-        title: '文件管理' 
+
+      {
+        path: '/system/file',
+        title: '文件管理'
       },
-      
-      { 
-        path: '/system/domain-whitelist', 
-        title: '域名白名单' 
+
+      {
+        path: '/system/domain-whitelist',
+        title: '域名白名单'
       },
-      { 
-        path: '/system/setting-group', 
-        title: '配置组管理' 
+      {
+        path: '/system/setting-group',
+        title: '配置组管理'
       },
-      { 
-        path: '/system/setting-list', 
-        title: '配置管理' 
+      {
+        path: '/system/setting-list',
+        title: '配置管理'
       }
     ]
   }
diff --git a/src/router/index.js b/src/router/index.js
index 086a24e..571f32a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -230,14 +230,7 @@ const routes = [
               title: '商品分组'
             }
           },
-          {
-            path: 'parameter',
-            name: 'ProductParameter',
-            component: () => import('../views/product/ProductParameter.vue'),
-            meta: {
-              title: '商品参数'
-            }
-          }
+
         ]
       },
       // 订单管理路由
@@ -287,49 +280,16 @@ const routes = [
             }
           },
           {
-            path: 'user-distribution',
-            name: 'UserDistribution',
-            component: () => import('../views/marketing/UserVoucher.vue'),
+            path: 'voucher/:id/manage',
+            name: 'VoucherManagement',
+            component: () => import('../views/marketing/VoucherManagement.vue'),
             meta: {
-              title: '用户分发管理'
+              title: '代金券详情管理',
+              hidden: true,
+              activeMenu: '/marketing/voucher'
             }
           },
-          {
-            path: 'discount-goods',
-            name: 'DiscountGoods',
-            component: () => import('../views/marketing/DiscountGoods.vue'),
-            meta: {
-              title: '商品关联管理',
-              badge: 'NEW'
-            }
-          },
-          {
-            path: 'discount-users',
-            name: 'DiscountUsers',
-            component: () => import('../views/marketing/DiscountUsers.vue'),
-            meta: {
-              title: '用户关联管理',
-              badge: 'NEW'
-            }
-          },
-          {
-            path: 'user-info',
-            name: 'UserInfo',
-            component: () => import('../views/marketing/VoucherHolders.vue'),
-            meta: {
-              title: '用户信息管理',
-              badge: 'NEW'
-            }
-          },
-          {
-            path: 'user-history',
-            name: 'UserHistory',
-            component: () => import('../views/marketing/VoucherHistory.vue'),
-            meta: {
-              title: '用户使用记录管理',
-              badge: 'NEW'
-            }
-          }
+
         ]
       },
       // 活动管理路由
diff --git a/src/views/marketing/DiscountGoods.vue b/src/views/marketing/DiscountGoods.vue
index 6bc2d1c..40ce59b 100644
--- a/src/views/marketing/DiscountGoods.vue
+++ b/src/views/marketing/DiscountGoods.vue
@@ -5,8 +5,8 @@
       <!-- 搜索和操作栏 -->
       <div class="filter-section">
         <div class="filter-content">
-          <el-form :inline="true" :model="queryParams" class="search-form">
-            <el-form-item label="代金卷">
+          <el-form :inline="true" :model="queryParams" class="search-form" v-if="!codeId">
+            <el-form-item label="代金卷" v-if="!codeId">
               <el-select 
                 v-model="queryParams.code_id" 
                 placeholder="请选择代金券"
@@ -71,7 +71,7 @@
         >
           <el-table-column type="selection" width="55" />
           <el-table-column prop="id" label="ID" width="80" />
-          <el-table-column prop="discountId" label="代金券ID" width="120" />
+          <el-table-column prop="discountId" label="代金券ID" width="120" v-if="!codeId" />
           <el-table-column label="关联对象ID" width="120">
             <template #default="{ row }">
               {{ row.goodId || row.goodGroupId || '-' }}
@@ -149,7 +149,7 @@
             placeholder="请选择代金券"
             filterable
             clearable
-            :disabled="dialogType === 'edit'"
+            :disabled="dialogType === 'edit' || !!codeId"
             style="width: 100%"
           >
             <el-option
@@ -234,7 +234,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete, Search, Plus, Refresh } from '@element-plus/icons-vue'
 import { 
@@ -249,13 +249,27 @@ import {
   getProductGroupList
 } from '@/api/admin/product'
 
+const props = defineProps({
+  codeId: {
+    type: [String, Number],
+    default: ''
+  }
+})
+
 // 查询参数
 const queryParams = reactive({
-  code_id: '',
+  code_id: props.codeId || '',
   page: 1,
   count: 10
 })
 
+watch(() => props.codeId, (newVal) => {
+  if (newVal) {
+    queryParams.code_id = newVal
+    fetchGoodsList()
+  }
+})
+
 // 表单数据
 const form = reactive({
   id: undefined,
diff --git a/src/views/marketing/DiscountUsers.vue b/src/views/marketing/DiscountUsers.vue
index 29a87ba..d565ccf 100644
--- a/src/views/marketing/DiscountUsers.vue
+++ b/src/views/marketing/DiscountUsers.vue
@@ -5,8 +5,8 @@
       <!-- 搜索和操作栏 -->
       <div class="filter-section">
         <div class="filter-content">
-          <el-form :inline="true" :model="queryParams" class="search-form">
-            <el-form-item label="代金卷">
+          <el-form :inline="true" :model="queryParams" class="search-form" v-if="!codeId">
+            <el-form-item label="代金卷" v-if="!codeId">
               <el-select 
                 v-model="queryParams.code_id" 
                 placeholder="请选择代金券"
@@ -68,8 +68,8 @@
         >
           <el-table-column type="selection" width="55" />
           <el-table-column prop="id" label="ID" width="80" />
-          <el-table-column prop="discountId" label="代金券ID" width="120" />
-          <el-table-column label="关联对象ID" width="130">
+          <el-table-column prop="discountId" label="代金券ID" width="120" v-if="!codeId" />
+          <el-table-column label="关联对象ID" min-width="150">
             <template #default="{ row }">
               {{ row.userId || row.userGroupId || '-' }}
             </template>
@@ -224,82 +224,16 @@
     </el-dialog>
 
     <!-- 用户选择弹窗 -->
-    <el-dialog
-      v-model="userSelectorVisible"
-      title="选择用户"
-      width="800px"
-      class="user-selector-dialog"
-      append-to-body
-    >
-      <!-- 搜索栏 -->
-      <div class="selector-search">
-        <el-input
-          v-model="userSearchParams.key"
-          placeholder="搜索用户名或ID"
-          clearable
-          @keyup.enter="searchUsers"
-          style="width: 300px; margin-right: 12px"
-        >
-          <template #prefix>
-            <el-icon><Search /></el-icon>
-          </template>
-        </el-input>
-        <el-button type="primary" @click="searchUsers">
-          <el-icon><Search /></el-icon>
-          搜索
-        </el-button>
-        <el-button @click="resetUserSearch">重置</el-button>
-      </div>
-
-      <!-- 用户表格 -->
-      <el-table
-        v-loading="userSelectorLoading"
-        :data="userSelectorList"
-        highlight-current-row
-        @current-change="handleUserSelectChange"
-        style="width: 100%; margin-top: 16px"
-        :height="400"
-      >
-        <el-table-column type="index" label="序号" width="60" />
-        <el-table-column prop="UserId" label="用户ID" width="100" />
-        <el-table-column prop="UserName" label="用户名" min-width="150" />
-        <el-table-column prop="Email" label="邮箱" min-width="180" />
-        <el-table-column label="状态" width="100">
-          <template #default="{ row }">
-            <el-tag :type="row.Status === 1 ? 'success' : 'danger'" size="small">
-              {{ row.Status === 1 ? '正常' : '禁用' }}
-            </el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页 -->
-      <el-pagination
-        v-model:current-page="userSearchParams.page"
-        v-model:page-size="userSearchParams.count"
-        :page-sizes="[10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="userSelectorTotal"
-        @size-change="handleUserSelectorSizeChange"
-        @current-change="handleUserSelectorPageChange"
-        background
-        class="selector-pagination"
-      />
-
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="userSelectorVisible = false">取消</el-button>
-          <el-button type="primary" @click="confirmUserSelection" :disabled="!selectedUserTemp">
-            确定选择
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <UserSelector
+      v-model:visible="userSelectorVisible"
+      @select="confirmUserSelection"
+    />
   </div>
 </template>
 
+
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete, Search, Plus, Refresh, User } from '@element-plus/icons-vue'
 import { 
@@ -313,14 +247,29 @@ import {
   getUserList,
   getUserGroupList
 } from '@/api/admin/user'
+import UserSelector from '@/components/UserSelector/index.vue'
+
+const props = defineProps({
+  codeId: {
+    type: [String, Number],
+    default: ''
+  }
+})
 
 // 查询参数
 const queryParams = reactive({
-  code_id: '',
+  code_id: props.codeId || '',
   page: 1,
   count: 10
 })
 
+watch(() => props.codeId, (newVal) => {
+  if (newVal) {
+    queryParams.code_id = newVal
+    fetchUsersList()
+  }
+})
+
 // 表单数据
 const form = reactive({
   id: undefined,
@@ -364,15 +313,6 @@ const userGroupOptions = ref([])  // 用户组列表选项
 
 // 用户选择弹窗相关
 const userSelectorVisible = ref(false)
-const userSelectorLoading = ref(false)
-const userSelectorList = ref([])
-const userSelectorTotal = ref(0)
-const selectedUserTemp = ref(null)  // 临时存储选中的用户
-const userSearchParams = reactive({
-  key: '',
-  page: 1,
-  count: 10
-})
 
 // 格式化日期
 const formatDate = (dateStr) => {
@@ -469,70 +409,19 @@ const fetchUserGroupList = async () => {
 // 打开用户选择器
 const openUserSelector = () => {
   userSelectorVisible.value = true
-  selectedUserTemp.value = null
-  userSearchParams.key = ''
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-
-// 获取用户选择器列表
-const fetchUserSelectorList = async () => {
-  userSelectorLoading.value = true
-  try {
-    const res = await getUserList(userSearchParams)
-    console.log('用户选择器列表:', res.data)
-    if (res.data.code === 200) {
-      userSelectorList.value = res.data.data?.data || []
-      userSelectorTotal.value = res.data.data?.all_count || 0
-    }
-  } catch (error) {
-    console.error('获取用户列表失败:', error)
-    ElMessage.error('获取用户列表失败')
-  } finally {
-    userSelectorLoading.value = false
-  }
-}
-
-// 搜索用户
-const searchUsers = () => {
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-
-// 重置用户搜索
-const resetUserSearch = () => {
-  userSearchParams.key = ''
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-
-// 用户选择变化
-const handleUserSelectChange = (row) => {
-  selectedUserTemp.value = row
-}
-
-// 用户选择器分页
-const handleUserSelectorSizeChange = (size) => {
-  userSearchParams.count = size
-  fetchUserSelectorList()
-}
-
-const handleUserSelectorPageChange = (page) => {
-  userSearchParams.page = page
-  fetchUserSelectorList()
 }
 
 // 确认用户选择
-const confirmUserSelection = () => {
-  if (!selectedUserTemp.value) {
+const confirmUserSelection = (user) => {
+  if (!user) {
     ElMessage.warning('请选择一个用户')
     return
   }
-  form.selected_user = selectedUserTemp.value.UserId
-  form.user_id = selectedUserTemp.value.UserId
+  form.selected_user = user.UserId
+  form.user_id = user.UserId
   // 将选中的用户添加到 userOptions 中（如果不存在）
-  if (!userOptions.value.find(u => u.UserId === selectedUserTemp.value.UserId)) {
-    userOptions.value.push(selectedUserTemp.value)
+  if (!userOptions.value.find(u => u.UserId === user.UserId)) {
+    userOptions.value.push(user)
   }
   userSelectorVisible.value = false
   ElMessage.success('用户选择成功')
@@ -691,6 +580,7 @@ const handleEdit = (row) => {
   })
   //点击编辑需要初始化加载用户列表
     fetchUserList()
+    fetchUserGroupList()
 }
 
 // 删除用户关联
diff --git a/src/views/marketing/UserVoucher.vue b/src/views/marketing/UserVoucher.vue
index 7f98b2f..06f7cc6 100644
--- a/src/views/marketing/UserVoucher.vue
+++ b/src/views/marketing/UserVoucher.vue
@@ -2,8 +2,8 @@
   <div class="user-voucher-container">
     <!-- 搜索和操作栏 -->
     <el-card class="filter-container" shadow="never">
-      <el-form :inline="true" :model="queryParams" class="search-form">
-        <el-form-item label="代金券">
+      <el-form :inline="true" :model="queryParams" class="search-form" v-if="!codeId">
+        <el-form-item label="代金券" v-if="!codeId">
           <el-select 
             v-model="queryParams.code_id" 
             placeholder="请选择代金券"
@@ -54,37 +54,37 @@
             {{ row.Id || row.id }}
           </template>
         </el-table-column>
-        <el-table-column label="用户ID" width="100">
+        <el-table-column label="用户ID" min-width="120">
           <template #default="{ row }">
             {{ row.UserId || row.userId }}
           </template>
         </el-table-column>
-        <el-table-column label="代金券ID" width="100">
+        <el-table-column label="代金券ID" width="100" v-if="!codeId">
           <template #default="{ row }">
             {{ row.discountId }}
           </template>
         </el-table-column>
-        <el-table-column label="代金券名称" min-width="150">
+        <el-table-column label="代金券名称" min-width="150" v-if="!codeId">
           <template #default="{ row }">
             {{ row.discount?.name || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="面额" width="120">
+        <el-table-column label="面额" min-width="120">
           <template #default="{ row }">
             <span class="amount">¥{{ row.discount?.amount ? (row.discount.amount / 100).toFixed(2) : '0.00' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="已使用/最大次数" width="150">
+        <el-table-column label="已使用/最大次数" min-width="150">
           <template #default="{ row }">
             <el-tag type="info">{{ row.useTimes || 0 }} / {{ row.maxUseTimes || row.discount?.maxTimes || 0 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="过期时间" width="180">
+        <el-table-column label="过期时间" min-width="180">
           <template #default="{ row }">
             {{ formatDate(row.expireAt) }}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" width="180">
+        <el-table-column label="创建时间" min-width="180">
           <template #default="{ row }">
             {{ formatDate(row.CreatedAt) }}
           </template>
@@ -134,7 +134,7 @@
           <el-select 
             v-model="addForm.voucher_id" 
             placeholder="请选择代金券"
-            :disabled="addForm.discount_type === 'code'"
+            :disabled="addForm.discount_type === 'code' || !!codeId"
             filterable
             clearable
             style="width: 100%"
@@ -178,25 +178,22 @@
         </el-form-item>
         
         <el-form-item label="用户" prop="user_id">
-          <el-select 
-            v-model="addForm.user_id" 
-            placeholder="请选择用户"
-            :disabled="addForm.target_type === 'group'"
-            filterable
-            clearable
-            remote
-            :remote-method="searchUsers"
-            :loading="userSearchLoading"
-            style="width: 100%"
-            @change="handleUserChange"
-          >
-            <el-option
-              v-for="item in userOptions"
-              :key="item.UserId"
-              :label="`${item.UserName} (ID: ${item.UserId})`"
-              :value="item.UserId"
-            />
-          </el-select>
+          <div class="user-selector-wrapper">
+            <div class="selected-user-display" v-if="addForm.user_id">
+              <el-tag type="primary" closable @close="clearSelectedUser">
+                {{ getSelectedUserName() }}
+              </el-tag>
+            </div>
+            <el-button 
+              type="primary" 
+              plain 
+              @click="openUserSelector"
+              style="width: 100%"
+            >
+              <el-icon><User /></el-icon>
+              {{ addForm.user_id ? '重新选择用户' : '选择用户' }}
+            </el-button>
+          </div>
         </el-form-item>
         
         <el-form-item label="用户组" prop="group_id">
@@ -268,13 +265,19 @@
         <el-button type="primary" @click="submitEdit">确定</el-button>
       </template>
     </el-dialog>
+    <!-- 用户选择弹窗 -->
+    <UserSelector
+      v-model:visible="userSelectorVisible"
+      @select="confirmUserSelection"
+    />
   </div>
+
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { Delete, Search, Plus, Refresh } from '@element-plus/icons-vue'
+import { Delete, Search, Plus, Refresh, User } from '@element-plus/icons-vue'
 import { 
   getUserVoucherList, 
   addUserVoucher,
@@ -285,14 +288,29 @@ import {
   allocateVoucher
 } from '@/api/admin/discount'
 import { getUserList, getUserGroupList } from '@/api/admin/user'
+import UserSelector from '@/components/UserSelector/index.vue'
+
+const props = defineProps({
+  codeId: {
+    type: [String, Number],
+    default: ''
+  }
+})
 
 // 查询参数
 const queryParams = reactive({
-  code_id: undefined,
+  code_id: props.codeId || undefined,
   page: 1,
   count: 10
 })
 
+watch(() => props.codeId, (newVal) => {
+  if (newVal) {
+    queryParams.code_id = newVal
+    fetchUserVoucherList()
+  }
+})
+
 // 添加表单
 const addForm = reactive({
   discount_type: 'coupon',  // 优惠类型：coupon-代金券, code-优惠码
@@ -321,6 +339,7 @@ const groupOptions = ref([])     // 用户组选项
 const userSearchLoading = ref(false)  // 用户搜索加载状态
 const submitLoading = ref(false)      // 提交加载状态
 const dataList = ref([])          // 优惠列表
+const userSelectorVisible = ref(false)
 
 // 编辑表单
 const editForm = reactive({
@@ -623,6 +642,36 @@ const handleGroupChange = (val) => {
   }
 }
 
+// 打开用户选择器
+const openUserSelector = () => {
+  userSelectorVisible.value = true
+}
+
+// 确认用户选择
+const confirmUserSelection = (user) => {
+  if (!user) {
+    ElMessage.warning('请选择一个用户')
+    return
+  }
+  addForm.user_id = user.UserId
+  // 将选中的用户添加到 userOptions 中（如果不存在）
+  if (!userOptions.value.find(u => u.UserId === user.UserId)) {
+    userOptions.value.push(user)
+  }
+  userSelectorVisible.value = false
+}
+
+// 清除选中的用户
+const clearSelectedUser = () => {
+  addForm.user_id = undefined
+}
+
+// 获取选中用户的显示名称
+const getSelectedUserName = () => {
+  const user = userOptions.value.find(u => u.UserId === addForm.user_id)
+  return user ? `${user.UserName} (ID: ${user.UserId})` : `用户ID: ${addForm.user_id}`
+}
+
 // 添加用户代金券
 const handleAdd = async () => {
   addDialogVisible.value = true
@@ -630,7 +679,7 @@ const handleAdd = async () => {
   // 重置表单
   Object.assign(addForm, {
     discount_type: 'coupon',
-    voucher_id: undefined,
+    voucher_id: props.codeId || undefined,
     code_id: undefined,
     target_type: 'user',
     user_id: undefined,
@@ -837,6 +886,9 @@ onMounted(() => {
   // 加载代金券列表供选择
   fetchVoucherListOptions()
   fetchDiscountList()
+  if (queryParams.code_id) {
+    fetchUserVoucherList()
+  }
 })
 </script>
 
diff --git a/src/views/marketing/Voucher.vue b/src/views/marketing/Voucher.vue
index b5db990..cd070d3 100644
--- a/src/views/marketing/Voucher.vue
+++ b/src/views/marketing/Voucher.vue
@@ -63,9 +63,10 @@
             <el-icon v-else color="#f56c6c" :size="20"><CircleCloseFilled /></el-icon>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="200" fixed="right">
+        <el-table-column label="操作" width="280" fixed="right">
           <template #default="{ row }">
             <el-button type="primary" link @click="handleEdit(row)">编辑</el-button>
+            <el-button type="primary" link @click="handleManage(row)">管理</el-button>
             <el-button type="success" link @click="handleView(row)">查看</el-button>
             <el-button type="danger" link @click="handleDelete(row)">删除</el-button>
           </template>
@@ -166,8 +167,10 @@
   </div>
 </template>
 
+
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Delete, Refresh, SuccessFilled, CircleCloseFilled } from '@element-plus/icons-vue'
 import { 
@@ -180,6 +183,8 @@ import {
 import { timeToTimestamp } from '@/utils/tool'
 import DiscountDetailDialog from '@/components/marketing/DiscountDetailDialog.vue'
 
+const router = useRouter()
+
 // 查询参数
 const queryParams = reactive({
   discount_type: 'coupon',  // 固定为coupon表示代金券
@@ -312,6 +317,11 @@ const handleEdit = (row) => {
   })
 }
 
+// 管理代金券
+const handleManage = (row) => {
+  router.push(`/marketing/voucher/${row.id}/manage`)
+}
+
 // 查看代金券详情
 const handleView = async (row) => {
   try {
diff --git a/src/views/marketing/VoucherHistory.vue b/src/views/marketing/VoucherHistory.vue
index 339e7e9..9dffd67 100644
--- a/src/views/marketing/VoucherHistory.vue
+++ b/src/views/marketing/VoucherHistory.vue
@@ -46,8 +46,8 @@
         <el-table-column prop="user_id" label="用户ID" width="100" />
         <el-table-column prop="username" label="用户名" width="150" />
         <el-table-column prop="email" label="邮箱" min-width="200" />
-        <el-table-column prop="discount_id" label="代金券ID" width="120" />
-        <el-table-column prop="discount_name" label="代金券名称" min-width="180" />
+        <el-table-column prop="discount_id" label="代金券ID" width="120" v-if="!codeId" />
+        <el-table-column prop="discount_name" label="代金券名称" min-width="180" v-if="!codeId" />
         <el-table-column label="优惠金额" width="120">
           <template #default="{ row }">
             <span class="amount">¥{{ row.discount_amount ? (row.discount_amount / 100).toFixed(2) : '0.00' }}</span>
@@ -133,74 +133,10 @@
       </template>
     </el-dialog>
     <!-- 用户选择弹窗 -->
-    <el-dialog
-      v-model="userSelectorVisible"
-      title="选择用户"
-      width="800px"
-      class="user-selector-dialog"
-    >
-      <!-- 搜索栏 -->
-      <div class="selector-search">
-        <el-input
-          v-model="userSearchParams.key"
-          placeholder="搜索用户名或ID"
-          clearable
-          @keyup.enter="searchUsers"
-          style="width: 300px; margin-right: 12px"
-        >
-          <template #prefix>
-            <el-icon><Search /></el-icon>
-          </template>
-        </el-input>
-        <el-button type="primary" @click="searchUsers">
-          <el-icon><Search /></el-icon>
-          搜索
-        </el-button>
-        <el-button @click="resetUserSearch">重置</el-button>
-      </div>
-
-      <!-- 用户表格 -->
-      <el-table
-        v-loading="userSelectorLoading"
-        :data="userSelectorList"
-        highlight-current-row
-        @current-change="handleUserSelectChange"
-        style="width: 100%; margin-top: 16px"
-        :height="400"
-      >
-        <el-table-column type="index" label="序号" width="60" />
-        <el-table-column prop="UserId" label="用户ID" width="100" />
-        <el-table-column prop="UserName" label="用户名" min-width="150" />
-        <el-table-column prop="Email" label="邮箱" min-width="180" />
-        <el-table-column label="状态" width="100">
-          <template #default="{ row }">
-            <el-tag :type="row.Status === 1 ? 'success' : 'danger'" size="small">
-              {{ row.Status === 1 ? '正常' : '禁用' }}
-            </el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页 -->
-      <el-pagination
-        v-model:current-page="userSearchParams.page"
-        v-model:page-size="userSearchParams.count"
-        :page-sizes="[10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="userSelectorTotal"
-        @size-change="handleUserSelectorSizeChange"
-        @current-change="handleUserSelectorPageChange"
-        background
-        class="selector-pagination"
-      />
-
-      <template #footer>
-        <el-button @click="userSelectorVisible = false">取消</el-button>
-        <el-button type="primary" @click="confirmUserSelection" :disabled="!selectedUserTemp">
-          确定选择
-        </el-button>
-      </template>
-    </el-dialog>
+    <UserSelector
+      v-model:visible="userSelectorVisible"
+      @select="confirmUserSelection"
+    />
 
     <!-- 统计卡片 -->
     <el-row :gutter="20" style="margin-top: 20px">
@@ -237,20 +173,36 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, computed } from 'vue'
+import { ref, reactive, onMounted, computed, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { getUserVoucherHistory, getDiscountCodeList } from '@/api/admin/discount'
 import { getUserList } from '@/api/admin/user'
+import UserSelector from '@/components/UserSelector/index.vue'
+
+const props = defineProps({
+  codeId: {
+    type: [String, Number],
+    default: ''
+  }
+})
 
 // 查询参数
 const queryParams = reactive({
   user_id: undefined,
+  code_id: props.codeId || undefined,
   id: '',
   page: 1,
   count: 10
 })
 
+watch(() => props.codeId, (newVal) => {
+  if (newVal) {
+    queryParams.code_id = newVal
+    fetchHistoryList()
+  }
+})
+
 // 状态数据
 const loading = ref(false)
 const historyList = ref([])
@@ -261,15 +213,6 @@ const currentDetail = ref({})
 const discountOptions = ref([])
 const selectorType = ref('query') 
 const userSelectorVisible = ref(false)
-const userSelectorList = ref([])
-const userSelectorTotal = ref(0)
-const userSearchParams = reactive({
-  key: '',
-  page: 1,
-  count: 10
-})
-const selectedUserTemp = ref(null)
-const userSelectorLoading = ref(false)
 const UserOptions = ref([])
 
 // 格式化日期
@@ -371,86 +314,41 @@ const resetUserSearch = () => {
   // fetchUserSelectorList()
 }
 
+
+// 打开查询用户选择器
+const openQueryUserSelector = () => {
+  selectorType.value = 'query'
+  userSelectorVisible.value = true
+}
+// 打开编辑用户选择器
+const openEditUserSelector = () => {
+  selectorType.value = 'edit'
+  userSelectorVisible.value = true
+}
+
 // 确认用户选择
-const confirmUserSelection = () => {
-  if (!selectedUserTemp.value) {
+const confirmUserSelection = (user) => {
+  if (!user) {
     ElMessage.warning('请选择一个用户')
     return
   }
   
   if (selectorType.value === 'query') {
     // 查询表单选择
-    queryParams.user_id = selectedUserTemp.value.UserId
+    queryParams.user_id = user.UserId
   } else {
     // 编辑表单选择
-    editForm.user_id = selectedUserTemp.value.UserId
+    editForm.user_id = user.UserId
   }
   
   // 将选中的用户添加到 UserOptions 中（如果不存在）
-  if (!UserOptions.value.find(u => u.UserId === selectedUserTemp.value.UserId)) {
-    UserOptions.value.push(selectedUserTemp.value)
+  if (!UserOptions.value.find(u => u.UserId === user.UserId)) {
+    UserOptions.value.push(user)
   }
   
   userSelectorVisible.value = false
   ElMessage.success('用户选择成功')
 }
-// 打开查询用户选择器
-const openQueryUserSelector = () => {
-  selectorType.value = 'query'
-  userSelectorVisible.value = true
-  selectedUserTemp.value = null
-  userSearchParams.key = ''
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-// 打开编辑用户选择器
-const openEditUserSelector = () => {
-  selectorType.value = 'edit'
-  userSelectorVisible.value = true
-  selectedUserTemp.value = null
-  userSearchParams.key = ''
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-
-// 用户选择变化
-const handleUserSelectChange = (row) => {
-  selectedUserTemp.value = row
-}
-// 搜索用户
-const searchUsers = () => {
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-
-// 用户选择器分页
-const handleUserSelectorSizeChange = (size) => {
-  userSearchParams.count = size
-  fetchUserSelectorList()
-}
-
-const handleUserSelectorPageChange = (page) => {
-  userSearchParams.page = page
-  fetchUserSelectorList()
-}
-
-// 获取用户选择器列表
-const fetchUserSelectorList = async () => {
-  userSelectorLoading.value = true
-  try {
-    const res = await getUserList(userSearchParams)
-    console.log('用户选择器列表:', res.data)
-    if (res.data.code === 200) {
-      userSelectorList.value = res.data.data?.data || []
-      userSelectorTotal.value = res.data.data?.all_count || 0
-    }
-  } catch (error) {
-    console.error('获取用户列表失败:', error)
-    ElMessage.error('获取用户列表失败')
-  } finally {
-    userSelectorLoading.value = false
-  }
-}
 
 // 查询
 const handleQuery = () => {
@@ -461,7 +359,7 @@ const handleQuery = () => {
 // 重置查询
 const resetQuery = () => {
   queryParams.user_id = undefined
-  queryParams.discount_id = undefined
+  queryParams.code_id = undefined
   queryParams.id = ''
   queryParams.page = 1
   fetchHistoryList()
diff --git a/src/views/marketing/VoucherHolders.vue b/src/views/marketing/VoucherHolders.vue
index 3574033..e488e99 100644
--- a/src/views/marketing/VoucherHolders.vue
+++ b/src/views/marketing/VoucherHolders.vue
@@ -40,51 +40,51 @@
         style="width: 100%"
       >
         <el-table-column prop="Id" label="ID" width="80" />
-        <el-table-column prop="UserId" label="用户ID" width="100" />
-        <el-table-column label="代金券ID" width="120">
+        <el-table-column prop="UserId" label="用户ID" min-width="100" />
+        <el-table-column label="代金券ID" min-width="110" v-if="!codeId">
           <template #default="{ row }">
             {{ row.discountId || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="代金券名称" min-width="180">
+        <el-table-column label="代金券名称" min-width="180" v-if="!codeId" show-overflow-tooltip>
           <template #default="{ row }">
             {{ row.discount?.name || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="代金券编码" width="150">
+        <el-table-column label="代金券编码" min-width="150" v-if="!codeId">
           <template #default="{ row }">
             {{ row.discount?.code || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="面额" width="120">
+        <el-table-column label="面额" min-width="110">
           <template #default="{ row }">
             <span class="amount">¥{{ row.discount?.amount ? (row.discount.amount / 100).toFixed(2) : '0.00' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="useTimes" label="已使用次数" width="120" />
-        <el-table-column prop="maxUseTimes" label="最大使用次数" width="120" />
-        <el-table-column label="状态" width="100">
+        <el-table-column prop="useTimes" label="已使用" min-width="100" />
+        <el-table-column prop="maxUseTimes" label="最大使用" min-width="100" />
+        <el-table-column label="状态" min-width="100">
           <template #default="{ row }">
-            <el-tag :type="getStatusType(row)">
+            <el-tag :type="getStatusType(row)" size="small">
               {{ getStatusText(row) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="过期时间" width="180">
+        <el-table-column label="过期时间" min-width="160">
           <template #default="{ row }">
             {{ formatDate(row.expireAt) }}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" width="180">
+        <el-table-column label="创建时间" min-width="160">
           <template #default="{ row }">
             {{ formatDate(row.CreatedAt) }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="200" fixed="right">
+        <el-table-column label="操作" width="210" fixed="right">
           <template #default="{ row }">
-            <el-button type="primary" link @click="handleView(row)">查看详情</el-button>
-            <el-button type="warning" link @click="handleEdit(row)">编辑</el-button>
-            <el-button type="danger" link @click="handleDelete(row)">删除</el-button>
+            <el-button type="primary" link size="small" @click="handleView(row)">查看</el-button>
+            <el-button type="warning" link size="small" @click="handleEdit(row)">编辑</el-button>
+            <el-button type="danger" link size="small" @click="handleDelete(row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -203,81 +203,17 @@
     </el-dialog>
 
     <!-- 用户选择弹窗 -->
-    <el-dialog
-      v-model="userSelectorVisible"
-      title="选择用户"
-      width="800px"
-      class="user-selector-dialog"
-    >
-      <!-- 搜索栏 -->
-      <div class="selector-search">
-        <el-input
-          v-model="userSearchParams.key"
-          placeholder="搜索用户名或ID"
-          clearable
-          @keyup.enter="searchUsers"
-          style="width: 300px; margin-right: 12px"
-        >
-          <template #prefix>
-            <el-icon><Search /></el-icon>
-          </template>
-        </el-input>
-        <el-button type="primary" @click="searchUsers">
-          <el-icon><Search /></el-icon>
-          搜索
-        </el-button>
-        <el-button @click="resetUserSearch">重置</el-button>
-      </div>
-
-      <!-- 用户表格 -->
-      <el-table
-        v-loading="userSelectorLoading"
-        :data="userSelectorList"
-        highlight-current-row
-        @current-change="handleUserSelectChange"
-        style="width: 100%; margin-top: 16px"
-        :height="400"
-      >
-        <el-table-column type="index" label="序号" width="60" />
-        <el-table-column prop="UserId" label="用户ID" width="100" />
-        <el-table-column prop="UserName" label="用户名" min-width="150" />
-        <el-table-column prop="Email" label="邮箱" min-width="180" />
-        <el-table-column label="状态" width="100">
-          <template #default="{ row }">
-            <el-tag :type="row.Status === 1 ? 'success' : 'danger'" size="small">
-              {{ row.Status === 1 ? '正常' : '禁用' }}
-            </el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页 -->
-      <el-pagination
-        v-model:current-page="userSearchParams.page"
-        v-model:page-size="userSearchParams.count"
-        :page-sizes="[10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="userSelectorTotal"
-        @size-change="handleUserSelectorSizeChange"
-        @current-change="handleUserSelectorPageChange"
-        background
-        class="selector-pagination"
-      />
-
-      <template #footer>
-        <el-button @click="userSelectorVisible = false">取消</el-button>
-        <el-button type="primary" @click="confirmUserSelection" :disabled="!selectedUserTemp">
-          确定选择
-        </el-button>
-      </template>
-    </el-dialog>
+    <UserSelector
+      v-model:visible="userSelectorVisible"
+      @select="confirmUserSelection"
+    />
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { Search, Refresh, Download, Plus, User } from '@element-plus/icons-vue'
+import { Search, Refresh, Plus, User } from '@element-plus/icons-vue'
 import { 
   getUserVoucherList, 
   allocateVoucher, 
@@ -285,14 +221,34 @@ import {
   deleteUserVoucher,
   getDiscountCodeList
 } from '@/api/admin/discount'
-import { getUserList } from '@/api/admin/user'
+import UserSelector from '@/components/UserSelector/index.vue'
+
+const props = defineProps({
+  codeId: {
+    type: [String, Number],
+    default: ''
+  }
+})
+
 // 查询参数
 const queryParams = reactive({
   user_id: undefined,
+  code_id: props.codeId || undefined,
   page: 1,
   count: 10
 })
 
+watch(() => props.codeId, (newVal) => {
+  if (newVal) {
+    queryParams.code_id = newVal
+    // 如果有 code_id，尝试刷新列表（取决于 API 是否支持仅按 code_id 查询）
+    // 如果 API 必须要求 user_id，则这里可能不需要立即刷新，或者提示用户选择用户
+    if (queryParams.user_id) {
+      fetchHoldersList()
+    }
+  }
+})
+
 // 状态数据
 const loading = ref(false)
 const holdersList = ref([])
@@ -307,16 +263,7 @@ const discountOptions = ref([])
 
 // 用户选择弹窗相关
 const userSelectorVisible = ref(false)
-const userSelectorLoading = ref(false)
-const userSelectorList = ref([])
-const userSelectorTotal = ref(0)
-const selectedUserTemp = ref(null)  // 临时存储选中的用户
 const selectorType = ref('query')  // 'query' 或 'edit' 用于区分是查询还是编辑
-const userSearchParams = reactive({
-  key: '',
-  page: 1,
-  count: 10
-})
 
 // 编辑表单
 const editForm = reactive({
@@ -448,101 +395,36 @@ const handleExport = () => {
   ElMessage.info('导出功能开发中...')
 }
 
-// 获取用户列表
-const fetchUserList = async () => {
-  const res = await getUserList({
-    page: 1,
-    count: 10000,
-    key: ''
-  })
-  UserOptions.value = res.data.data?.data || []
-}
-
 // 打开查询用户选择器
 const openQueryUserSelector = () => {
   selectorType.value = 'query'
   userSelectorVisible.value = true
-  selectedUserTemp.value = null
-  userSearchParams.key = ''
-  userSearchParams.page = 1
-  fetchUserSelectorList()
 }
 
 // 打开编辑用户选择器
 const openEditUserSelector = () => {
   selectorType.value = 'edit'
   userSelectorVisible.value = true
-  selectedUserTemp.value = null
-  userSearchParams.key = ''
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-
-// 获取用户选择器列表
-const fetchUserSelectorList = async () => {
-  userSelectorLoading.value = true
-  try {
-    const res = await getUserList(userSearchParams)
-    console.log('用户选择器列表:', res.data)
-    if (res.data.code === 200) {
-      userSelectorList.value = res.data.data?.data || []
-      userSelectorTotal.value = res.data.data?.all_count || 0
-    }
-  } catch (error) {
-    console.error('获取用户列表失败:', error)
-    ElMessage.error('获取用户列表失败')
-  } finally {
-    userSelectorLoading.value = false
-  }
-}
-
-// 搜索用户
-const searchUsers = () => {
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-
-// 重置用户搜索
-const resetUserSearch = () => {
-  userSearchParams.key = ''
-  userSearchParams.page = 1
-  fetchUserSelectorList()
-}
-
-// 用户选择变化
-const handleUserSelectChange = (row) => {
-  selectedUserTemp.value = row
-}
-
-// 用户选择器分页
-const handleUserSelectorSizeChange = (size) => {
-  userSearchParams.count = size
-  fetchUserSelectorList()
-}
-
-const handleUserSelectorPageChange = (page) => {
-  userSearchParams.page = page
-  fetchUserSelectorList()
 }
 
 // 确认用户选择
-const confirmUserSelection = () => {
-  if (!selectedUserTemp.value) {
+const confirmUserSelection = (user) => {
+  if (!user) {
     ElMessage.warning('请选择一个用户')
     return
   }
   
   if (selectorType.value === 'query') {
     // 查询表单选择
-    queryParams.user_id = selectedUserTemp.value.UserId
+    queryParams.user_id = user.UserId
   } else {
     // 编辑表单选择
-    editForm.user_id = selectedUserTemp.value.UserId
+    editForm.user_id = user.UserId
   }
   
   // 将选中的用户添加到 UserOptions 中（如果不存在）
-  if (!UserOptions.value.find(u => u.UserId === selectedUserTemp.value.UserId)) {
-    UserOptions.value.push(selectedUserTemp.value)
+  if (!UserOptions.value.find(u => u.UserId === user.UserId)) {
+    UserOptions.value.push(user)
   }
   
   userSelectorVisible.value = false
@@ -692,7 +574,6 @@ const submitEditForm = () => {
 
 // 初始化
 onMounted(() => {
-  fetchUserList()
   fetchDiscountList()
   if (queryParams.user_id) {
     fetchHoldersList()
diff --git a/src/views/marketing/VoucherManagement.vue b/src/views/marketing/VoucherManagement.vue
new file mode 100644
index 0000000..c9c0a04
--- /dev/null
+++ b/src/views/marketing/VoucherManagement.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="voucher-management-container">
+    <div class="header">
+      <el-page-header @back="goBack">
+        <template #content>
+          <span class="text-large font-600 mr-3">代金券管理 (ID: {{ voucherId }})</span>
+        </template>
+      </el-page-header>
+    </div>
+
+    <el-card class="mt-4" shadow="never">
+      <el-tabs v-model="activeTab" type="card">
+        <el-tab-pane label="用户分发管理" name="user-distribution">
+          <UserVoucher :code-id="voucherId" />
+        </el-tab-pane>
+        
+        <el-tab-pane label="商品关联管理" name="discount-goods">
+          <DiscountGoods :code-id="voucherId" />
+        </el-tab-pane>
+        
+        <el-tab-pane label="用户关联管理" name="discount-users">
+          <DiscountUsers :code-id="voucherId" />
+        </el-tab-pane>
+        
+        <el-tab-pane label="用户信息管理" name="user-info">
+          <VoucherHolders :code-id="voucherId" />
+        </el-tab-pane>
+        
+        <el-tab-pane label="用户使用记录" name="user-history">
+          <VoucherHistory :code-id="voucherId" />
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import UserVoucher from './UserVoucher.vue'
+import DiscountGoods from './DiscountGoods.vue'
+import DiscountUsers from './DiscountUsers.vue'
+import VoucherHolders from './VoucherHolders.vue'
+import VoucherHistory from './VoucherHistory.vue'
+
+const route = useRoute()
+const router = useRouter()
+const activeTab = ref('user-distribution')
+
+const voucherId = computed(() => route.params.id)
+
+const goBack = () => {
+  router.push('/marketing/voucher')
+}
+</script>
+
+<style scoped>
+.voucher-management-container {
+  padding: 20px;
+}
+
+.header {
+  margin-bottom: 20px;
+}
+
+.mt-4 {
+  margin-top: 16px;
+}
+</style>
diff --git a/src/views/product/ProductList.vue b/src/views/product/ProductList.vue
index 1c29ce7..b79f443 100644
--- a/src/views/product/ProductList.vue
+++ b/src/views/product/ProductList.vue
@@ -99,7 +99,7 @@
           <el-table-column label="操作" width="200" fixed="right">
             <template #default="{ row }">
               <el-button type="primary" link @click="handleEdit(row)">编辑</el-button>
-              <!-- <el-button type="warning" link @click="handleSpec(row)">规格</el-button> -->
+              <el-button type="warning" link @click="handleParameter(row)">参数</el-button>
               <el-button type="danger" link @click="handleDelete(row)">删除</el-button>
             </template>
           </el-table-column>
@@ -181,6 +181,152 @@
         <el-button type="primary" @click="submitForm">确定</el-button>
       </template>
     </el-dialog>
+
+    <!-- 商品参数列表对话框 -->
+    <el-dialog
+      v-model="paramDialogVisible"
+      title="商品参数管理"
+      width="900px"
+    >
+      <div class="filter-section" style="border: none; padding: 0 0 16px 0;">
+        <div class="action-bar">
+          <el-button type="primary" @click="handleAddParameter">
+            <el-icon><Plus /></el-icon>新增参数
+          </el-button>
+          <el-button type="success" @click="fetchParameterList">
+            <el-icon><Refresh /></el-icon>刷新
+          </el-button>
+        </div>
+      </div>
+
+      <el-table
+        v-loading="paramLoading"
+        :data="parameterList"
+        style="width: 100%"
+        :header-cell-style="{ background: '#fafafa', color: '#333', fontWeight: 600 }"
+      >
+        <el-table-column prop="id" label="参数ID" width="100" />
+        <el-table-column prop="name" label="参数名称" min-width="150" />
+        <el-table-column prop="type" label="参数类型" width="120">
+          <template #default="{ row }">
+            <el-tag :type="getArgTypeTag(row.type)">
+              {{ getArgTypeText(row.type) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="250" fixed="right">
+          <template #default="{ row }">
+            <div class="action-buttons">
+              <el-button type="primary" link @click="handleEditParameter(row)">编辑</el-button>
+              <el-button type="success" link @click="handleViewParamValues(row)">查看参数值</el-button>
+              <el-button type="danger" link @click="handleDeleteParameter(row)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <!-- 商品参数表单对话框 -->
+    <el-dialog
+      v-model="paramFormDialogVisible"
+      :title="paramFormType === 'add' ? '新增商品参数' : '编辑商品参数'"
+      width="600px"
+      append-to-body
+    >
+      <el-form
+        ref="paramFormRef"
+        :model="paramForm"
+        :rules="paramRules"
+        label-width="100px"
+      >
+        <el-form-item label="参数名称" prop="arg_name">
+          <el-input v-model="paramForm.arg_name" placeholder="请输入参数名称" />
+        </el-form-item>
+        <el-form-item label="参数类型" prop="arg_type">
+          <el-radio-group v-model="paramForm.arg_type">
+            <el-radio label="string">字符串</el-radio>
+            <el-radio label="number">数字</el-radio>
+            <el-radio label="select">选择</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="paramFormDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="submitParamForm">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 参数值管理对话框 -->
+    <el-dialog
+      v-model="paramValuesDialogVisible"
+      title="参数值管理"
+      width="800px"
+      append-to-body
+    >
+      <div class="values-header">
+        <span>参数：{{ currentParam?.name }}</span>
+        <el-button type="primary" @click="handleAddParamValue">
+          <el-icon><Plus /></el-icon>添加参数值
+        </el-button>
+      </div>
+      
+      <el-table
+        v-loading="paramValuesLoading"
+        :data="paramValueList"
+        style="width: 100%; margin-top: 20px"
+        :header-cell-style="{ background: '#fafafa', color: '#333', fontWeight: 600 }"
+      >
+        <el-table-column prop="id" label="值ID" width="100" />
+        <el-table-column prop="name" label="值名称" min-width="150" />
+        <el-table-column prop="value" label="值" min-width="150" />
+        <el-table-column label="价格" width="120">
+          <template #default="{ row }">
+            ¥{{ (row.price / 100).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="200" fixed="right">
+          <template #default="{ row }">
+            <div class="action-buttons">
+              <el-button type="primary" link @click="handleEditParamValue(row)">编辑</el-button>
+              <el-button type="danger" link @click="handleDeleteParamValue(row)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <!-- 参数值表单对话框 -->
+    <el-dialog
+      v-model="paramValueFormDialogVisible"
+      :title="paramValueFormType === 'add' ? '添加参数值' : '编辑参数值'"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="paramValueFormRef"
+        :model="paramValueForm"
+        :rules="paramValueRules"
+        label-width="100px"
+      >
+        <el-form-item label="值名称" prop="attr_name">
+          <el-input v-model="paramValueForm.attr_name" placeholder="请输入值名称" />
+        </el-form-item>
+        <el-form-item label="值" prop="attr_value">
+          <el-input v-model="paramValueForm.attr_value" placeholder="请输入值" />
+        </el-form-item>
+        <el-form-item label="价格(元)" prop="attr_price">
+          <el-input-number v-model="paramValueForm.attr_price" :min="0" :precision="2" :step="0.01" placeholder="请输入价格" style="width: 100%" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="paramValueFormDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="submitParamValueForm">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -189,8 +335,16 @@ import { ref, reactive, onMounted } from 'vue'
 import { getFileDetail } from '@/api/admin/file'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Delete, Search, Refresh } from '@element-plus/icons-vue'
-import { getProductList, createProduct, updateProduct, deleteProduct } from '@/api/admin/product'
-import { getProductGroupList } from '@/api/admin/product'
+import { getProductList, createProduct, updateProduct, deleteProduct, getProductGroupList,
+  getProductParameterList,
+  getProductParameterDetail,
+  createProductParameter, 
+  updateProductParameter, 
+  deleteProductParameter,
+  addProductParameterValue,
+  updateProductParameterValue,
+  deleteProductParameterValue
+} from '@/api/admin/product'
 
 // 查询参数
 const queryParams = reactive({
@@ -480,6 +634,259 @@ onMounted(() => {
   fetchProductList()
   fetchGroupList()
 })
+
+// ---------------------------------------------------------------------
+// 参数管理相关逻辑
+// ---------------------------------------------------------------------
+
+// 状态
+const paramDialogVisible = ref(false)
+const paramLoading = ref(false)
+const parameterList = ref([])
+const currentProductId = ref(null)
+
+const paramFormDialogVisible = ref(false)
+const paramFormType = ref('add')
+const paramFormRef = ref(null)
+const paramForm = reactive({
+  arg_id: undefined,
+  arg_name: '',
+  arg_type: 'string'
+})
+
+const paramRules = {
+  arg_name: [{ required: true, message: '请输入参数名称', trigger: 'blur' }],
+  arg_type: [{ required: true, message: '请选择参数类型', trigger: 'change' }]
+}
+
+const paramValuesDialogVisible = ref(false)
+const paramValuesLoading = ref(false)
+const paramValueList = ref([])
+const currentParam = ref(null)
+
+const paramValueFormDialogVisible = ref(false)
+const paramValueFormType = ref('add')
+const paramValueFormRef = ref(null)
+const paramValueForm = reactive({
+  attr_id: undefined,
+  attr_name: '',
+  attr_value: '',
+  attr_price: 0
+})
+
+const paramValueRules = {
+  attr_name: [{ required: true, message: '请输入值名称', trigger: 'blur' }],
+  attr_value: [{ required: true, message: '请输入值', trigger: 'blur' }],
+  attr_price: [{ required: true, message: '请输入价格', trigger: 'blur' }]
+}
+
+// 打开参数管理
+const handleParameter = (row) => {
+  currentProductId.value = row.id
+  paramDialogVisible.value = true
+  fetchParameterList()
+}
+
+// 获取参数列表
+const fetchParameterList = async () => {
+  if (!currentProductId.value) return
+  paramLoading.value = true
+  try {
+    const res = await getProductParameterList({ good_id: currentProductId.value })
+    if (res.data.code === 200) {
+      parameterList.value = res.data.data || []
+    }
+  } catch (error) {
+    ElMessage.error('获取参数列表失败')
+  } finally {
+    paramLoading.value = false
+  }
+}
+
+// 参数类型显示
+const getArgTypeText = (type) => {
+  const typeMap = { 'string': '字符串', 'number': '数字', 'select': '选择' }
+  return typeMap[type] || '未知'
+}
+
+const getArgTypeTag = (type) => {
+  const tagMap = { 'string': 'primary', 'number': 'success', 'select': 'warning' }
+  return tagMap[type] || 'info'
+}
+
+// 新增参数
+const handleAddParameter = () => {
+  paramFormType.value = 'add'
+  paramFormDialogVisible.value = true
+  Object.assign(paramForm, {
+    arg_id: undefined,
+    arg_name: '',
+    arg_type: 'string'
+  })
+  paramFormRef.value?.resetFields()
+}
+
+// 编辑参数
+const handleEditParameter = (row) => {
+  paramFormType.value = 'edit'
+  paramFormDialogVisible.value = true
+  Object.assign(paramForm, {
+    arg_id: row.id,
+    arg_name: row.name,
+    arg_type: row.type
+  })
+}
+
+// 删除参数
+const handleDeleteParameter = (row) => {
+  ElMessageBox.confirm(`确认删除参数 ${row.name} 吗？`, '警告', {
+    confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning'
+  }).then(async () => {
+    try {
+      const res = await deleteProductParameter({ good_id: currentProductId.value, arg_id: row.id })
+      if (res.data.code === 200) {
+        ElMessage.success('删除成功')
+        fetchParameterList()
+      }
+    } catch (error) {
+      ElMessage.error('删除失败')
+    }
+  }).catch(() => {})
+}
+
+// 提交参数表单
+const submitParamForm = () => {
+  paramFormRef.value?.validate(async (valid) => {
+    if (valid) {
+      try {
+        const submitData = {
+          good_id: Number(currentProductId.value),
+          arg_name: paramForm.arg_name,
+          arg_type: paramForm.arg_type
+        }
+        if (paramFormType.value === 'edit') {
+          submitData.arg_id = paramForm.arg_id
+        }
+        
+        const res = paramFormType.value === 'add' 
+          ? await createProductParameter(submitData)
+          : await updateProductParameter(submitData)
+          
+        if (res.data.code === 200) {
+          ElMessage.success(paramFormType.value === 'add' ? '新增成功' : '修改成功')
+          paramFormDialogVisible.value = false
+          fetchParameterList()
+        }
+      } catch (error) {
+        ElMessage.error(error.response?.data?.message || '操作失败')
+      }
+    }
+  })
+}
+
+// 查看参数值
+const handleViewParamValues = (row) => {
+  currentParam.value = row
+  paramValuesDialogVisible.value = true
+  fetchParamValuesList()
+}
+
+// 获取参数值列表
+const fetchParamValuesList = async () => {
+  if (!currentProductId.value || !currentParam.value) return
+  paramValuesLoading.value = true
+  try {
+    const res = await getProductParameterDetail({ 
+      good_id: currentProductId.value, 
+      arg_id: currentParam.value.id 
+    })
+    if (res.data.code === 200) {
+      paramValueList.value = res.data.data.attrs || []
+    }
+  } catch (error) {
+    ElMessage.error('获取参数值列表失败')
+  } finally {
+    paramValuesLoading.value = false
+  }
+}
+
+// 添加参数值
+const handleAddParamValue = () => {
+  paramValueFormType.value = 'add'
+  paramValueFormDialogVisible.value = true
+  Object.assign(paramValueForm, {
+    attr_id: undefined,
+    attr_name: '',
+    attr_value: '',
+    attr_price: 0
+  })
+  paramValueFormRef.value?.resetFields()
+}
+
+// 编辑参数值
+const handleEditParamValue = (row) => {
+  paramValueFormType.value = 'edit'
+  paramValueFormDialogVisible.value = true
+  Object.assign(paramValueForm, {
+    attr_id: row.id,
+    attr_name: row.name,
+    attr_value: row.value,
+    attr_price: row.price / 100
+  })
+}
+
+// 删除参数值
+const handleDeleteParamValue = (row) => {
+  ElMessageBox.confirm(`确认删除参数值 ${row.name} 吗？`, '警告', {
+    confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning'
+  }).then(async () => {
+    try {
+      const res = await deleteProductParameterValue({ 
+        good_id: currentProductId.value, 
+        attr_id: row.id 
+      })
+      if (res.data.code === 200) {
+        ElMessage.success('删除成功')
+        fetchParamValuesList()
+      }
+    } catch (error) {
+      ElMessage.error('删除失败')
+    }
+  }).catch(() => {})
+}
+
+// 提交参数值表单
+const submitParamValueForm = () => {
+  paramValueFormRef.value?.validate(async (valid) => {
+    if (valid) {
+      try {
+        const submitData = {
+          good_id: Number(currentProductId.value),
+          arg_id: Number(currentParam.value.id),
+          attr_name: paramValueForm.attr_name,
+          attr_value: paramValueForm.attr_value,
+          attr_price: paramValueForm.attr_price
+        }
+        if (paramValueFormType.value === 'edit') {
+          submitData.attr_id = paramValueForm.attr_id
+        }
+        
+        const res = paramValueFormType.value === 'add'
+          ? await addProductParameterValue(submitData)
+          : await updateProductParameterValue(submitData)
+          
+        if (res.data.code === 200) {
+          ElMessage.success(paramValueFormType.value === 'add' ? '添加成功' : '修改成功')
+          paramValueFormDialogVisible.value = false
+          fetchParamValuesList()
+        }
+      } catch (error) {
+        ElMessage.error(error.response?.data?.message || '操作失败')
+      }
+    }
+  })
+}
+
 </script>
 
 <style scoped>
@@ -607,5 +1014,24 @@ onMounted(() => {
   0% { background-position: 200% 0; }
   100% { background-position: -200% 0; }
 }
+
+.values-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+}
+
+.action-buttons {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+}
 </style>
 
diff --git a/src/views/product/ProductParameter.vue b/src/views/product/ProductParameter.vue
deleted file mode 100644
index 495a829..0000000
--- a/src/views/product/ProductParameter.vue
+++ /dev/null
@@ -1,771 +0,0 @@
-<template>
-  <div class="product-parameter-container">
-    <!-- 主容器 -->
-    <el-card class="main-container" shadow="never">
-      <!-- 操作栏 -->
-      <div class="filter-section">
-        <div class="filter-content">
-          <el-form ref="queryFormRef" label-width="80px" :inline="true" :model="queryParams" class="search-form">
-            <el-form-item label="商品分组">
-              <el-select 
-                v-model="queryParams.good_group_id" 
-                placeholder="请选择商品分组" 
-                clearable
-                @change="handleGroupChange"
-                style="width: 200px"
-              >
-                <el-option 
-                  v-for="item in groupOptions" 
-                  :key="item.id" 
-                  :label="item.name" 
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="商品">
-              <el-select 
-                v-model="queryParams.good_id" 
-                placeholder="请先选择商品分组" 
-                clearable
-                :disabled="!queryParams.good_group_id"
-                style="width: 200px"
-              >
-                <el-option 
-                  v-for="item in productOptions" 
-                  :key="item.id" 
-                  :label="item.name" 
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="handleQuery">
-                <el-icon><Search /></el-icon>查询
-              </el-button>
-              <el-button @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-          <div class="action-bar">
-            <el-button type="primary" @click="handleAdd">
-              <el-icon><Plus /></el-icon>新增商品参数
-            </el-button>
-            <el-button type="success" @click="fetchParameterList">
-              <el-icon><Refresh /></el-icon>刷新
-            </el-button>
-          </div>
-        </div>
-      </div>
-
-      <!-- 商品参数列表 -->
-      <div class="table-section">
-        <!-- 骨架屏 -->
-        <div v-if="loading" class="skeleton-container">
-          <div v-for="i in 5" :key="i" class="skeleton-row">
-            <div class="skeleton-cell skeleton-id"></div>
-            <div class="skeleton-cell skeleton-name"></div>
-            <div class="skeleton-cell skeleton-type"></div>
-            <div class="skeleton-cell skeleton-action"></div>
-          </div>
-        </div>
-
-        <el-table
-          v-else
-          v-loading="loading"
-          :data="parameterList"
-          style="width: 100%"
-          :header-cell-style="{ background: '#fafafa', color: '#333', fontWeight: 600 }"
-        >
-          <el-table-column prop="id" label="参数ID" width="100" />
-          <el-table-column prop="name" label="参数名称" min-width="200" />
-          <el-table-column prop="type" label="参数类型" width="120">
-            <template #default="{ row }">
-              <el-tag :type="getArgTypeTag(row.type)">
-                {{ getArgTypeText(row.type) }}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="250" fixed="right">
-            <template #default="{ row }">
-              <div class="action-buttons">
-                <el-button type="primary" link @click="handleEdit(row)">编辑</el-button>
-                <el-button type="success" link @click="handleViewValues(row)">查看参数值</el-button>
-                <el-button type="danger" link @click="handleDelete(row)">删除</el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        
-        <!-- 分页 -->
-        <el-pagination
-          v-model:current-page="queryParams.page"
-          v-model:page-size="queryParams.count"
-          :page-sizes="[10, 20, 50, 100]"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          background
-          class="pagination"
-        />
-      </div>
-    </el-card>
-
-    <!-- 商品参数表单对话框 -->
-    <el-dialog
-      v-model="dialogVisible"
-      :title="dialogType === 'add' ? '新增商品参数' : '编辑商品参数'"
-      width="600px"
-      append-to-body
-    >
-      <el-form
-        ref="parameterFormRef"
-        :model="parameterForm"
-        :rules="parameterRules"
-        label-width="100px"
-      >
-        <el-form-item label="参数名称" prop="arg_name">
-          <el-input v-model="parameterForm.arg_name" placeholder="请输入参数名称" />
-        </el-form-item>
-        <el-form-item label="参数类型" prop="arg_type">
-          <el-radio-group v-model="parameterForm.arg_type">
-            <el-radio label="string">字符串</el-radio>
-            <el-radio label="number">数字</el-radio>
-            <el-radio label="select">选择</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="submitForm">确定</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 参数值管理对话框 -->
-    <el-dialog
-      v-model="valuesDialogVisible"
-      title="参数值管理"
-      width="800px"
-      append-to-body
-    >
-      <div class="values-header">
-        <span>参数：{{ currentParameter?.arg_name }}</span>
-        <el-button type="primary" @click="handleAddValue">
-          <el-icon><Plus /></el-icon>添加参数值
-        </el-button>
-      </div>
-      
-      <el-table
-        v-loading="valuesLoading"
-        :data="valuesList"
-        style="width: 100%; margin-top: 20px"
-        :header-cell-style="{ background: '#fafafa', color: '#333', fontWeight: 600 }"
-      >
-        <el-table-column prop="id" label="值ID" width="100" />
-        <el-table-column prop="name" label="值名称" min-width="150" />
-        <el-table-column prop="value" label="值" min-width="150" />
-        <el-table-column label="价格" width="120">
-          <template #default="{ row }">
-            ¥{{ (row.price / 100).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="200" fixed="right">
-          <template #default="{ row }">
-            <div class="action-buttons">
-              <el-button type="primary" link @click="handleEditValue(row)">编辑</el-button>
-              <el-button type="danger" link @click="handleDeleteValue(row)">删除</el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-    <!-- 参数值表单对话框 -->
-    <el-dialog
-      v-model="valueDialogVisible"
-      :title="valueDialogType === 'add' ? '添加参数值' : '编辑参数值'"
-      width="500px"
-      append-to-body
-    >
-      <el-form
-        ref="valueFormRef"
-        :model="valueForm"
-        :rules="valueRules"
-        label-width="100px"
-      >
-        <el-form-item label="值名称" prop="attr_name">
-          <el-input v-model="valueForm.attr_name" placeholder="请输入值名称" />
-        </el-form-item>
-        <el-form-item label="值" prop="attr_value">
-          <el-input v-model="valueForm.attr_value" placeholder="请输入值" />
-        </el-form-item>
-        <el-form-item label="价格(元)" prop="attr_price">
-          <el-input-number v-model="valueForm.attr_price" :min="0" :precision="2" :step="0.01" placeholder="请输入价格" style="width: 100%" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="valueDialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="submitValueForm">确定</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Plus, Search, Refresh } from '@element-plus/icons-vue'
-import { 
-  getProductParameterList,
-  getProductParameterDetail,
-  createProductParameter, 
-  updateProductParameter, 
-  deleteProductParameter,
-  addProductParameterValue,
-  updateProductParameterValue,
-  deleteProductParameterValue,
-  getProductList,
-  getProductGroupList
-} from '@/api/admin/product'
-
-// 查询参数
-const queryParams = reactive({
-  good_group_id: undefined,  // 商品分组ID
-  good_id: undefined,        // 商品ID
-  page: 1,
-  count: 10
-})
-
-// 下拉选项数据
-const groupOptions = ref([])      // 商品分组选项
-const productOptions = ref([])    // 商品选项
-const queryFormRef = ref(null)
-
-// 商品参数表单
-const parameterForm = reactive({
-  good_id: undefined,
-  arg_id: undefined,
-  arg_name: '',
-  arg_type: 'string'
-})
-
-const parameterRules = {
-  arg_name: [
-    { required: true, message: '请输入参数名称', trigger: 'blur' }
-  ],
-  arg_type: [
-    { required: true, message: '请选择参数类型', trigger: 'change' }
-  ]
-}
-
-// 参数值表单
-const valueForm = reactive({
-  good_id: undefined,
-  arg_id: undefined,
-  attr_id: undefined,
-  attr_name: '',
-  attr_value: '',
-  attr_price: 0
-})
-
-const valueRules = {
-  attr_name: [
-    { required: true, message: '请输入值名称', trigger: 'blur' }
-  ],
-  attr_value: [
-    { required: true, message: '请输入值', trigger: 'blur' }
-  ],
-  attr_price: [
-    { required: true, message: '请输入价格', trigger: 'blur' }
-  ]
-}
-
-// 状态数据
-const loading = ref(false)
-const valuesLoading = ref(false)
-const parameterList = ref([])
-const valuesList = ref([])
-const total = ref(0)
-const dialogVisible = ref(false)
-const valuesDialogVisible = ref(false)
-const valueDialogVisible = ref(false)
-const dialogType = ref('add')
-const valueDialogType = ref('add')
-const currentParameter = ref(null)
-const parameterFormRef = ref(null)
-const valueFormRef = ref(null)
-
-// 获取商品分组列表
-const fetchGroupList = async () => {
-  try {
-    const res = await getProductGroupList({ page: 1, count: 100 })
-    console.log('商品分组列表:', res.data)
-    if (res.data.code === 200) {
-      groupOptions.value = res.data.data.data || []
-    }
-  } catch (error) {
-    console.error('获取商品分组列表失败:', error)
-    ElMessage.error('获取商品分组列表失败')
-  }
-}
-
-// 获取商品列表（根据分组ID）
-const fetchProductList = async (groupId) => {
-  try {
-    const res = await getProductList({ good_group_id: groupId, page: 1, count: 100 })
-    console.log('商品列表:', res.data)
-    if (res.data.code === 200) {
-      productOptions.value = res.data.data.data || []
-      productOptions.value = productOptions.value.filter(item => item.delete == false)
-    }
-  } catch (error) {
-    console.error('获取商品列表失败:', error)
-    ElMessage.error('获取商品列表失败')
-  }
-}
-
-// 商品分组改变时
-const handleGroupChange = (groupId) => {
-  // 清空商品选择
-  queryParams.good_id = undefined
-  productOptions.value = []
-  
-  if (groupId) {
-    // 获取该分组下的商品列表
-    fetchProductList(groupId)
-  }
-}
-
-// 获取商品参数列表
-const fetchParameterList = async () => {
-  // 如果没有选择商品ID，不查询
-  if (!queryParams.good_id) {
-    ElMessage.warning('请先选择商品')
-    return
-  }
-  
-  loading.value = true
-  try {
-    const res = await getProductParameterList({ good_id: queryParams.good_id })
-    console.log('商品参数列表:', res.data)
-    if (res.data.code === 200) {
-      parameterList.value = res.data.data || []
-      total.value = res.data.data.length || 0
-    }
-  } catch (error) {
-    console.error('获取商品参数列表失败:', error)
-    ElMessage.error('获取商品参数列表失败')
-  } finally {
-    loading.value = false
-  }
-}
-
-// 查询
-const handleQuery = () => {
-  queryParams.page = 1
-  fetchParameterList()
-}
-
-// 重置查询
-const resetQuery = () => {
-  queryParams.good_group_id = undefined
-  queryParams.good_id = undefined
-  queryParams.page = 1
-  productOptions.value = []
-  parameterList.value = []
-  total.value = 0
-}
-
-// 获取参数值列表
-const fetchValuesList = async (goodId, argId) => {
-  valuesLoading.value = true
-  console.log('goodId', goodId)
-  console.log('argId', argId)
-  try {
-    const res = await getProductParameterDetail({ good_id: goodId, arg_id: argId })
-    console.log('参数值列表:', res.data)
-    if (res.data.code === 200) {
-      valuesList.value = res.data.data.attrs || []
-    }
-  } catch (error) {
-    console.error('获取参数值列表失败:', error)
-    ElMessage.error('获取参数值列表失败')
-  } finally {
-    valuesLoading.value = false
-  }
-}
-
-// 获取参数类型文本
-const getArgTypeText = (type) => {
-  const typeMap = {
-    'string': '字符串',
-    'number': '数字',
-    'select': '选择'
-  }
-  return typeMap[type] || '未知'
-}
-
-// 获取参数类型标签颜色
-const getArgTypeTag = (type) => {
-  const tagMap = {
-    'string': 'primary',
-    'number': 'success',
-    'select': 'warning'
-  }
-  return tagMap[type] || 'info'
-}
-
-// 分页
-const handleSizeChange = (size) => {
-  queryParams.count = size
-  fetchParameterList()
-}
-
-const handleCurrentChange = (page) => {
-  queryParams.page = page
-  fetchParameterList()
-}
-
-// 新增商品参数
-const handleAdd = () => {
-  if (!queryParams.good_id) {
-    ElMessage.warning('请先选择商品')
-    return
-  }
-  dialogType.value = 'add'
-  dialogVisible.value = true
-  Object.assign(parameterForm, {
-    good_id: queryParams.good_id,
-    arg_id: undefined,
-    arg_name: '',
-    arg_type: 'string'
-  })
-  parameterFormRef.value?.resetFields()
-}
-
-// 编辑商品参数
-const handleEdit = (row) => {
-  dialogType.value = 'edit'
-  dialogVisible.value = true
-  Object.assign(parameterForm, {
-    good_id: queryParams.good_id,
-    arg_id: row.id,
-    arg_name: row.name,
-    arg_type: row.type
-  })
-}
-
-// 查看参数值
-const handleViewValues = (row) => {
-  currentParameter.value = row
-  valuesDialogVisible.value = true
-  fetchValuesList(queryParams.good_id, row.id)
-}
-
-// 添加参数值
-const handleAddValue = () => {
-  valueDialogType.value = 'add'
-  console.log('currentParameter', currentParameter.value)
-  valueDialogVisible.value = true
-  Object.assign(valueForm, {
-    good_id: queryParams.good_id,
-    arg_id: currentParameter.value.id,
-    attr_id: undefined,
-    attr_name: '',
-    attr_value: '',
-    attr_price: 0
-  })
-  valueFormRef.value?.resetFields()
-}
-
-// 编辑参数值
-const handleEditValue = (row) => {
-  valueDialogType.value = 'edit'
-  valueDialogVisible.value = true
-  Object.assign(valueForm, {
-    good_id: queryParams.good_id,
-    arg_id: currentParameter.value.id,
-    attr_id: row.id,
-    attr_name: row.name,
-    attr_value: row.value,
-    attr_price: row.price / 100 // 分转元
-  })
-}
-
-// 删除参数值
-const handleDeleteValue = (row) => {
-  ElMessageBox.confirm(`确认删除参数值 ${row.name} 吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(async () => {
-    try {
-      const res = await deleteProductParameterValue({ 
-        good_id: queryParams.good_id,
-        attr_id: row.id 
-      })
-      console.log('删除参数值响应:', res.data)
-      if (res.data.code === 200) {
-        ElMessage.success('删除成功')
-        fetchValuesList(queryParams.good_id, currentParameter.value.id)
-      }
-    } catch (error) {
-      console.error('删除失败:', error)
-      ElMessage.error(error.response?.data?.message || '删除失败')
-    }
-  }).catch(() => {})
-}
-
-// 删除商品参数
-const handleDelete = (row) => {
-  ElMessageBox.confirm(`确认删除商品参数 ${row.name} 吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(async () => {
-    try {
-      const res = await deleteProductParameter({ 
-        good_id: queryParams.good_id,
-        arg_id: row.id 
-      })
-      console.log('删除参数响应:', res.data)
-      if (res.data.code === 200) {
-        ElMessage.success('删除成功')
-        fetchParameterList()
-      }
-    } catch (error) {
-      console.error('删除失败:', error)
-      ElMessage.error(error.response?.data?.message || '删除失败')
-    }
-  }).catch(() => {})
-}
-
-// 提交参数表单
-const submitForm = () => {
-  parameterFormRef.value?.validate(async (valid) => {
-    if (valid) {
-      try {
-        const submitData = {
-          good_id: Number(parameterForm.good_id),
-          arg_name: parameterForm.arg_name,
-          arg_type: parameterForm.arg_type
-        }
-        
-        if (dialogType.value === 'edit') {
-          submitData.arg_id = parameterForm.arg_id
-        }
-        
-        console.log('提交参数数据:', submitData)
-        
-        let res
-        if (dialogType.value === 'add') {
-          res = await createProductParameter(submitData)
-        } else {
-          res = await updateProductParameter(submitData)
-        }
-        
-        console.log('提交参数响应:', res.data)
-        if (res.data.code === 200) {
-          ElMessage.success(dialogType.value === 'add' ? '新增成功' : '修改成功')
-          dialogVisible.value = false
-          fetchParameterList()
-        }
-      } catch (error) {
-        console.error('操作失败:', error)
-        ElMessage.error(error.response?.data?.message || '操作失败')
-      }
-    }
-  })
-}
-
-// 提交参数值表单
-const submitValueForm = () => {
-  valueFormRef.value?.validate(async (valid) => {
-    if (valid) {
-      try {
-        const submitData = {
-          good_id: Number(valueForm.good_id),
-          arg_id: Number(valueForm.arg_id),
-          attr_name: valueForm.attr_name,
-          attr_value: valueForm.attr_value,
-          attr_price: valueForm.attr_price // 元转分
-        }
-        
-        if (valueDialogType.value === 'edit') {
-          submitData.attr_id = valueForm.attr_id
-        }
-        
-        console.log('提交参数值数据:', submitData)
-        
-        let res
-        if (valueDialogType.value === 'add') {
-          res = await addProductParameterValue(submitData)
-        } else {
-          res = await updateProductParameterValue(submitData)
-        }
-        
-        console.log('提交参数值响应:', res.data)
-        if (res.data.code === 200) {
-          ElMessage.success(valueDialogType.value === 'add' ? '添加成功' : '修改成功')
-          valueDialogVisible.value = false
-          fetchValuesList(queryParams.good_id, currentParameter.value.id)
-        }
-      } catch (error) {
-        console.error('操作失败:', error)
-        ElMessage.error(error.response?.data?.message || '操作失败')
-      }
-    }
-  })
-}
-
-// 初始化
-onMounted(() => {
-  // 初始化时只获取商品分组列表
-  fetchGroupList()
-})
-</script>
-
-<style scoped>
-.product-parameter-container {
-  padding: 0;
-}
-
-.main-container {
-  border: 1px solid #e1e8ed;
-  background: #ffffff;
-}
-
-.filter-section {
-  padding: 0;
-  border-bottom: 1px solid #e1e8ed;
-  background: #fafbfc;
-}
-
-.filter-content {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16px 20px;
-  gap: 20px;
-  flex-wrap: wrap;
-}
-
-.search-form {
-  margin: 0;
-  flex: 1;
-  display: flex;
-  align-items: center;
-  gap: 12px;
-}
-
-.search-form :deep(.el-form-item) {
-  margin-bottom: 0;
-}
-
-.action-bar {
-  display: flex;
-  gap: 12px;
-  flex-shrink: 0;
-}
-
-.table-section {
-  padding: 0;
-}
-
-.action-buttons {
-  display: flex;
-  gap: 8px;
-  align-items: center;
-}
-
-.values-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20px;
-}
-
-.pagination {
-  margin-top: 20px;
-  padding: 16px 20px;
-  border-top: 1px solid #e1e8ed;
-  background: #fafbfc;
-  justify-content: flex-end;
-}
-
-.dialog-footer {
-  display: flex;
-  justify-content: flex-end;
-  gap: 12px;
-  padding: 0;
-}
-
-/* 表格样式优化 */
-:deep(.el-table) {
-  border: none;
-  color: #2c3e50;
-}
-
-:deep(.el-table__header) {
-  background: #f8f9fa;
-}
-
-:deep(.el-table th) {
-  background: #f8f9fa !important;
-  border-bottom: 2px solid #e1e8ed;
-  color: #2c3e50;
-  font-weight: 600;
-  font-size: 13px;
-}
-
-:deep(.el-table td) {
-  border-bottom: 1px solid #f0f2f5;
-  color: #34495e;
-}
-
-:deep(.el-table tr:hover > td) {
-  background-color: #f8f9fa !important;
-}
-
-:deep(.el-card__body) {
-  padding: 0;
-}
-
-/* 骨架屏样式 */
-.skeleton-container {
-  padding: 20px;
-}
-
-.skeleton-row {
-  display: flex;
-  align-items: center;
-  padding: 16px 0;
-  border-bottom: 1px solid #f0f0f0;
-  gap: 16px;
-}
-
-.skeleton-row:last-child {
-  border-bottom: none;
-}
-
-.skeleton-cell {
-  height: 20px;
-  background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
-  background-size: 200% 100%;
-  animation: skeleton-loading 1.5s ease-in-out infinite;
-  border-radius: 4px;
-}
-
-.skeleton-id { width: 100px; }
-.skeleton-name { width: 200px; }
-.skeleton-type { width: 120px; }
-.skeleton-action { width: 250px; height: 32px; }
-
-@keyframes skeleton-loading {
-  0% { background-position: 200% 0; }
-  100% { background-position: -200% 0; }
-}
-</style>
diff --git a/src/views/ticket/TicketChat.vue b/src/views/ticket/TicketChat.vue
index 67875c6..5ef147e 100644
--- a/src/views/ticket/TicketChat.vue
+++ b/src/views/ticket/TicketChat.vue
@@ -33,7 +33,7 @@
           @click="selectTicket(ticket)"
         >
           <div class="ticket-avatar">
-            <el-avatar :size="40">{{ ticket.username.charAt(0) }}</el-avatar>
+            <el-avatar :size="40" :src="ticket.avatar">{{ ticket.username.charAt(0) }}</el-avatar>
           </div>
           <div class="ticket-content">
             <div class="ticket-top">
@@ -96,8 +96,8 @@
           :class="['message-item', message.isAdmin ? 'message-admin' : message.isSystem ? 'message-system' : 'message-user']"
         >
           <div class="message-avatar" v-if="!message.isAdmin && !message.isSystem">
-            <el-avatar :size="36" :src="getUserAvatar(message.userId)">
-              {{ currentTicket.username.charAt(0) }}
+            <el-avatar :size="36" :src="message.avatar">
+              {{ message.userId === currentTicket.userId ? currentTicket.username.charAt(0) : 'U' }}
             </el-avatar>
           </div>
           <div class="message-content">
@@ -117,7 +117,7 @@
             <div class="message-time">{{ formatMessageTime(message.time) }}</div>
           </div>
           <div class="message-avatar" v-if="message.isAdmin && !message.isSystem">
-            <el-avatar :size="36" :src="getUserAvatar(message.userId || 1)">A</el-avatar>
+            <el-avatar :size="36" :src="message.avatar">A</el-avatar>
           </div>
         </div>
       </div>
@@ -204,21 +204,24 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Plus, Loading } from '@element-plus/icons-vue'
 import { useRoute, useRouter } from 'vue-router'
 import { 
-  getTickerList, 
+  getTickerList,
   getTicketDetail, 
   replyTicket, 
   closeTicket, 
   getUserAvatar,
   getFileImage,
-  parseFilesToImages
+  parseFilesToImages,
+  getTicketCount
 } from '@/api/ticket'
+import notificationSound from '@/assets/7.wav'
+import { useUserStore } from '@/store/userStore'
 
 // 路由相关
 const route = useRoute()
 const router = useRouter()
 
-// 管理员ID列表（客服ID）
-const adminUserIds = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] // 假设这些ID是客服ID
+// 用户 store
+const userStore = useUserStore()
 
 // 头像
 const adminAvatar = ref('')
@@ -271,6 +274,11 @@ const stats = reactive({
   isLoadingStats: false
 })
 
+// 上一次的待处理数量，用于判断是否有新工单
+const previousPendingCount = ref(0)
+// 音频对象
+const audio = new Audio(notificationSound)
+
 // 快捷回复选项
 const quickReplies = ref([
   { title: '您好，有什么可以帮助您的？', content: '您好，有什么可以帮助您的？' },
@@ -327,8 +335,9 @@ const fetchTicketList = async (append = false) => {
       const mappedTickets = tickets.map(item => ({
         id: item.work_id,
         title: item.name,
-        username: `用户${item.user_id}`, // 用户名，真实环境可能需要获取用户信息
-        userId: item.user_id,
+        username: item.user?.userName || `用户${item.user?.userId || 'Unknown'}`,
+        userId: item.user?.userId,
+        avatar: item.user?.coverUrl || '',
         createTime: new Date(item.created_at).toLocaleString(),
         lastReplyTime: new Date(item.update_time).toLocaleString(),
         status: convertStatusToString(item.status),
@@ -368,44 +377,35 @@ const fetchTicketList = async (append = false) => {
   }
 }
 
-// 获取单个状态的工单数量
-const fetchStatusStat = async (status) => {
-  try {
-    // 将状态字符串转换为API所需的状态值
-    let statusValue = '';
-    if (status === 'pending') statusValue = '0';
-    else if (status === 'processing') statusValue = '1';
-    else if (status === 'replied') statusValue = '2';
-    else if (status === 'completed') statusValue = '3';
-    
-    const res = await getTickerList(10, 1, statusValue) // 只请求一条数据，但获取总数
-    
-    if (res.code === 200) {
-      if (status === '') {
-        stats.total = res.data.all_count
-      } else {
-        stats[status] = res.data.all_count
-      }
-    } else {
-      console.error(`获取${status || '全部'}工单统计失败:`, res.message)
-    }
-  } catch (error) {
-    console.error(`获取${status || '全部'}工单统计出错:`, error)
-  }
-}
-
 // 获取所有状态的工单数量
 const fetchAllStats = async () => {
   stats.isLoadingStats = true
   try {
-    // 并行获取各个状态的工单数量
-    await Promise.all([
-      fetchStatusStat(''), // 获取全部工单数量
-      fetchStatusStat('pending'), // 待处理
-      fetchStatusStat('processing'), // 处理中
-      fetchStatusStat('replied'), // 已回复
-      fetchStatusStat('completed') // 已完成
-    ])
+    const res = await getTicketCount()
+    if (res.code === 200) {
+      const data = res.data
+      
+      // 检查是否有新工单（待处理数量增加）
+      if (data.wait_count > previousPendingCount.value && previousPendingCount.value !== 0) {
+        try {
+          audio.play().catch(e => console.error('播放提示音失败:', e))
+        } catch (e) {
+          console.error('播放提示音出错:', e)
+        }
+      }
+      
+      // 更新上一次的数量
+      previousPendingCount.value = data.wait_count
+
+      stats.total = data.all_count
+      stats.pending = data.wait_count
+      stats.replied = data.reply_count
+      stats.completed = data.close_count
+      // 计算处理中的数量：总数 - 待处理 - 已回复 - 已完成
+      stats.processing = data.all_count - data.wait_count - data.reply_count - data.close_count
+    } else {
+      console.error('获取工单统计失败:', res.message)
+    }
   } catch (error) {
     console.error('获取工单统计数据出错:', error)
   } finally {
@@ -413,18 +413,12 @@ const fetchAllStats = async () => {
   }
 }
 
-// 只刷新当前分类的统计数据（用于定时刷新，减少请求）
+// 刷新统计数据（用于定时刷新）
 const fetchCurrentStatusStat = async () => {
-  try {
-    // 只获取当前选中分类的统计数据
-    await fetchStatusStat(activeStatus.value)
-    // 同时获取全部工单数量（因为顶部显示需要）
-    await fetchStatusStat('')
-  } catch (error) {
-    console.error('获取当前分类统计数据出错:', error)
-  }
+  await fetchAllStats()
 }
 
+
 // 加载更多工单
 const loadMoreTickets = () => {
   if (!hasMore.value || isLoading.value) return
@@ -476,9 +470,9 @@ const filteredTickets = computed(() => {
   })
 })
 
-// 判断是否是客服
+// 判断是否是当前登录的管理员
 const isAdmin = (userId) => {
-  return adminUserIds.includes(userId)
+  return userId === userStore.userInfo?.user_id
 }
 
 // 状态转换
@@ -540,25 +534,25 @@ const fetchTicketMessages = async (workId) => {
       }
       
       // 处理消息列表
-      if (detail.Content && detail.Content.length > 0) {
-        // 使用Promise.all一次性处理所有消息和图片
-        const messagesPromises = detail.Content.map(async (msg) => {
-          const isAdminMsg = isAdmin(msg.UserId)
-          const images = await parseFilesToImages(msg.Flies)
+      if (detail.content && detail.content.length > 0) {
+        // 处理所有消息
+        const messages = detail.content.map((msg) => {
+          const isAdminMsg = isAdmin(msg.user?.userId)
+          // 从 flies 数组中提取图片 URL
+          const images = msg.flies ? msg.flies.map(file => file.url) : []
           
           return {
-            id: msg.Id,
-            content: msg.Content !== 'empty' ? msg.Content : null,
+            id: msg.id,
+            content: msg.content !== 'empty' ? msg.content : null,
             images: images,
-            time: new Date(msg.CreatedAt).toLocaleString(),
+            time: new Date().toLocaleString(), // API 没有返回时间，使用当前时间
             isAdmin: isAdminMsg,
             isSystem: false,
-            userId: msg.UserId
+            userId: msg.user?.userId,
+            avatar: msg.user?.coverUrl || ''
           }
         })
         
-        // 等待所有消息处理完成
-        const messages = await Promise.all(messagesPromises)
         currentMessages.value = messages
       }
     } else {
@@ -589,23 +583,29 @@ const sendMessage = async () => {
   const fileIds = []
   
   try {
-    // 添加一个临时的"正在发送"消息
+    // 保存输入内容
+    const inputMsg = messageInput.value.trim()
+    const inputImages = [...selectedImages.value]
+    
+    // 清空输入和已选图片
+    messageInput.value = ''
+    selectedImages.value = []
+    
+    // 立即添加消息到界面（不显示 loading）
     const tempMsg = {
-      content: messageInput.value.trim() || null,
-      images: selectedImages.value.length > 0 ? [...selectedImages.value] : null,
+      id: Date.now(), // 临时 ID
+      content: inputMsg || null,
+      images: inputImages.length > 0 ? inputImages : [],
       time: new Date().toLocaleString(),
       isAdmin: true,
-      isLoading: true,
+      isSystem: false,
+      userId: userStore.userInfo?.user_id,
+      avatar: userStore.userInfo?.cover_url || '',
       isTempMessage: true
     }
     
     currentMessages.value.push(tempMsg)
     
-    // 清空输入和已选图片
-    const inputMsg = messageInput.value
-    messageInput.value = ''
-    selectedImages.value = []
-    
     // 滚动到底部
     await nextTick()
     scrollToBottom()
@@ -633,6 +633,7 @@ const sendMessage = async () => {
       
       // 恢复输入内容
       messageInput.value = inputMsg
+      selectedImages.value = inputImages
       
       ElMessage.error(res.message || '发送失败')
     }
@@ -838,8 +839,9 @@ const refreshTicketList = async () => {
       const mappedTickets = tickets.map(item => ({
         id: item.work_id,
         title: item.name,
-        username: `用户${item.user_id}`,
-        userId: item.user_id,
+        username: item.user?.userName || `用户${item.user?.userId || 'Unknown'}`,
+        userId: item.user?.userId,
+        avatar: item.user?.coverUrl || '',
         createTime: new Date(item.created_at).toLocaleString(),
         lastReplyTime: new Date(item.update_time).toLocaleString(),
         status: convertStatusToString(item.status),
@@ -874,6 +876,39 @@ const refreshTicketList = async () => {
   }
 }
 
+// 辅助函数：去除 URL 中的查询参数
+const normalizeUrl = (url) => {
+  if (!url) return ''
+  return url.split('?')[0]
+}
+
+// 辅助函数：比较两个消息数组是否相同（忽略 URL 查询参数）
+const areMessagesEqual = (messages1, messages2) => {
+  if (messages1.length !== messages2.length) return false
+  
+  for (let i = 0; i < messages1.length; i++) {
+    const msg1 = messages1[i]
+    const msg2 = messages2[i]
+    
+    // 比较消息 ID 和内容
+    if (msg1.id !== msg2.id || msg1.content !== msg2.content) return false
+    
+    // 比较图片数量
+    if ((msg1.images?.length || 0) !== (msg2.images?.length || 0)) return false
+    
+    // 比较图片 URL（去除查询参数）
+    if (msg1.images && msg2.images) {
+      for (let j = 0; j < msg1.images.length; j++) {
+        if (normalizeUrl(msg1.images[j]) !== normalizeUrl(msg2.images[j])) {
+          return false
+        }
+      }
+    }
+  }
+  
+  return true
+}
+
 // 静默刷新聊天记录（不显示loading状态）
 const refreshTicketMessages = async (workId) => {
   try {
@@ -886,37 +921,33 @@ const refreshTicketMessages = async (workId) => {
       if (currentTicket.value) {
         // 只有非待处理状态才直接更新，待处理状态保持不变，等待回复后再更新
         if (currentTicket.value.status !== 'pending') {
-          currentTicket.value.status = convertStatusToString(detail.Status)
+          currentTicket.value.status = convertStatusToString(detail.status)
         }
       }
       
       // 处理消息列表
-      if (detail.Content && detail.Content.length > 0) {
-        // 检查是否有新消息
-        const lastMsgId = currentMessages.value.length > 0 ? 
-                        currentMessages.value[currentMessages.value.length - 1].id : 0;
-        const hasNewMessage = detail.Content.some(msg => msg.Id > lastMsgId);
-        
-        if (hasNewMessage) {
-          // 有新消息时才更新
-          const messagesPromises = detail.Content.map(async (msg) => {
-            const isAdminMsg = isAdmin(msg.UserId)
-            const images = await parseFilesToImages(msg.Flies)
-            
-            return {
-              id: msg.Id,
-              content: msg.Content !== 'empty' ? msg.Content : null,
-              images: images,
-              time: new Date(msg.CreatedAt).toLocaleString(),
-              isAdmin: isAdminMsg,
-              isSystem: false,
-              userId: msg.UserId
-            }
-          })
+      if (detail.content && detail.content.length > 0) {
+        // 构建新消息列表
+        const newMessages = detail.content.map((msg) => {
+          const isAdminMsg = isAdmin(msg.user?.userId)
+          // 从 flies 数组中提取图片 URL
+          const images = msg.flies ? msg.flies.map(file => file.url) : []
           
-          // 等待所有消息处理完成
-          const messages = await Promise.all(messagesPromises)
-          currentMessages.value = messages
+          return {
+            id: msg.id,
+            content: msg.content !== 'empty' ? msg.content : null,
+            images: images,
+            time: new Date().toLocaleString(), // API 没有返回时间，使用当前时间
+            isAdmin: isAdminMsg,
+            isSystem: false,
+            userId: msg.user?.userId,
+            avatar: msg.user?.coverUrl || ''
+          }
+        })
+        
+        // 只有在消息真正发生变化时才更新（忽略 URL 查询参数的变化）
+        if (!areMessagesEqual(currentMessages.value, newMessages)) {
+          currentMessages.value = newMessages
           
           // 如果有新消息，滚动到底部
           nextTick(() => {
diff --git a/src/views/user/UserDetail.vue b/src/views/user/UserDetail.vue
index 266c548..3784779 100644
--- a/src/views/user/UserDetail.vue
+++ b/src/views/user/UserDetail.vue
@@ -304,23 +304,37 @@
     </el-dialog>
 
     <!-- Token 展示对话框 -->
-    <el-dialog v-model="tokenDialogVisible" title="模拟登录 Token" width="600px" append-to-body>
+    <el-dialog v-model="tokenDialogVisible" title="模拟登录" width="450px" append-to-body>
       <div class="token-container">
-        <el-alert type="success" :closable="false" show-icon class="token-alert">
-          <template #default>
-            <span>Token 生成成功，请妥善保管。</span>
-          </template>
-        </el-alert>
-        <div class="token-box">
-          <el-input v-model="loginToken" type="textarea" :rows="4" readonly class="token-input" />
-          <div class="token-actions">
-            <el-button type="primary" link :icon="CopyDocument" @click="copyToken">复制</el-button>
-          </div>
-        </div>
+        <el-form label-width="100px">
+          <el-form-item label="选择环境">
+            <el-select v-model="selectedEnvironment" placeholder="请选择登录环境" size="large" style="width: 100%">
+              <el-option label="正式环境" value="production">
+                <div class="env-option">
+                  <span>正式环境</span>
+                  <span class="env-url">www.007yjs.com</span>
+                </div>
+              </el-option>
+              <el-option label="测试环境" value="test">
+                <div class="env-option">
+                  <span>测试环境</span>
+                  <span class="env-url">apiserver.s1f.ren</span>
+                </div>
+              </el-option>
+              <el-option label="本地环境" value="local">
+                <div class="env-option">
+                  <span>本地环境</span>
+                  <span class="env-url">localhost:5173</span>
+                </div>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
       </div>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="tokenDialogVisible = false">关闭</el-button>
+          <el-button @click="tokenDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="confirmJump" :disabled="!selectedEnvironment">确认跳转</el-button>
         </div>
       </template>
     </el-dialog>
@@ -364,7 +378,7 @@ import AvatarSelector from '@/components/admin/AvatarSelector.vue'
 import { 
   ArrowLeft, Refresh, Edit as EditIcon, Delete, Wallet, Avatar, Lock, 
   UserFilled, Document, Clock, List, Switch, User, Camera, Upload, 
-  UploadFilled, Key, CopyDocument 
+  UploadFilled, Key, Monitor, Setting 
 } from '@element-plus/icons-vue'
 import { getUserGroupList } from '@/api/admin/user'
 import { getFileDetail, getFileList, getFile, uploadFile } from '@/api/admin/file'
@@ -465,6 +479,15 @@ const realnameForm = reactive({
 // Token 展示相关
 const tokenDialogVisible = ref(false)
 const loginToken = ref('')
+const loginExpire = ref('')
+const selectedEnvironment = ref('')
+
+// 环境配置
+const environments = {
+  production: 'https://www.007yjs.com',
+  test: 'https://apiserver.s1f.ren',
+  local: 'http://localhost:5173'
+}
 
 // 管理员权限管理相关
 const adminDialogVisible = ref(false)
@@ -729,8 +752,10 @@ const handleSimulateLogin = async () => {
     const res = await mockUserLogin({ user_id: userInfo.value.UserId })
     if (res.data.code === 200) {
       loginToken.value = res.data.data.token || ''
+      loginExpire.value = res.data.data.expire_time || ''
+      selectedEnvironment.value = ''
       tokenDialogVisible.value = true
-      ElMessage.success('模拟登录成功')
+      //ElMessage.success('模拟登录成功')
     } else {
       ElMessage.error(res.data.message || '模拟登录失败')
     }
@@ -739,14 +764,18 @@ const handleSimulateLogin = async () => {
   }
 }
 
-// 复制 Token
-const copyToken = async () => {
-  try {
-    await navigator.clipboard.writeText(loginToken.value)
-    ElMessage.success('Token 已复制到剪贴板')
-  } catch (err) {
-    ElMessage.error('复制失败，请手动复制')
+// 确认跳转
+const confirmJump = () => {
+  if (!selectedEnvironment.value) {
+    ElMessage.warning('请选择登录环境')
+    return
   }
+  const baseUrl = environments[selectedEnvironment.value]
+  const url = `${baseUrl}/token-login?token=${loginToken.value}&expire=${loginExpire.value}`
+  window.open(url, '_blank')
+  const envName = selectedEnvironment.value === 'production' ? '正式' : selectedEnvironment.value === 'test' ? '测试' : '本地'
+  ElMessage.success(`正在跳转到${envName}环境`)
+  tokenDialogVisible.value = false
 }
 
 // 获取实名状态文本
@@ -1166,6 +1195,28 @@ onActivated(() => {
   font-size: 13px;
 }
 
+/* Token Dialog */
+.token-container {
+  padding: 20px 0;
+}
+
+.env-option {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 4px 0;
+}
+
+.env-option span:first-child {
+  font-size: 14px;
+  color: #303133;
+}
+
+.env-url {
+  font-size: 12px;
+  color: #909399;
+}
+
 /* Responsive */
 @media (max-width: 1024px) {
   .detail-grid {