diff --git a/src/components/common/Table.vue b/src/components/common/Table.vue index 877a2b4..64cd54d 100644 --- a/src/components/common/Table.vue +++ b/src/components/common/Table.vue @@ -380,7 +380,7 @@ const handleDragEnd = () => { // 重置为默认配置 const handleReset = () => { - localColumns.value = props.columns.map((col) => ({ + localColumns.value = (props.columns || []).map((col) => ({ ...col, visible: col.visible !== false, fixed: col.fixed || false, diff --git a/src/views/capital/fundFlow/index.vue b/src/views/capital/fundFlow/index.vue index 0b7c18c..57261d3 100644 --- a/src/views/capital/fundFlow/index.vue +++ b/src/views/capital/fundFlow/index.vue @@ -143,6 +143,7 @@ const handleReset = () => { getFundDetailList() } const handleExport = () => { + console.log('tableColumnsOptions.value:', tableColumnsOptions.value); exportToExcel({ tableData: tableTree.value, columns: tableColumnsOptions.value, diff --git a/src/views/capital/fundFlow/options.ts b/src/views/capital/fundFlow/options.ts index 6e5bbe0..5524e9c 100644 --- a/src/views/capital/fundFlow/options.ts +++ b/src/views/capital/fundFlow/options.ts @@ -57,25 +57,25 @@ export const search = [ ] export const tableColumns = [ // 用户名 - { prop: 'username', label: '用户名' }, + { prop: 'username', label: '用户名', visible: true }, //单号 - { prop: 'orderNo', label: '单号' , width:'200' }, - { prop: 'account_id', label: '子账号'}, + { prop: 'orderNo', label: '单号' , width:'200', visible: true }, + { prop: 'account_id', label: '子账号', visible: true }, //操作类型 - { prop: 'type', label: '操作类型', width:'120' }, + { prop: 'type', label: '操作类型', width:'120', visible: true }, //资金流向 // { prop: 'fundDirection', label: '资金流向' }, //原有金额 - { prop: 'amount', label: '变动金额', isNumber: true , width:'120' }, - { prop: 'description', label: '描述', isNumber: true , width:'120'}, + { prop: 'amount', label: '变动金额', isNumber: true , width:'120', visible: true }, + { prop: 'description', label: '描述', isNumber: true , width:'120', visible: true }, //余额变动 - { prop: 'balance', label: '变动后余额' , isNumber: true, width:'120' }, + { prop: 'balance', label: '变动后余额' , isNumber: true, width:'120', visible: true }, //现有余额 // { prop: 'currentBalance', label: '现有余额' }, //状态 // { prop: 'status', label: '状态' }, //创建时间 - { prop: 'createTime', label: '创建时间' , width:'180' }, + { prop: 'createTime', label: '创建时间' , width:'180' , visible: true }, //钱包类型 - { prop: 'walletType', label: '钱包类型', width:'120' }, + { prop: 'walletType', label: '钱包类型', width:'120', visible: true }, ] \ No newline at end of file diff --git a/src/views/capital/rechange/options.ts b/src/views/capital/rechange/options.ts index ee6da03..99f1d2b 100644 --- a/src/views/capital/rechange/options.ts +++ b/src/views/capital/rechange/options.ts @@ -1,11 +1,11 @@ // 存款列表表格列配置 export const rechangeTableColumns = [ - { prop: 'name', label: '渠道名称', align: 'center' as const }, + { prop: 'name', label: '渠道名称', align: 'center' as const , visible: true }, { prop: 'symbol', label: '支持货币', - align: 'center' as const + align: 'center' as const, visible: true }, - { prop: 'channel_fee', label: '渠道费用', align: 'center' as const }, - { label: '操作', slotName: 'action', align: 'center' as const, width: 120 }, + { prop: 'channel_fee', label: '渠道费用', align: 'center' as const, visible: true }, + { label: '操作', slotName: 'action', align: 'center' as const, width: 120 , visible: true }, ] diff --git a/src/views/capital/rechangeChanl/options.ts b/src/views/capital/rechangeChanl/options.ts index 42cd584..b882a28 100644 --- a/src/views/capital/rechangeChanl/options.ts +++ b/src/views/capital/rechangeChanl/options.ts @@ -19,6 +19,7 @@ export const formItemsData = [ { label: '渠道费用', prop: 'channel_fee', + type: 'number', min: 0, max: 999999, controls: false, diff --git a/src/views/capital/withdrawCheck/options.ts b/src/views/capital/withdrawCheck/options.ts index b147bc4..51ddc5d 100644 --- a/src/views/capital/withdrawCheck/options.ts +++ b/src/views/capital/withdrawCheck/options.ts @@ -42,7 +42,7 @@ export const withdrawCheckTableColumns = [ { prop: 'rate', label: '汇率', align: 'center' as const, width: 100 }, { prop: 'channel_name', label: '渠道', align: 'center' as const, width: 140 }, { prop: 'withdraw_service_fee', label: '服务费', align: 'center' as const, width: 100, isNumber: true }, - { prop: 'withdraw_head_fee', label: '总部手续费', align: 'center' as const, width: 120, isNumber: true }, + { prop: 'withdraw_head_fee', label: '头寸', align: 'center' as const, width: 120, isNumber: true }, { prop: 'withdraw_fee_handle', label: '代理手续费', align: 'center' as const, width: 120, isNumber: true }, { prop: 'withdraw_point_diff', label: '点差', align: 'center' as const, width: 100, isNumber: true }, { prop: 'withdraw_risk_fee', label: '风控费', align: 'center' as const, isNumber: true , width: 180}, diff --git a/src/views/order/withdraw/options.ts b/src/views/order/withdraw/options.ts index 9053b00..62b41e2 100644 --- a/src/views/order/withdraw/options.ts +++ b/src/views/order/withdraw/options.ts @@ -41,7 +41,7 @@ export const tableColumns = [ { prop: 'real_amount', label: '到账金额', align: 'center' as const, width: 120, isNumber: true }, { prop: 'channel_name', label: '渠道', align: 'center' as const, width: 140 }, { prop: 'withdraw_service_fee', label: '服务费', align: 'center' as const, width: 100, isNumber: true }, - { prop: 'withdraw_head_fee', label: '总部手续费', align: 'center' as const, width: 120, isNumber: true }, + { prop: 'withdraw_head_fee', label: '头寸', align: 'center' as const, width: 120, isNumber: true }, { prop: 'withdraw_fee_handle', label: '代理手续费', align: 'center' as const, width: 120, isNumber: true }, { prop: 'withdraw_point_diff', label: '点差', align: 'center' as const, width: 100, isNumber: true }, { prop: 'withdraw_risk_fee', label: '风控费', width: 140, align: 'center' as const, isNumber: true }, diff --git a/src/views/profile/business/index.vue b/src/views/profile/business/index.vue index dc2133a..4f9f135 100644 --- a/src/views/profile/business/index.vue +++ b/src/views/profile/business/index.vue @@ -74,16 +74,12 @@ - diff --git a/src/views/trade/exe/index.vue b/src/views/trade/exe/index.vue index 4fae6fd..d46d58f 100644 --- a/src/views/trade/exe/index.vue +++ b/src/views/trade/exe/index.vue @@ -1,117 +1,185 @@ - - - - - - - PC端 - - - - - - 系统要求:适用于windows 2008/7/8/10操作系统,网络速度为56kbps或更高 - - - - - - - - - - Android APK - - - - - - 下载说明:下载后可以通过手机安装APK - - - - - - - - - - IOS - - - - - - 下载说明:iPhone和iPad用户可以通过 Apple App Store搜索InTrade安装 - - + + + + + + + + + PC客户端 + Windows电脑专用安装包 + + + + 系统要求:Windows 2008/7/8/10,网络56kbps及以上 + + + + 立即下载 + + + + + + + + + + + + + Android APK + 安卓手机安装包 + + + + 下载后传输至手机即可安装 + + + + 下载APK + + + + + + + + + + + + + + iOS客户端 + iPhone / iPad 专用 + + + + 前往App Store搜索 InTrade 安装 + + + + 前往商店 + + + + + \ No newline at end of file diff --git a/src/views/trade/variety/index.vue b/src/views/trade/variety/index.vue index 07c8546..6b1a076 100644 --- a/src/views/trade/variety/index.vue +++ b/src/views/trade/variety/index.vue @@ -3,6 +3,11 @@ + + + + + 编辑 @@ -98,6 +103,7 @@ import { uploadImageApi } from '@/api/modules/upload' */ const searchForm = ref({ varietyName: '', + type:'' }) const searchOptions = ref(search) @@ -228,6 +234,7 @@ const getVarietyList = async () => { startLoading() const params = { name: searchForm.value.varietyName, + type: searchForm.value.type, } try { const data = await getVarietyListApi(params) @@ -284,6 +291,7 @@ const handleSearch = async () => { const handleReset = () => { searchForm.value = { varietyName: '', + type:'' } handleSearch() } diff --git a/src/views/trade/variety/options.ts b/src/views/trade/variety/options.ts index d9cfa06..cfbfbed 100644 --- a/src/views/trade/variety/options.ts +++ b/src/views/trade/variety/options.ts @@ -4,6 +4,7 @@ export const search = [ // 品种名称 { prop: 'varietyName', label: '品种名称', type: 'input' as const, placeholder: '请输入品种名称' }, + { prop: 'type', label: '类型', type: 'select' as const, placeholder: '请选择类型', slot: true, }, ] /**
Windows电脑专用安装包
安卓手机安装包
iPhone / iPad 专用