diff --git a/t.rar b/g.rar similarity index 92% rename from t.rar rename to g.rar index 89370c6..0eda9f1 100644 Binary files a/t.rar and b/g.rar differ diff --git a/src/views/admin/line-pre-order/index.vue b/src/views/admin/line-pre-order/index.vue index 02cf38c..2bc1440 100644 --- a/src/views/admin/line-pre-order/index.vue +++ b/src/views/admin/line-pre-order/index.vue @@ -504,32 +504,33 @@ - - - - - - - - - 现货 - 合约 - - - - - - - - - - - - 全选 - - - - - - - - - - - - -
- + + -
-
-
- - - 买(多) - 卖(空) - - - - - - - - 百分比 - 主单实价委托百分比 - aiCoin买入点 - - - - - - - - - - - - - - - - - - - - 计算 - - - - - - - - - - - 限价 - 市价 - - - - - - - 最新价 - 标记价 - aicoin - - - - - - - - - - - - - 脚本执行 - 直接执行 - - - - - - - - - - - - - - - - - - - 新增 - 计算 - -
- - -
加仓类型
- - 限价 - 市价 - -
- -
加仓方式
- - 百分比 - 实际金额 - -
- 加仓下跌百分比 - 加仓数值 - 加仓后止盈价百分比 - - + + + 最新价 + 标记价 + aicoin + + + + + + + + + + + + + 脚本执行 + 直接执行 + + + + + + + + + + + + + + + + + + + 新增 + 计算 - - 减仓下跌百分比 - 减仓数量百分比 - 减仓后止盈价百分比 - - - 减仓后止损价百分比 -
删除 - -
- - - - 保存并下单 - 仅保存模板 - - - - - +
+ + +
加仓类型
+ + 限价 + 市价 + +
+ +
加仓方式
+ + 百分比 + 实际金额 + +
+ 加仓下跌百分比 + 加仓数值 + 加仓后止盈价百分比 + + +
+ + 减仓下跌百分比 + 减仓数量百分比 + 减仓后止盈价百分比 + + + 减仓后止损价百分比 +
删除 + +
+ + + + 保存并下单 + 仅保存模板 + + + + + - - @@ -1461,7 +1463,8 @@ export default { aicoinPrice: '', // 回本止盈点 ext: [], - re_take_profit_ratio: 0 + re_take_profit_ratio: 0, + formLoading: false } }, computed: { @@ -1961,6 +1964,7 @@ export default { }, /** 新增按钮操作 */ handleAdd(title) { + this.formLoading = false this.ext = [] this.re_take_profit_ratio = 0 this.title = title || '添加委托管理' @@ -1991,6 +1995,7 @@ export default { submitForm: function() { this.$refs['form'].validate(valid => { if (valid) { + this.formLoading = true if (this.form.price) { this.form.price = String(this.form.price) } @@ -1998,10 +2003,12 @@ export default { if (this.form.id !== undefined) { updateLinePreOrder(this.form).then(response => { if (response.code === 200) { + this.formLoading = false this.msgSuccess(response.msg) this.open = false this.getList() } else { + this.formLoading = false this.msgError(response.msg) } }) @@ -2011,10 +2018,12 @@ export default { delete params.symbol batchAddOrder(params).then(response => { if (response.code === 200) { + this.formLoading = false this.msgSuccess(response.msg) this.open = false this.getList() } else { + this.formLoading = false this.msgError(response.msg) } }) @@ -2029,10 +2038,12 @@ export default { api_id: this.form.api_id.toString() }).then(response => { if (response.code === 200) { + this.formLoading = false this.msgSuccess(response.msg) this.open = false this.getList() } else { + this.formLoading = false this.msgError(response.msg) } }) diff --git a/src/views/admin/line-symbol-group/index.vue b/src/views/admin/line-symbol-group/index.vue index cca005a..7711e12 100644 --- a/src/views/admin/line-symbol-group/index.vue +++ b/src/views/admin/line-symbol-group/index.vue @@ -161,13 +161,13 @@ /> --> - + 现货 合约 - + 输入 选择 @@ -282,13 +282,6 @@ export default { curChange: 1 } }, - watch: { - 'form.type'() { - this.form.symbol = undefined - this.getSymbol({}) - } - }, - created() { this.getList() // 获取交易所字典数据 @@ -384,6 +377,7 @@ export default { row.id || this.ids getLineSymbolGroup(id).then(response => { this.form = response.data + // this.form.symbol = response.data.symbol ? response.data.symbol.split(',') : undefined this.getSymbol() this.open = true this.title = '修改交易对组列表'