From 737ade3a5ea291bebf37c0fd5155f1fe548af128 Mon Sep 17 00:00:00 2001 From: luo Date: Fri, 14 Aug 2026 17:22:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20router,=20=E4=BD=A3=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/langs/en.json | 8 +++ src/locales/langs/zh.json | 6 +-- src/router/routes/asyncRoutes.ts | 22 ++++----- src/router/routesAlias.ts | 2 +- .../my-commission/index.vue | 34 ++++++++++--- .../withdrawal-approval/index.vue | 49 +++++++++---------- 6 files changed, 73 insertions(+), 48 deletions(-) diff --git a/src/locales/langs/en.json b/src/locales/langs/en.json index 690335a..7351ec7 100644 --- a/src/locales/langs/en.json +++ b/src/locales/langs/en.json @@ -406,6 +406,14 @@ "orderList": "Order List", "orderDetail": "Order Details" }, + "financialManagement": { + "title": "Financial Management", + "agentRecharge": "Agent Recharge", + "agentRechargeDetail": "Agent Recharge Details", + "refundManagement": "Refund Management", + "refundDetail": "Refund Details", + "agentFundOverview": "Agent Fund Overview" + }, "deviceManagement": { "title": "Device Management", "devices": "Device Management" diff --git a/src/locales/langs/zh.json b/src/locales/langs/zh.json index 027e619..70740b1 100644 --- a/src/locales/langs/zh.json +++ b/src/locales/langs/zh.json @@ -408,13 +408,13 @@ "agentRecharge": "代理充值", "agentRechargeDetail": "代理充值详情", "refundManagement": "退款管理", - "refundDetail": "退款详情" + "refundDetail": "退款详情", + "agentFundOverview": "代理商资金概况" }, "commission": { "title": "佣金管理", "withdrawal": "提现审批", - "myCommission": "我的佣金", - "agentCommission": "代理商资金概况" + "myCommission": "我的佣金" }, "settings": { "title": "设置管理", diff --git a/src/router/routes/asyncRoutes.ts b/src/router/routes/asyncRoutes.ts index cf8ff3b..b945d97 100644 --- a/src/router/routes/asyncRoutes.ts +++ b/src/router/routes/asyncRoutes.ts @@ -689,6 +689,17 @@ export const asyncRoutes: AppRouteRecord[] = [ isHide: true, keepAlive: false } + }, + // 代理商资金概况 + { + path: 'agent-fund-overview', + name: 'AgentFundOverview', + component: RoutesAlias.AgentFundOverviewComponent, + meta: { + title: 'menus.financialManagement.agentFundOverview', + keepAlive: true, + roles: ['R_SUPER', 'R_ADMIN'] + } } ] }, @@ -790,17 +801,6 @@ export const asyncRoutes: AppRouteRecord[] = [ keepAlive: true, roles: ['R_AGENT'] } - }, - // 代理商资金概况 - { - path: 'agent-fund-overview', - name: 'AgentFundOverview', - component: RoutesAlias.AgentFundOverviewComponent, - meta: { - title: 'menus.commission.agentCommission', - keepAlive: true, - roles: ['R_SUPER', 'R_ADMIN'] - } } ] }, diff --git a/src/router/routesAlias.ts b/src/router/routesAlias.ts index 22ade5f..13f918b 100644 --- a/src/router/routesAlias.ts +++ b/src/router/routesAlias.ts @@ -89,13 +89,13 @@ export enum RoutesAlias { AgentRechargeDetail = '/finance/agent-recharge/detail', // 代理充值详情 RefundManagement = '/finance/refund', // 退款管理 RefundDetail = '/finance/refund/detail', // 退款详情 + AgentFundOverview = '/finance/agent-fund-overview', // 代理商资金概况 ExpiringAssets = '/asset-management/expiring-assets', // 临期资产 // 佣金管理 WithdrawalApproval = '/commission-management/withdrawal-approval', // 提现审批 MyCommission = '/commission-management/my-commission', // 我的佣金 - AgentFundOverview = '/commission/agent-fund-overview', // 代理商资金概况 AgentFundOverviewComponent = '/commission-management/agent-fund-overview', // 代理商资金概况组件路径 // 设置管理 diff --git a/src/views/commission-management/my-commission/index.vue b/src/views/commission-management/my-commission/index.vue index 1e066e7..406d42b 100644 --- a/src/views/commission-management/my-commission/index.vue +++ b/src/views/commission-management/my-commission/index.vue @@ -28,6 +28,9 @@ v-permission="'my_commission:add'" >发起提现 + + 可提现金额：{{ formatMoney(summary.available_commission) }} + @@ -400,21 +403,25 @@ { prop: 'iccid', label: 'ICCID', + width: 160, formatter: (row: ShopCommissionRecordItem) => row.iccid || '-' }, { prop: 'virtual_no', label: '虚拟号', + width: 160, formatter: (row: ShopCommissionRecordItem) => row.virtual_no || '-' }, { prop: 'order_no', label: '订单号', + width: 220, formatter: (row: ShopCommissionRecordItem) => row.order_no || '-' }, { prop: 'seller_shop_name', label: '卖家店铺', + width: 120, formatter: (row: ShopCommissionRecordItem) => row.seller_shop_name || '-' }, { @@ -557,7 +564,6 @@ // 列配置 const withdrawalColumnOptions = [ - { label: 'ID', prop: 'id' }, { label: '提现单号', prop: 'withdrawal_no' }, { label: '金额', prop: 'amount' }, { label: '手续费', prop: 'fee' }, @@ -574,11 +580,6 @@ // 动态列配置 const { columnChecks: withdrawalColumnChecks, columns: withdrawalColumns } = useCheckedColumns( () => [ - { - prop: 'id', - label: 'ID', - width: 80 - }, { prop: 'withdrawal_no', label: '提现单号', @@ -899,3 +900,24 @@ getCommissionList() }) + + diff --git a/src/views/commission-management/withdrawal-approval/index.vue b/src/views/commission-management/withdrawal-approval/index.vue index 2898c8c..7a5ce4a 100644 --- a/src/views/commission-management/withdrawal-approval/index.vue +++ b/src/views/commission-management/withdrawal-approval/index.vue @@ -29,6 +29,9 @@ :pageSize="pagination.pageSize" :total="pagination.total" :marginTop="10" + :actions="getActions" + :inlineActionsCount="1" + :actionsWidth="160" @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -83,7 +86,6 @@ } from '@/types/api/commission' import type { SearchFormItem } from '@/types' import { useCheckedColumns } from '@/composables/useCheckedColumns' - import ArtButtonTable from '@/components/core/forms/ArtButtonTable.vue' import { formatDateTime, formatMoney } from '@/utils/business/format' import { WithdrawalStatusMap, WithdrawalMethodMap } from '@/config/constants' import { useI18n } from 'vue-i18n' @@ -192,8 +194,7 @@ { label: '提现方式', prop: 'withdrawal_method' }, { label: '状态', prop: 'status' }, { label: '申请时间', prop: 'created_at' }, - { label: '审批时间', prop: 'processed_at' }, - { label: '操作', prop: 'operation' } + { label: '审批时间', prop: 'processed_at' } ] const rejectFormRef = ref() @@ -277,30 +278,6 @@ label: '审批时间', width: 180, formatter: (row: WithdrawalRequestItem) => formatDateTime(row.processed_at) - }, - { - prop: 'operation', - label: '操作', - width: 150, - fixed: 'right', - formatter: (row: WithdrawalRequestItem) => { - // 只有待审核状态才显示操作按钮 - if (row.status === 1) { - return h('div', { style: 'display: flex; gap: 8px;' }, [ - h(ArtButtonTable, { - text: '审批通过', - iconColor: '#67C23A', - onClick: () => handleApprove(row) - }), - h(ArtButtonTable, { - text: '拒绝', - iconColor: '#F56C6C', - onClick: () => showRejectDialog(row) - }) - ]) - } - return '-' - } } ]) @@ -443,6 +420,24 @@ } }) } + + // 获取操作按钮，使用 ArtTable 统一的文字操作样式 + const getActions = (row: WithdrawalRequestItem) => { + if (row.status !== 1) return [] + + return [ + { + label: '审批通过', + handler: () => handleApprove(row), + type: 'primary' as const + }, + { + label: '拒绝', + handler: () => showRejectDialog(row), + type: 'danger' as const + } + ] + }