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
451916a1
Commit
451916a1
authored
Aug 20, 2019
by
wangshuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG修改:返现样式;订单页提示
parent
1ec08708
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
src/components/order/index.js
+1
-1
src/components/scholarship/index.js
+1
-1
src/components/scholarship/scholarship.scss
+4
-0
No files found.
src/components/order/index.js
View file @
451916a1
...
@@ -297,7 +297,7 @@ class Order extends Component {
...
@@ -297,7 +297,7 @@ class Order extends Component {
if
(
orderInfo
.
data
.
errno
===
200
)
{
if
(
orderInfo
.
data
.
errno
===
200
)
{
newData
=
Object
.
assign
({},
orderInfo
.
data
.
data
,
{
course
:
[]});
newData
=
Object
.
assign
({},
orderInfo
.
data
.
data
,
{
course
:
[]});
}
else
{
}
else
{
Toast
.
info
(
course
Info
.
data
.
msg
,
2
);
Toast
.
info
(
order
Info
.
data
.
msg
,
2
);
return
;
return
;
}
}
if
(
courseInfo
.
data
.
code
===
200
)
{
if
(
courseInfo
.
data
.
code
===
200
)
{
...
...
src/components/scholarship/index.js
View file @
451916a1
...
@@ -257,7 +257,7 @@ class _Scholarship extends Component {
...
@@ -257,7 +257,7 @@ class _Scholarship extends Component {
<
/
>
<
/
>
)
:
(
)
:
(
<>
<>
<
Flex
justify
=
'center'
align
=
'baseline'
style
=
{{
height
:
'20px'
,
lineHeight
:
'20px'
}}
>
<
Flex
justify
=
'center'
align
=
'baseline'
className
=
{
"drawCash"
}
>
<
span
className
=
{
'common-ft-25'
}
>
{
account
}
<
/span
>
<
span
className
=
{
'common-ft-25'
}
>
{
account
}
<
/span
>
<
span
className
=
{
'common-ft-15'
}
>
元
<
/span
>
<
span
className
=
{
'common-ft-15'
}
>
元
<
/span
>
<
/Flex
>
<
/Flex
>
...
...
src/components/scholarship/scholarship.scss
View file @
451916a1
...
@@ -40,6 +40,10 @@
...
@@ -40,6 +40,10 @@
line-height
:
30px
;
line-height
:
30px
;
text-align
:
center
;
text-align
:
center
;
}
}
.drawCash
{
height
:
24px
;
line-height
:
24px
;
}
}
}
.runtimeList
{
.runtimeList
{
height
:
30px
;
height
:
30px
;
...
...
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