Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
robot-monitor
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
汪晓凯
robot-monitor
Commits
9b048ecd
Commit
9b048ecd
authored
Aug 09, 2018
by
汪晓凯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
03beac6e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
7 deletions
+41
-7
RobotDetails.vue
src/views/RobotDetails.vue
+21
-3
account.vue
src/views/account.vue
+18
-2
overview.vue
src/views/overview.vue
+2
-2
No files found.
src/views/RobotDetails.vue
View file @
9b048ecd
...
@@ -192,7 +192,7 @@
...
@@ -192,7 +192,7 @@
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel(),dialogFormVisible = false"
>
取 消
</el-button>
<el-button
@
click=
"cancel(),dialogFormVisible = false"
>
取 消
</el-button>
<el-button
type=
"primary"
<el-button
type=
"primary"
@
click=
"
amount_num&&recharge_list_value ? innerVisible=true : innerVisible=false
"
>
确 定
@
click=
"
sureNext('0')
"
>
确 定
</el-button>
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -258,7 +258,7 @@
...
@@ -258,7 +258,7 @@
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel(),dialogFormVisible1 = false"
>
取 消
</el-button>
<el-button
@
click=
"cancel(),dialogFormVisible1 = false"
>
取 消
</el-button>
<el-button
type=
"primary"
<el-button
type=
"primary"
@
click=
"
amount_num&&recharge_list_value ? innerVisible1=true : innerVisible1=false
"
>
确 定
@
click=
"
sureNext('1')
"
>
确 定
</el-button>
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -561,7 +561,7 @@
...
@@ -561,7 +561,7 @@
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel(),dialogFormVisible2 = false"
>
取 消
</el-button>
<el-button
@
click=
"cancel(),dialogFormVisible2 = false"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"
updateRobotConfig.coin_normal && updateRobotConfig.base_normal && updateRobotConfig.profit_range && updateRobotConfig.amount_range ? innerVisible2=true : innerVisible2=false
"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"
sureNext('2')
"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
</div>
</div>
...
@@ -738,6 +738,24 @@
...
@@ -738,6 +738,24 @@
this
.
recharge_list_value
=
''
;
this
.
recharge_list_value
=
''
;
this
.
transferok
=
false
;
this
.
transferok
=
false
;
},
},
//确认下一步
sureNext
(
type
)
{
(
type
===
'0'
&&
this
.
amount_num
&&
this
.
recharge_list_value
?
this
.
innerVisible
=
true
:
this
.
innerVisible
=
false
);
(
type
===
'1'
&&
this
.
amount_num
&&
this
.
recharge_list_value
?
this
.
innerVisible1
=
true
:
this
.
innerVisible1
=
false
);
(
type
===
'2'
&&
this
.
updateRobotConfig
.
coin_normal
&&
this
.
updateRobotConfig
.
base_normal
&&
this
.
updateRobotConfig
.
profit_range
&&
this
.
updateRobotConfig
.
amount_range
?
this
.
innerVisible2
=
true
:
this
.
innerVisible2
=
false
);
if
(
!
this
.
innerVisible
&&
!
this
.
innerVisible1
&&
!
this
.
innerVisible2
)
{
this
.
$notify
({
title
:
'错误'
,
message
:
'输入有误,请修改后再试'
,
type
:
'warning'
,
duration
:
'2000'
,
});
}
},
//弹框确认充值
//弹框确认充值
sure_recharge
(
key
)
{
sure_recharge
(
key
)
{
const
params
=
{
const
params
=
{
...
...
src/views/account.vue
View file @
9b048ecd
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel(),dialogFormVisible = false"
>
取 消
</el-button>
<el-button
@
click=
"cancel(),dialogFormVisible = false"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"
amount_num&&recharge_list_value ? innerVisible=true : innerVisible=false
"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"
sureNext('0')
"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
<!-- 修改配置弹框 -->
<!-- 修改配置弹框 -->
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancel(),dialogFormVisible1 = false"
>
取 消
</el-button>
<el-button
@
click=
"cancel(),dialogFormVisible1 = false"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"
min_amount && recharge_amount && max_recharge_times ? innerVisible1=true : innerVisible1=false
"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"
sureNext('1')
"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
</div>
</div>
...
@@ -455,6 +455,22 @@
...
@@ -455,6 +455,22 @@
this
.
transferok
=
false
;
this
.
transferok
=
false
;
this
.
transferok1
=
false
;
this
.
transferok1
=
false
;
},
},
//确认下一步
sureNext
(
type
)
{
(
type
===
'0'
&&
this
.
amount_num
&&
this
.
recharge_list_value
?
this
.
innerVisible
=
true
:
this
.
innerVisible
=
false
);
(
type
===
'1'
&&
this
.
min_amount
&&
this
.
recharge_amount
&&
this
.
max_recharge_times
?
this
.
innerVisible1
=
true
:
this
.
innerVisible1
=
false
);
if
(
!
this
.
innerVisible
&&
!
this
.
innerVisible1
)
{
this
.
$notify
({
title
:
'错误'
,
message
:
'输入有误,请修改后再试'
,
type
:
'warning'
,
duration
:
'2000'
,
});
}
},
//弹框确认充值
//弹框确认充值
sure_recharge
(){
sure_recharge
(){
const
params
=
{
const
params
=
{
...
...
src/views/overview.vue
View file @
9b048ecd
...
@@ -334,8 +334,6 @@
...
@@ -334,8 +334,6 @@
let
checkedCount
=
value
.
length
;
let
checkedCount
=
value
.
length
;
this
.
checkAll
=
checkedCount
===
this
.
webs
.
length
;
this
.
checkAll
=
checkedCount
===
this
.
webs
.
length
;
this
.
isIndeterminate
=
checkedCount
>
0
&&
checkedCount
<
this
.
webs
.
length
;
this
.
isIndeterminate
=
checkedCount
>
0
&&
checkedCount
<
this
.
webs
.
length
;
this
.
checkedCurrencies
=
[];
this
.
checkAll0
=
false
;
//动态筛选币种
//动态筛选币种
if
(
value
.
length
===
0
)
{
if
(
value
.
length
===
0
)
{
this
.
currencies
=
this
.
allCurrencies
;
this
.
currencies
=
this
.
allCurrencies
;
...
@@ -349,6 +347,8 @@
...
@@ -349,6 +347,8 @@
}
}
}
}
}
}
this
.
checkedCurrencies
=
this
.
currencies
;
this
.
checkAll0
=
true
;
//筛选符合条件的机器人
//筛选符合条件的机器人
let
ListParams
=
this
.
RobotListParams
;
let
ListParams
=
this
.
RobotListParams
;
ListParams
.
platform
=
value
;
ListParams
.
platform
=
value
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment