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
34e7ac4d
Commit
34e7ac4d
authored
Oct 30, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '11-11' into banner
parents
66b2ae72
c7e2d2be
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
src/components/blessingPreheat/index.js
+5
-5
src/components/blessingPreheat/listHeader/index.js
+2
-2
No files found.
src/components/blessingPreheat/index.js
View file @
34e7ac4d
...
@@ -150,7 +150,7 @@ class BlessingPreheat extends Component {
...
@@ -150,7 +150,7 @@ class BlessingPreheat extends Component {
<
div
id
=
{
'blessing-preheat'
}
>
<
div
id
=
{
'blessing-preheat'
}
>
<
Banner
/>
<
Banner
/>
{
/* 积福气 */
}
{
/* 积福气 */
}
<
ListHeader
text
=
"积福气,享受更多福利"
styles
=
{{
margin
:
'0 0 15px'
}}
/
>
<
ListHeader
id
=
{
'lucky-value'
}
text
=
"积福气,享受更多福利"
styles
=
{{
margin
:
'0 0 15px'
}}
/
>
<
CollectBlessing
<
CollectBlessing
isSign
=
{
isSign
}
isSign
=
{
isSign
}
userInfo
=
{
userInfo
}
userInfo
=
{
userInfo
}
...
@@ -161,7 +161,7 @@ class BlessingPreheat extends Component {
...
@@ -161,7 +161,7 @@ class BlessingPreheat extends Component {
/
>
/
>
{
/* 幸运大抽奖--预热 */
}
{
/* 幸运大抽奖--预热 */
}
<
ListHeader
text
=
"幸运大抽奖"
styles
=
{{
margin
:
'30px 0 10px'
}}
/
>
<
ListHeader
id
=
{
'lucky-draw'
}
text
=
"幸运大抽奖"
styles
=
{{
margin
:
'30px 0 10px'
}}
/
>
<
p
className
=
"luck-draw__tip"
>-
将于
11
月
11
日
10
点开启
-<
/p
>
<
p
className
=
"luck-draw__tip"
>-
将于
11
月
11
日
10
点开启
-<
/p
>
<
button
className
=
"luck-draw__button"
onClick
=
{()
=>
this
.
handleToShow
(
'isRule'
)}
>
活动规则
><
/button
>
<
button
className
=
"luck-draw__button"
onClick
=
{()
=>
this
.
handleToShow
(
'isRule'
)}
>
活动规则
><
/button
>
<
LuckDraw
/>
<
LuckDraw
/>
...
@@ -170,13 +170,13 @@ class BlessingPreheat extends Component {
...
@@ -170,13 +170,13 @@ class BlessingPreheat extends Component {
{
{
isFormal
===
0
&&
isFormal
===
0
&&
<>
<>
<
ListHeader
text
=
"预付1元定金,最高可省100元"
styles
=
{{
margin
:
'30px 0 15px'
}}
/
>
<
ListHeader
id
=
{
'deposit'
}
text
=
"预付1元定金,最高可省100元"
styles
=
{{
margin
:
'30px 0 15px'
}}
/
>
<
ReserveCourse
/>
<
ReserveCourse
/>
<
/
>
<
/
>
}
}
{
/* 精品课程特惠专区 */
}
{
/* 精品课程特惠专区 */
}
<
ListHeader
text
=
"精品课程特惠专区"
styles
=
{{
margin
:
'30px 0 15px'
}}
/
>
<
ListHeader
id
=
{
'best-courses'
}
text
=
"精品课程特惠专区"
styles
=
{{
margin
:
'30px 0 15px'
}}
/
>
<
CourseList
isFormal
=
{
isFormal
}
/
>
<
CourseList
isFormal
=
{
isFormal
}
/
>
{
{
...
@@ -235,7 +235,7 @@ class BlessingPreheat extends Component {
...
@@ -235,7 +235,7 @@ class BlessingPreheat extends Component {
<
/Popup
>
<
/Popup
>
<
ListHeader
text
=
"全国AI工程师水平测试"
styles
=
{{
margin
:
'30px 0 15px'
}}
/
>
<
ListHeader
id
=
{
'ai-test'
}
text
=
"全国AI工程师水平测试"
styles
=
{{
margin
:
'30px 0 15px'
}}
/
>
<
div
className
=
"test__record"
onClick
=
{()
=>
this
.
handleToShow
(
'showRecordList'
)}
>
<
div
className
=
"test__record"
onClick
=
{()
=>
this
.
handleToShow
(
'showRecordList'
)}
>
测试记录
>
测试记录
>
<
/div
>
<
/div
>
...
...
src/components/blessingPreheat/listHeader/index.js
View file @
34e7ac4d
...
@@ -4,10 +4,10 @@ import './index.scss';
...
@@ -4,10 +4,10 @@ import './index.scss';
class
ListHeader
extends
Component
{
class
ListHeader
extends
Component
{
render
()
{
render
()
{
const
{
text
,
size
,
styles
}
=
this
.
props
;
const
{
text
,
size
,
styles
,
id
}
=
this
.
props
;
const
cls
=
size
?
`list-header--
${
size
}
`
:
''
;
const
cls
=
size
?
`list-header--
${
size
}
`
:
''
;
return
(
return
(
<
div
className
=
{
classnames
(
"list-header"
,
cls
)}
style
=
{
styles
}
>
<
div
id
=
{
id
}
className
=
{
classnames
(
"list-header"
,
cls
)}
style
=
{
styles
}
>
<
i
className
=
"list-header__decorate"
data
-
position
=
"left"
><
/i
>
<
i
className
=
"list-header__decorate"
data
-
position
=
"left"
><
/i
>
{
{
text
text
...
...
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