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
38160f5e
Commit
38160f5e
authored
Aug 22, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
14d0c52f
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
src/components/detail/bargain/index.js
+2
-1
src/components/detail/group/togroup.js
+1
-1
src/components/myOrders/index.js
+1
-1
src/components/study/freeCourses/free-courses.scss
+7
-0
No files found.
src/components/detail/bargain/index.js
View file @
38160f5e
...
...
@@ -184,6 +184,7 @@ class Bargain extends Component {
render
()
{
const
{
list
,
outList
,
barInfo
}
=
this
.
state
;
console
.
log
(
barInfo
)
const
{
user
}
=
this
.
props
const
uid
=
user
&&
user
.
data
&&
user
.
data
.
uid
return
(
...
...
@@ -192,7 +193,7 @@ class Bargain extends Component {
{
/*bargain_status 砍价状态 0-砍价中,1砍价结束,待支付,2砍价过期(没有砍价记录没有砍价信息),3已购买*/
}
{
(
barInfo
.
bargain_status
===
2
||
!
uid
)
&&
<
BargainIntro
limitPeople
=
{
barInfo
.
limit
P
eople
}
iWantBargain
=
{
this
.
iWantBargain
}
/
>
<
BargainIntro
limitPeople
=
{
barInfo
.
limit
_p
eople
}
iWantBargain
=
{
this
.
iWantBargain
}
/
>
}
{
(
barInfo
.
bargain_status
===
0
||
barInfo
.
bargain_status
===
1
)
&&
...
...
src/components/detail/group/togroup.js
View file @
38160f5e
...
...
@@ -261,7 +261,7 @@ function GorupContent(props) {
if
(
is_success
===
1
)
{
tip
=
<
p
className
=
'success'
>
拼团成功
<
/p
>
btn
=
<
Link
to
=
{
`/
play
`
}
className
=
'tostudy'
>
去学习
<
/Link
>
btn
=
<
Link
to
=
{
`/
detail?id=
${
data
.
course_id
}
`
}
className
=
'tostudy'
>
去学习
<
/Link
>
}
return
(
<
div
className
=
'gorup-content'
>
...
...
src/components/myOrders/index.js
View file @
38160f5e
...
...
@@ -112,7 +112,7 @@ class MyOrders extends Component {
<
p
className
=
'order-content text-overflow-2'
>
{
item
.
description
}
<
/p
>
<
p
className
=
'order-des'
>
<
span
className
=
'order-newprice'
>
¥
{
item
.
pay_
amount
}
<
/span
>
className
=
'order-newprice'
>
¥
{
item
.
amount
}
<
/span
>
<
span
className
=
'order-price'
>
¥
{
item
.
price0
}
<
/span
>
<
/p
>
...
...
src/components/study/freeCourses/free-courses.scss
View file @
38160f5e
...
...
@@ -3,6 +3,13 @@
display
:
flex
;
flex-wrap
:
wrap
;
justify-content
:
space-between
;
.course-base-item
{
margin-top
:
0
;
margin-bottom
:
15px
;
img
{
border-radius
:
3px
;
}
}
.top
{
position
:
absolute
;
...
...
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