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
584d0210
Commit
584d0210
authored
Mar 16, 2020
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'limit-free' into dev
parents
86c3068a
c528a45e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
src/components/detail/index.js
+1
-1
src/components/limit-free/index.scss
+6
-3
No files found.
src/components/detail/index.js
View file @
584d0210
...
@@ -596,7 +596,7 @@ class Detail extends Component {
...
@@ -596,7 +596,7 @@ class Detail extends Component {
<
/div
>
<
/div
>
}
}
{
{
course_info
.
is_
baoming
===
0
&&
course_info
.
is_
limit_free
course_info
.
is_limit_free
?
?
course_info
.
limit_free_status
==
0
course_info
.
limit_free_status
==
0
?
<
div
className
=
"limit-free"
>
?
<
div
className
=
"limit-free"
>
...
...
src/components/limit-free/index.scss
View file @
584d0210
...
@@ -77,14 +77,17 @@
...
@@ -77,14 +77,17 @@
.category
{
.category
{
padding
:
12px
12px
0
;
padding
:
0
12px
;
background
:
#fff
;
background
:
#fff
;
margin-bottom
:
8px
;
margin-bottom
:
8px
;
border-top
:
1px
solid
transparent
;
}
}
h2
{
h2
{
scroll-margin-top
:
45px
;
padding-top
:
50px
;
margin-top
:
-50px
;
background-clip
:
content-box
;
}
}
.courses
li
:nth-last-child
(
1
)
{
.courses
li
:nth-last-child
(
1
)
{
...
@@ -103,7 +106,7 @@
...
@@ -103,7 +106,7 @@
h2
{
h2
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
margin
:
18px
0
;
margin
:
-32px
0
18px
;
img
{
img
{
width
:
12px
;
width
:
12px
;
...
...
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