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" > - - + + {{ maskPhone(row.phone) }} - - - + {{ formatDateTime(row.joined_at) }} - + - - - - - 佣金记录 - - 刷新 - - - - - - - {{ maskPhone(row.merchant_phone) }} - - - - - ¥{{ row.commission_amount }} - - - - - - - {{ formatDateTime(row.created_at) }} - - - - - - - - - - @@ -437,36 +380,36 @@ style="width: 100%" size="small" > - - - - - + + + + + ¥{{ row.amount }} - + {{ getTransferStatusText(row.status) }} - + {{ getTransferTypeText(row.transfer_type) }} - + {{ formatDateTime(row.created_at) }} - + @@ -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) {