From 78968f9eb650812e62bdfce006d4b45059f01102 Mon Sep 17 00:00:00 2001
From: dzl <786316265@qq.com>
Date: Tue, 16 Sep 2025 15:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Agents.vue | 109 ++++++-------------------------------------
 1 file changed, 15 insertions(+), 94 deletions(-)

diff --git a/src/views/Agents.vue b/src/views/Agents.vue
index cc0ae13..758e02e 100644
--- a/src/views/Agents.vue
+++ b/src/views/Agents.vue
@@ -303,20 +303,18 @@
                 style="width: 100%"
                 size="small"
               >
-                <el-table-column prop="real_name" label="真实姓名" width="120" />
-                <el-table-column prop="phone" label="手机号" width="130">
+                <el-table-column prop="real_name" label="真实姓名" />
+                <el-table-column prop="phone" label="手机号">
                   <template #default="{ row }">
                     {{ maskPhone(row.phone) }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="match_count" label="匹配次数" width="100" />
-                <el-table-column prop="completed_matches" label="完成次数" width="100" />
-                <el-table-column prop="joined_at" label="加入时间" width="160">
+                <el-table-column prop="joined_at" label="加入时间">
                   <template #default="{ row }">
                     {{ formatDateTime(row.joined_at) }}
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="120">
+                <el-table-column label="操作">
                   <template #default="{ row }">
                     <el-button 
                       type="text" 
@@ -344,61 +342,6 @@
             </div>
           </el-tab-pane>
           
-          <!-- 佣金详情标签页 -->
-          <el-tab-pane label="佣金详情" name="commissions">
-            <div class="commissions-section">
-              <div class="section-header">
-                <h4>佣金记录</h4>
-                <el-button 
-                  type="primary" 
-                  size="small" 
-                  @click="loadCommissions"
-                  :loading="commissionsLoading"
-                >
-                  刷新
-                </el-button>
-              </div>
-              
-              <el-table 
-                :data="commissions" 
-                v-loading="commissionsLoading"
-                style="width: 100%"
-                size="small"
-              >
-                <el-table-column prop="merchant_phone" label="商户手机" width="130">
-                  <template #default="{ row }">
-                    {{ maskPhone(row.merchant_phone) }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="commission_amount" label="佣金金额" width="100">
-                  <template #default="{ row }">
-                    ¥{{ row.commission_amount }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="commission_type" label="佣金类型" width="100" />
-                <el-table-column prop="description" label="描述" min-width="150" />
-                <el-table-column prop="created_at" label="获得时间" width="160">
-                  <template #default="{ row }">
-                    {{ formatDateTime(row.created_at) }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              
-              <div class="pagination-wrapper" v-if="commissionsPagination.total > 0">
-                <el-pagination
-                  v-model:current-page="commissionsPagination.page"
-                  v-model:page-size="commissionsPagination.limit"
-                  :total="commissionsPagination.total"
-                  :page-sizes="[10, 20, 50]"
-                  layout="total, sizes, prev, pager, next"
-                  @current-change="loadCommissions"
-                  @size-change="loadCommissions"
-                  size="small"
-                />
-              </div>
-            </div>
-          </el-tab-pane>
-          
           <!-- 转账记录标签页 -->
           <el-tab-pane label="转账记录" name="transfers">
             <div class="transfers-section">
@@ -437,36 +380,36 @@
                 style="width: 100%"
                 size="small"
               >
-                <el-table-column prop="id" label="转账ID" width="80" />
-                <el-table-column prop="from_real_name" label="发送方" width="100" />
-                <el-table-column prop="from_phone_masked" label="发送方手机" width="120" />
-                <el-table-column prop="to_real_name" label="接收方" width="100" />
-                <el-table-column prop="to_phone_masked" label="接收方手机" width="120" />
+                <el-table-column prop="id" label="转账ID" />
+                <el-table-column prop="from_real_name" label="发送方" />
+                <el-table-column prop="from_phone_masked" label="发送方手机" />
+                <el-table-column prop="to_real_name" label="接收方" />
+                <el-table-column prop="to_phone_masked" label="接收方手机" />
                 <el-table-column prop="amount" label="金额" width="100">
                   <template #default="{ row }">
                     ¥{{ row.amount }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="status" label="状态" width="80">
+                <el-table-column prop="status" label="状态">
                   <template #default="{ row }">
                     <el-tag :type="getTransferStatusType(row.status)" size="small">
                       {{ getTransferStatusText(row.status) }}
                     </el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column prop="transfer_type" label="类型" width="100">
+                <el-table-column prop="transfer_type" label="类型">
                   <template #default="{ row }">
                     <el-tag :type="getTransferTypeType(row.transfer_type)" size="small">
                       {{ getTransferTypeText(row.transfer_type) }}
                     </el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column prop="created_at" label="创建时间" width="160">
+                <el-table-column prop="created_at" label="创建时间">
                   <template #default="{ row }">
                     {{ formatDateTime(row.created_at) }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="description" label="描述" min-width="150" />
+                <el-table-column prop="description" label="描述" min-width="75" />
               </el-table>
               
               <div class="pagination-wrapper" v-if="transfersPagination.total > 0">
@@ -813,7 +756,6 @@ const viewAgentDetail = async (agent) => {
     
     // 加载基础数据
     loadMerchants()
-    loadCommissions()
   } catch (error) {
     ElMessage.error('加载代理详情失败')
   }
@@ -973,7 +915,7 @@ const loadMerchants = async () => {
       limit: merchantsPagination.limit
     }
     
-    const { data } = await api.get(`/admin/agents/${selectedAgent.value.id}/merchants`, { params })
+    const { data } = await api.get(`/admin/agents/${selectedAgent.value.user_id}/merchants`, { params })
     merchants.value = data.data.merchants
     merchantsPagination.total = data.data.total
   } catch (error) {
@@ -983,27 +925,6 @@ const loadMerchants = async () => {
   }
 }
 
-// 加载佣金记录
-const loadCommissions = async () => {
-  if (!selectedAgent.value) return
-  
-  commissionsLoading.value = true
-  try {
-    const params = {
-      page: commissionsPagination.page,
-      limit: commissionsPagination.limit
-    }
-    
-    const { data } = await api.get(`/admin/agents/${selectedAgent.value.id}/commissions`, { params })
-    commissions.value = data.data.commissions
-    commissionsPagination.total = data.data.total
-  } catch (error) {
-    ElMessage.error('加载佣金记录失败')
-  } finally {
-    commissionsLoading.value = false
-  }
-}
-
 // 加载转账记录
 const loadTransfers = async () => {
   if (!selectedAgent.value) return
@@ -1019,7 +940,7 @@ const loadTransfers = async () => {
       params.merchant_id = selectedMerchantId.value
     }
     
-    const { data } = await api.get(`/admin/agents/${selectedAgent.value.id}/merchant-transfers`, { params })
+    const { data } = await api.get(`/admin/agents/${selectedAgent.value.user_id}/merchant-transfers`, { params })
     transfers.value = data.data.transfers
     transfersPagination.total = data.data.total
   } catch (error) {