From 27c1c02dcfffd7f7b52d73643f5b5b62dd629c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8?= Date: Mon, 15 Jun 2026 16:01:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/capital/rechargeCheck.ts | 5 +++ src/api/modules/capital/withdraw.ts | 6 +++ src/views/capital/fundFlow/options.ts | 15 ++++--- src/views/capital/rechangeCheck/index.vue | 34 ++++++++++++++- src/views/capital/rechangeCheck/options.ts | 8 ++++ src/views/capital/transfer/options.ts | 4 +- src/views/capital/withdrawCheck/index.vue | 50 +++++++++++++++++++--- src/views/capital/withdrawCheck/options.ts | 9 ++++ 8 files changed, 115 insertions(+), 16 deletions(-) diff --git a/src/api/modules/capital/rechargeCheck.ts b/src/api/modules/capital/rechargeCheck.ts index 137cda9..49c2266 100644 --- a/src/api/modules/capital/rechargeCheck.ts +++ b/src/api/modules/capital/rechargeCheck.ts @@ -8,3 +8,8 @@ export const getRechargeCheckListApi = (params: any) => { export const reviewRechargeOrder = (params: any) => { return request.post('/user/reviewRechargeOrder', { ...params }) } + +// 获取充值渠道选项(下拉框用) +export const getRechargeChannelOptions = () => { + return request.get('/user/rechargeChannelOptions', undefined, { showMessage: false }) +} diff --git a/src/api/modules/capital/withdraw.ts b/src/api/modules/capital/withdraw.ts index 4997dc0..c190297 100644 --- a/src/api/modules/capital/withdraw.ts +++ b/src/api/modules/capital/withdraw.ts @@ -1,5 +1,10 @@ import { request } from '@/api' +// 获取取款渠道选项(下拉框用) +export const getWithdrawChannelOptions = () => { + return request.get('/withdraw/withdrawChannelOptions', undefined, { showMessage: false }) +} + // 获取用户钱包信息 export const getWalletCapital = () => { return request.get('/user/getWalletCapital', undefined, { showMessage: false }) @@ -53,6 +58,7 @@ export const getWithdrawReviewList = (params: { start_time?: string end_time?: string user_name?: string + channel_id?: number }) => { return request.get('/withdraw/withdrawReviewList', params as any) } diff --git a/src/views/capital/fundFlow/options.ts b/src/views/capital/fundFlow/options.ts index a2b5aec..6e5bbe0 100644 --- a/src/views/capital/fundFlow/options.ts +++ b/src/views/capital/fundFlow/options.ts @@ -59,22 +59,23 @@ export const tableColumns = [ // 用户名 { prop: 'username', label: '用户名' }, //单号 - { prop: 'orderNo', label: '单号' }, - { prop: 'account_id', label: '子账号' }, + { prop: 'orderNo', label: '单号' , width:'200' }, + { prop: 'account_id', label: '子账号'}, //操作类型 - { prop: 'type', label: '操作类型' }, + { prop: 'type', label: '操作类型', width:'120' }, //资金流向 // { prop: 'fundDirection', label: '资金流向' }, //原有金额 - { prop: 'amount', label: '变动金额', isNumber: true }, + { prop: 'amount', label: '变动金额', isNumber: true , width:'120' }, + { prop: 'description', label: '描述', isNumber: true , width:'120'}, //余额变动 - { prop: 'balance', label: '变动后余额' , isNumber: true}, + { prop: 'balance', label: '变动后余额' , isNumber: true, width:'120' }, //现有余额 // { prop: 'currentBalance', label: '现有余额' }, //状态 // { prop: 'status', label: '状态' }, //创建时间 - { prop: 'createTime', label: '创建时间' }, + { prop: 'createTime', label: '创建时间' , width:'180' }, //钱包类型 - { prop: 'walletType', label: '钱包类型' }, + { prop: 'walletType', label: '钱包类型', width:'120' }, ] \ No newline at end of file diff --git a/src/views/capital/rechangeCheck/index.vue b/src/views/capital/rechangeCheck/index.vue index d6ab041..77c43fa 100644 --- a/src/views/capital/rechangeCheck/index.vue +++ b/src/views/capital/rechangeCheck/index.vue @@ -2,12 +2,18 @@
+ + @@ -58,7 +64,7 @@ import Table from '@/components/common/Table.vue' import { usePageLoading } from '@/composables/useLoading' import RechangePagination from '@/components/common/Pagination.vue' import { exportToExcel } from '@/utils/exportToExcel' -import { getRechargeCheckListApi, reviewRechargeOrder } from '@/api/modules/capital/rechargeCheck' +import { getRechargeCheckListApi, reviewRechargeOrder, getRechargeChannelOptions } from '@/api/modules/capital/rechargeCheck' import { rechangeCheckSearch, rechangeCheckTableColumns } from './options' import { getRecentSevenDays } from '@/utils/handleTime.ts' @@ -77,10 +83,31 @@ interface TableRow { rechangeTime: string } +// 渠道选项数据结构 +interface ChannelOption { + id: number + name: string + channel_code: string +} + +// 渠道下拉选项 +const channelOptions = ref([]) + +// 获取渠道选项 +const getChannelOptions = async () => { + try { + const res = await getRechargeChannelOptions() as unknown as ChannelOption[] + channelOptions.value = res || [] + } catch (error) { + console.error('获取渠道选项失败:', error) + } +} + // 搜索表单结构:与审核接口的查询参数一一对应。 interface SearchFormData { orderNo: string userName: string + channel_id: number | string startTime: string endTime: string } @@ -105,6 +132,7 @@ const initTime = getRecentSevenDays() const createDefaultSearchForm = (): SearchFormData => ({ orderNo: '', userName: '', + channel_id: '', startTime: initTime.start, endTime: initTime.end, }) @@ -135,6 +163,7 @@ const getList = async () => { start_time: searchForm.value.startTime || initTime.start, end_time: searchForm.value.endTime || initTime.end, user_name: searchForm.value.userName || null, + channel_id: searchForm.value.channel_id || null, } try { @@ -169,6 +198,7 @@ const getList = async () => { // 页面初始化时加载一次真实列表。 onMounted(() => { + getChannelOptions() getList() }) diff --git a/src/views/capital/rechangeCheck/options.ts b/src/views/capital/rechangeCheck/options.ts index 77e77d3..22ae6c8 100644 --- a/src/views/capital/rechangeCheck/options.ts +++ b/src/views/capital/rechangeCheck/options.ts @@ -14,6 +14,14 @@ export const rechangeCheckSearch = [ placeholder: '请输入用户名', width: '200px', }, + { + prop: 'channel_id', + label: '渠道', + type: 'select' as const, + placeholder: '请选择渠道', + width: '200px', + slot: true, + }, { prop: 'startTime', label: '开始时间', diff --git a/src/views/capital/transfer/options.ts b/src/views/capital/transfer/options.ts index 6a79483..b68ba7a 100644 --- a/src/views/capital/transfer/options.ts +++ b/src/views/capital/transfer/options.ts @@ -6,7 +6,7 @@ export const internalFormItem = [ // 转出账号 { prop: 'transferOutAccount', label: '转出账号', type: 'select' as const, placeholder: '请选择转出账号', width: '150px', labelPosition: 'top' as const }, // 转入账号 - { prop: 'transferInAccount', label: '转入账号', type: 'input' as const, placeholder: '请输入转入账号', width: '150px', labelPosition: 'top' as const }, + { prop: 'transferInAccount', label: '转入账号', type: 'select' as const, placeholder: '请选择转入账号', width: '150px', labelPosition: 'top' as const }, // 转账金额 { prop: 'transferAmount', label: '转账金额', type: 'input' as const, placeholder: '请输入转账金额', width: '150px', labelPosition: 'top' as const }, // 备注 @@ -15,7 +15,7 @@ export const internalFormItem = [ export const externalFormItem = [ // 转入账号 - { prop: 'transferInAccount', label: '转入账号', type: 'select' as const, placeholder: '请选择转入账号', width: '150px', labelPosition: 'top' as const }, + { prop: 'transferInAccount', label: '转入账号', type: 'input' as const, placeholder: '请输入转入账号', width: '150px', labelPosition: 'top' as const }, // 转账金额 { prop: 'transferAmount', label: '转账金额', type: 'input' as const, placeholder: '请输入转账金额', width: '150px', labelPosition: 'top' as const }, // 备注 diff --git a/src/views/capital/withdrawCheck/index.vue b/src/views/capital/withdrawCheck/index.vue index 948b75d..0d2a5ea 100644 --- a/src/views/capital/withdrawCheck/index.vue +++ b/src/views/capital/withdrawCheck/index.vue @@ -1,7 +1,18 @@