diff --git a/src/api/modules/dashboard.ts b/src/api/modules/dashboard.ts new file mode 100644 index 0000000..b0b652e --- /dev/null +++ b/src/api/modules/dashboard.ts @@ -0,0 +1,12 @@ +import { request } from '@/api' + + +// 获取账户列表 +export async function getAllAccount(params: any): Promise { + return await request.get('/user/getAllAccount', params) +} +// 获取用户钱包资金 +export async function getWalletCapital(): Promise { + return await request.get('/user/getWalletCapital') +} + diff --git a/src/views/dashboard/components/view/index.vue b/src/views/dashboard/components/view/index.vue index d51dd56..c03a2c4 100644 --- a/src/views/dashboard/components/view/index.vue +++ b/src/views/dashboard/components/view/index.vue @@ -1,178 +1,212 @@ diff --git a/src/views/trade/variety/index.vue b/src/views/trade/variety/index.vue index f7d4a38..d1d51f5 100644 --- a/src/views/trade/variety/index.vue +++ b/src/views/trade/variety/index.vue @@ -1,57 +1,84 @@ diff --git a/src/views/trade/variety/options.ts b/src/views/trade/variety/options.ts index 5320bc1..f09f7fa 100644 --- a/src/views/trade/variety/options.ts +++ b/src/views/trade/variety/options.ts @@ -51,7 +51,7 @@ export const DialogFormItem = [ // 编号 { prop: 'varietyCode', label: '编号', type: 'input' as const, placeholder: '请输入编号' }, // 交易分组 - { prop: 'tradeGroup', label: '交易分组', type: 'select' as const, placeholder: '请选择交易分组' }, + { prop: 'group_id', label: '交易分组', type: 'select' as const, placeholder: '请选择交易分组' }, // 最大点差 { prop: 'maxPoint', label: '最大点差', type: 'input' as const, placeholder: '请输入最大点差' }, // 最小点差 @@ -110,7 +110,9 @@ export const DialogFormItem = [ { prop: 'type', label: '类型', type: 'select' as const, placeholder: '请选择类型' }, // 库存费收取时间 { - prop: 'feeInventoryTime', label: '库存费收取时间', type: 'time' as const, + prop: 'feeInventoryTime', + label: '库存费收取时间', + type: 'time' as const, valueFormat: 'HH:mm:ss', isRange: false, }, diff --git a/src/views/trade/variety/rules.ts b/src/views/trade/variety/rules.ts index d0b2db0..9335d33 100644 --- a/src/views/trade/variety/rules.ts +++ b/src/views/trade/variety/rules.ts @@ -38,89 +38,78 @@ const validateMaxFiveDecimals = (fieldName: string) => { export const rules = (): FormRules => { return { // 名称 - varietyName: [ - { required: true, message: '请输入名称', trigger: ['blur', 'change'] } - ], + varietyName: [{ required: true, message: '请输入名称', trigger: ['blur', 'change'] }], // 编号 - varietyCode: [ - { required: true, message: '请输入编号', trigger: ['blur', 'change'] } - ], + varietyCode: [{ required: true, message: '请输入编号', trigger: ['blur', 'change'] }], // 所属交易时间 - tradeTime: [ - { required: true, message: '请选择交易时间', trigger: ['blur', 'change'] } - ], + tradeTime: [{ required: true, message: '请选择交易时间', trigger: ['blur', 'change'] }], // 最大点差 maxPoint: [ { required: true, message: '请输入最大点差', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('最大点差'), trigger: ['blur', 'change'] } + { validator: validateMaxFiveDecimals('最大点差'), trigger: ['blur', 'change'] }, ], // 最小点差 minPoint: [ { required: true, message: '请输入最小点差', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('最小点差')} + { validator: validateMaxFiveDecimals('最小点差') }, ], // 合约大小 contractSize: [ { required: true, message: '请输入合约大小', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('合约大小')} + { validator: validateMaxFiveDecimals('合约大小') }, ], // 多头库存费 longStockFee: [ { required: true, message: '请输入多头库存费', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('多头库存费')} + { validator: validateMaxFiveDecimals('多头库存费') }, ], // 空头库存费 shortStockFee: [ { required: true, message: '请输入空头库存费', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('空头库存费')} + { validator: validateMaxFiveDecimals('空头库存费') }, ], // 预付款对冲 prepaymentHedge: [ { required: true, message: '请输入预付款对冲', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('预付款对冲')} + { validator: validateMaxFiveDecimals('预付款对冲') }, ], // 预付款百分比 prepaymentPercent: [ { required: true, message: '请输入预付款百分比', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('预付款百分比')} + { validator: validateMaxFiveDecimals('预付款百分比') }, ], // 小数位 decimalPlaces: [ { required: true, message: '请输入小数位', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('小数位')} + { validator: validateMaxFiveDecimals('小数位') }, ], // 点差小数位 pointDecimalPlaces: [ { required: true, message: '请输入点差小数位', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('点差小数位')} + { validator: validateMaxFiveDecimals('点差小数位') }, ], // 止盈水平 profitLevel: [ { required: true, message: '请输入止盈水平', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('止盈水平')} + { validator: validateMaxFiveDecimals('止盈水平') }, ], // 单位 - unit: [ - { required: true, message: '请输入单位', trigger: ['blur', 'change'] } - ], + unit: [{ required: true, message: '请输入单位', trigger: ['blur', 'change'] }], // 最小波动 minFlux: [ { required: true, message: '请输入最小波动', trigger: ['blur', 'change'] }, - { validator: validateMaxFiveDecimals('最小波动')} + { validator: validateMaxFiveDecimals('最小波动') }, ], // 类型 - type: [ - { required: true, message: '请选择类型', trigger: ['blur', 'change'] } - ], + type: [{ required: true, message: '请选择类型', trigger: ['blur', 'change'] }], // 上传图片 - imageUrl: [ - { required: true, message: '请上传图片', trigger: ['blur', 'change'] } - ], + imageUrl: [{ required: true, message: '请上传图片', trigger: ['blur', 'change'] }], // 库存费收取时间 feeInventoryTime: [ - { required: true, message: '请选择库存费收取时间', trigger: ['blur', 'change'] } + { required: true, message: '请选择库存费收取时间', trigger: ['blur', 'change'] }, ], + group_id: [{ required: true, message: '请选择交易分组', trigger: ['blur', 'change'] }], } } \ No newline at end of file