fix: 用户商品模块

src/views/user-vm/UserVmList.vue

@@ -48,7 +48,7 @@
 
       <div class="table-section">
         <el-alert v-if="listError" :title="listError" type="warning" :closable="false" show-icon style="margin:12px 20px 0" />
-        <el-table :data="list" v-loading="loading" stripe style="width:100%" @row-click="handleRowClick"
+        <el-table :data="list" v-loading="loading" stripe style="width:100%"
           :header-cell-style="{ background: '#f8f9fa', color: '#2c3e50', fontWeight: 600, fontSize: '13px' }">
       <el-table-column label="用户商品ID" width="110">
         <template #default="{ row }">{{ row.id }}</template>
@@ -83,14 +83,21 @@
       <el-table-column label="到期时间" width="150">
         <template #default="{ row }">{{ formatExpireTime(row.expireTime) }}</template>
       </el-table-column>
-      <el-table-column label="操作" width="380" fixed="right">
+      <el-table-column label="操作" width="200" fixed="right">
         <template #default="{ row }">
           <el-button v-if="row.itemId && row.itemId !== 0" link type="primary" size="small" @click="goDetail(row)">详情</el-button>
           <el-button v-if="row.itemId && row.itemId !== 0" link type="primary" size="small" @click="handleEdit(row)">编辑</el-button>
           <el-button v-if="!row.itemId || row.itemId === 0" link type="success" size="small" @click="handleBindVm(row)">绑定虚拟机</el-button>
-          <el-button link type="warning" size="small" @click="openRemindList(row)">提醒记录</el-button>
-          <el-button link type="success" size="small" @click="handleSendRemind(row)">发送提醒</el-button>
-          <el-button link type="danger" size="small" @click="handleDelete(row)" :disabled="!row.itemId || row.itemId === 0">删除</el-button>
+          <el-dropdown trigger="click" @command="cmd => handleMoreCmd(cmd, row)" style="margin-left:8px">
+            <el-button link type="primary" size="small" style="transform: translateY(4px);">更多<el-icon style="margin-left:2px;"><ArrowDown /></el-icon></el-button>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item command="remind">提醒记录</el-dropdown-item>
+                <el-dropdown-item command="send">发送提醒</el-dropdown-item>
+                <el-dropdown-item command="delete" divided style="color:#F56C6C">删除商品</el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -589,23 +596,31 @@
         <el-button type="primary" size="small" :icon="Refresh" @click="loadRemindList">刷新</el-button>
       </div>
       <el-table :data="remindList" v-loading="remindLoading" stripe size="small" :max-height="400">
-        <el-table-column prop="id" label="ID" width="70" />
-        <el-table-column prop="user_goods_id" label="用户商品ID" width="110" />
-        <el-table-column prop="user_id" label="用户ID" width="80" />
-        <el-table-column label="提醒类型" width="100">
+        <el-table-column prop="id" label="ID" width="60" />
+        <el-table-column label="用户" width="100">
+          <template #default="{ row }">{{ row.user?.UserName || row.user?.user_name || `#${row.userId ?? row.user_id ?? '-'}` }}</template>
+        </el-table-column>
+        <el-table-column label="提醒类型" width="80">
           <template #default="{ row }">
             <el-tag size="small" :type="row.type === 'manual' ? 'warning' : 'info'">{{ row.type === 'manual' ? '手动' : '自动' }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="发送状态" width="90">
+        <el-table-column label="发送方式" width="80">
           <template #default="{ row }">
-            <el-tag size="small" :type="row.status === 'success' ? 'success' : row.status === 'failed' ? 'danger' : 'info'">{{ row.status || '-' }}</el-tag>
+            <el-tag size="small" :type="row.method === 'sms' ? 'success' : row.method === 'email' ? 'primary' : 'info'">{{ row.method === 'sms' ? '短信' : row.method === 'email' ? '邮件' : (row.method || '-') }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="发送状态" width="80">
+          <template #default="{ row }">
+            <el-tag size="small" :type="row.success ? 'success' : 'danger'">{{ row.success ? '成功' : '失败' }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="发送时间" min-width="160">
-          <template #default="{ row }">{{ row.created_at ? dayjs(row.created_at).format('YYYY-MM-DD HH:mm:ss') : (row.send_time || '-') }}</template>
+          <template #default="{ row }">{{ formatRemindTime(row) }}</template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="120" show-overflow-tooltip>
+          <template #default="{ row }">{{ row.note || '-' }}</template>
         </el-table-column>
-        <el-table-column prop="message" label="内容" min-width="180" show-overflow-tooltip />
       </el-table>
       <div style="display:flex;justify-content:flex-end;margin-top:12px" v-if="remindTotal > remindQuery.count">
         <el-pagination v-model:current-page="remindQuery.page" :page-size="remindQuery.count" :total="remindTotal" layout="total, prev, pager, next" small background @current-change="loadRemindList" />
@@ -862,7 +877,7 @@
 import { ref, reactive, computed, onMounted, nextTick } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { Plus, Refresh, Search } from '@element-plus/icons-vue'
+import { Plus, Refresh, Search, ArrowDown } from '@element-plus/icons-vue'
 import { getUserVmList, getUserVmDetail, createUserVm, updateUserVm, deleteUserVm, getUserGoodsList, createUserGoods, updateUserGoods, deleteUserGoods, bindUserVm, getExpireRemindList, sendExpireRemind } from '@/api/admin/userVm'
 import { getProductParameterList, getProductPlanDetail } from '@/api/admin/product'
 import { hasUnit, getArgKey, getBaseUnit, getParamUnits, getParamDefaultUnit, toBaseUnit, fromBaseUnit } from '@/utils/dynamicUnit'
@@ -944,27 +959,6 @@ const loadList = async () => {
 
 const handleSearch = () => { query.page = 1; loadList() }
 
-// 处理表格行点击事件
-const handleRowClick = async (row) => {
-  if (!row.goodId) {
-    ElMessage.warning('该行没有商品ID')
-    return
-  }
-  
-  try {
-    // 调用用户虚拟机列表API，传递当前行的goodId
-    const res = await getUserVmList({ 
-      page: 1, 
-      count: 10,
-      good_id: row.goodId // 传递当前行的商品ID
-    })
-    if (res.data.code === 200) {
-      console.log('用户虚拟机列表:', res.data.data)
-    }
-  } catch (error) {
-    console.error('获取用户虚拟机列表失败:', error)
-  }
-}
 
 const goDetail = (row) => {
   if (!row.id) return
@@ -1512,13 +1506,23 @@ const getStatusText = (status) => {
   }
 }
 
-// ---- 删除 ----
-const handleDelete = (row) => {
-  if (!row.itemId) { ElMessage.warning('该用户商品未绑定虚拟机，无法删除'); return }
-  ElMessageBox.confirm('确定删除该用户虚拟机吗？此操作会同时删除远程VM和用户商品记录！', '删除确认', { type: 'error' })
+// ---- 更多操作 ----
+const handleMoreCmd = (cmd, row) => {
+  if (cmd === 'remind') openRemindList(row)
+  else if (cmd === 'send') handleSendRemind(row)
+  else if (cmd === 'delete') handleDeleteGoods(row)
+}
+
+// ---- 删除用户商品 ----
+const handleDeleteGoods = (row) => {
+  const hasBoundVm = row.itemId && row.itemId !== 0
+  const msg = hasBoundVm
+    ? `该商品（ID: ${row.id}）已绑定虚拟机（VM ID: ${row.itemId}），删除后虚拟机将不再关联此商品记录，确定删除？`
+    : `确定删除该用户商品（ID: ${row.id}）吗？`
+  ElMessageBox.confirm(msg, '删除确认', { type: 'error', confirmButtonText: '确认删除' })
     .then(async () => {
       try {
-        const res = await deleteUserVm({ user_goods_id: row.id })
+        const res = await deleteUserGoods({ id: row.id })
         if (res?.data?.code === 200) { ElMessage.success('删除成功'); loadList() }
         else ElMessage.error(extractApiError(res?.data, '删除失败'))
       } catch (e) { ElMessage.error(extractApiError(e?.response?.data, '删除失败')) }
@@ -1540,6 +1544,12 @@ const openRemindList = (row) => {
   loadRemindList()
 }
 
+const formatRemindTime = (row) => {
+  const t = row.CreatedAt || row.created_at || row.send_time
+  if (!t || t.startsWith('0001')) return '-'
+  try { return dayjs(t).format('YYYY-MM-DD HH:mm:ss') } catch { return t }
+}
+
 const loadRemindList = async () => {
   remindLoading.value = true
   try {