Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
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
baiguangyao
mr-julyedu
Commits
c7cda353
Commit
c7cda353
authored
Oct 30, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'deposit-migrate' of gitlab.julyedu.com:baiguangyao/mr-julyedu into pre
parents
ae6f02f6
159a828a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
src/components/detail/index.scss
+1
-0
src/components/expand/share.js
+1
-2
src/components/expand/share.scss
+2
-0
src/components/order/deposit/deposit-order/index.js
+3
-0
No files found.
src/components/detail/index.scss
View file @
c7cda353
...
@@ -60,6 +60,7 @@
...
@@ -60,6 +60,7 @@
font-size
:
14px
;
font-size
:
14px
;
color
:
$color_666
;
color
:
$color_666
;
margin-top
:
10px
;
margin-top
:
10px
;
line-height
:
16px
;
}
}
.des
{
.des
{
...
...
src/components/expand/share.js
View file @
c7cda353
...
@@ -163,8 +163,7 @@ class ExpandShare extends Component {
...
@@ -163,8 +163,7 @@ class ExpandShare extends Component {
step
:
2
,
step
:
2
,
helpData
:
data
helpData
:
data
})
})
this
.
getListorData
()
console
.
log
(
data
)
}
else
if
(
errno
===
17018
||
errno
===
17020
)
{
}
else
if
(
errno
===
17018
||
errno
===
17020
)
{
this
.
setState
({
this
.
setState
({
isShow
:
true
,
isShow
:
true
,
...
...
src/components/expand/share.scss
View file @
c7cda353
...
@@ -569,6 +569,7 @@
...
@@ -569,6 +569,7 @@
color
:
#fff
;
color
:
#fff
;
font-size
:
15px
;
font-size
:
15px
;
margin-top
:
20px
;
margin-top
:
20px
;
border
:
none
;
}
}
}
}
...
@@ -596,6 +597,7 @@
...
@@ -596,6 +597,7 @@
border-radius
:
17px
;
border-radius
:
17px
;
color
:
#fff
;
color
:
#fff
;
font-size
:
15px
;
font-size
:
15px
;
border
:
none
;
}
}
}
}
...
...
src/components/order/deposit/deposit-order/index.js
View file @
c7cda353
...
@@ -181,6 +181,9 @@ class Order extends Component {
...
@@ -181,6 +181,9 @@ class Order extends Component {
useBalance
=
()
=>
{
useBalance
=
()
=>
{
let
{
user_account
,
depositPrice
}
=
this
.
state
let
{
user_account
,
depositPrice
}
=
this
.
state
if
(
parseFloat
(
user_account
)
===
0
)
{
return
}
let
offset
=
parseFloat
(
user_account
)
-
parseFloat
(
depositPrice
)
let
offset
=
parseFloat
(
user_account
)
-
parseFloat
(
depositPrice
)
offset
=
offset
>
0
?
depositPrice
:
user_account
offset
=
offset
>
0
?
depositPrice
:
user_account
this
.
setState
(
prevState
=>
({
useBalance
:
!
prevState
.
useBalance
,
offset
}))
this
.
setState
(
prevState
=>
({
useBalance
:
!
prevState
.
useBalance
,
offset
}))
...
...
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