diff --git a/src/views/capital/fundFlow/index.vue b/src/views/capital/fundFlow/index.vue index a5a4505..6171d55 100644 --- a/src/views/capital/fundFlow/index.vue +++ b/src/views/capital/fundFlow/index.vue @@ -42,6 +42,7 @@ const searchForm = ref({ username: '', subAccountId: '', type: '', + orderNo: '', startTime: initTime.start, endTime: initTime.end, }) @@ -92,6 +93,7 @@ const getFundDetailList = async () => { : '2026-03-15 23:59:59', user_name: searchForm.value.username, account_id: searchForm.value.subAccountId, + trade_id: searchForm.value.orderNo, type: searchForm.value.type || '', } // 调用接口获取数据 @@ -137,6 +139,7 @@ const handleReset = () => { username: '', subAccountId: '', type: '', + orderNo: '', startTime: initTime.start, endTime: initTime.end, } diff --git a/src/views/capital/fundFlow/options.ts b/src/views/capital/fundFlow/options.ts index bbb55f1..731150e 100644 --- a/src/views/capital/fundFlow/options.ts +++ b/src/views/capital/fundFlow/options.ts @@ -3,7 +3,7 @@ */ export const search = [ //单号 - // { prop: 'orderNo', label: '单号', type: 'input' as const, placeholder: '请输入流水单号', width: '140px' }, + { prop: 'orderNo', label: '单号', type: 'input' as const, placeholder: '请输入流水单号', width: '140px' }, //用户名 { prop: 'username', diff --git a/src/views/dashboard/components/marketMaker/index.vue b/src/views/dashboard/components/marketMaker/index.vue index 1fecfcd..649b29e 100644 --- a/src/views/dashboard/components/marketMaker/index.vue +++ b/src/views/dashboard/components/marketMaker/index.vue @@ -198,11 +198,11 @@ const fetchWalletData = async () => { if (res) { cardData.value = [ { label: '总金额', value: res.amount ?? 0, icon: markRaw(Money) }, - { label: '盈利', value: res.closing_profit ?? 0, icon: markRaw(Trophy) }, - { label: '手续费佣金', value: res.commission_fee_handling ?? 0, icon: markRaw(Coin) }, - { label: '可提现点差佣金', value: ((res.commission_point_diff || 0) - (res.freeze || 0)) , icon: markRaw(Wallet) }, + // { label: '盈利', value: res.closing_profit ?? 0, icon: markRaw(Trophy) }, + // { label: '手续费佣金', value: res.commission_fee_handling ?? 0, icon: markRaw(Coin) }, + // { label: '可提现点差佣金', value: ((res.commission_point_diff || 0) - (res.freeze || 0)) , icon: markRaw(Wallet) }, { label: '冻结点差佣金', value: res.freeze ?? 0, icon: markRaw(Lock) }, - { label: '服务费', value: res.service ?? 0, icon: markRaw(DataAnalysis) }, + // { label: '服务费', value: res.service ?? 0, icon: markRaw(DataAnalysis) }, { label: '保证金', value: res.bail ?? 0, icon: markRaw(TrendCharts) } ] } diff --git a/src/views/dashboard/components/view/index.vue b/src/views/dashboard/components/view/index.vue index 89abf5a..c05776b 100644 --- a/src/views/dashboard/components/view/index.vue +++ b/src/views/dashboard/components/view/index.vue @@ -142,9 +142,9 @@ - + -
+

个人账户 diff --git a/src/views/profile/business/index.vue b/src/views/profile/business/index.vue index 4e5dcdb..9f7bce3 100644 --- a/src/views/profile/business/index.vue +++ b/src/views/profile/business/index.vue @@ -42,6 +42,9 @@ + @@ -406,6 +409,25 @@ const getMarketFloatProfit = (accountId: string | number): string => { return parts[0] + '.' + (parts[1] + '00').slice(0, 2) } +/** + * @description 获取风险率样式 + * @param ratio 风险率字符串,如 "100%" 或 "--" + * @returns 颜色样式对象 + */ +const getRatioStyle = (ratio: string | number | undefined | null) => { + // 空值或 '--' 不着色 + if (ratio === undefined || ratio === null || ratio === '' || ratio === '--') { + return { color: '' } + } + // 去除百分号并转为数字 + const num = Number(String(ratio).replace('%', '')) + if (isNaN(num)) return { color: '' } + // 小于等于 20 红色,20-30 之间黄色,大于 30 绿色 + if (num <= 20) return { color: '#f56c6c' } + if (num > 20 && num <= 30) return { color: '#e6a23c' } + return { color: '#67c23a' } +} + /** * @description 获取做市商的平仓盈亏值 */ diff --git a/src/views/profile/business/options.ts b/src/views/profile/business/options.ts index 3ceb96f..28a4f65 100644 --- a/src/views/profile/business/options.ts +++ b/src/views/profile/business/options.ts @@ -21,11 +21,11 @@ export const marketTableColumns = [ { label: '级别', prop: 'level', align: 'center' as const, width: '120px' }, { label: '邮箱', prop: 'email', align: 'center' as const, width: '160px' }, { label: '手机号', prop: 'mobile', align: 'center' as const, width: '180' }, - { label: '风险率', prop: 'ratio', align: 'center' as const, width: '120px' }, + { label: '风险率', prop: 'ratio', align: 'center' as const, width: '120px', slotName: 'ratio' }, { label: '接单状态', prop: 'market_status', align: 'center' as const, width: '120px' }, //基本账户 { label: '基本账户', prop: 'basicAccount', align: 'center' as const, isNumber: true , width: '200px' }, - // { label: '冻结点差', prop: 'freeze', align: 'center' as const, isNumber: true , width: '200px' }, + { label: '冻结点差', prop: 'freeze', align: 'center' as const, isNumber: true , width: '200px' }, //保证金 { label: '保证金', prop: 'margin', align: 'center' as const, width: '200px', isNumber: true }, //停止接单保证金