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
cd1d2192
Commit
cd1d2192
authored
Dec 07, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
课程
parent
73265398
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
636 additions
and
9 deletions
+636
-9
src/components/activity/newyear-2019/common/commonContainer/index.js
+8
-5
src/components/activity/newyear-2019/common/commonContainer/index.scss
+5
-3
src/components/activity/newyear-2019/preheat/YearCourse/index.js
+0
-0
src/components/activity/newyear-2019/preheat/YearCourse/index.scss
+247
-0
src/components/activity/newyear-2019/preheat/index.js
+3
-1
src/components/activity/newyear-2019/preheat/index.scss
+5
-0
src/components/activity/newyear-2019/year-wish/index.js
+146
-0
src/components/activity/newyear-2019/year-wish/index.scss
+216
-0
src/router/router-config.js
+6
-0
No files found.
src/components/activity/newyear-2019/common/commonContainer/index.js
View file @
cd1d2192
...
...
@@ -10,11 +10,14 @@ export default class CommonContainer extends Component {
<
div
className
=
'common_container'
>
<
div
className
=
'container_top'
><
/div
>
<
div
className
=
'container_content'
>
<
div
className
=
'title_container'
>
<
i
><
/i
>
<
p
>
{
this
.
props
.
title
}
<
/p
>
<
i
><
/i
>
<
/div
>
{
this
.
props
.
title
&&
<
div
className
=
'title_container'
>
<
i
><
/i
>
<
p
>
{
this
.
props
.
title
}
<
/p
>
<
i
><
/i
>
<
/div
>
}
{
React
.
Children
.
map
(
this
.
props
.
children
,
function
(
child
)
{
return
<>
{
child
}
<
/>
;
...
...
src/components/activity/newyear-2019/common/commonContainer/index.scss
View file @
cd1d2192
.common_container
{
margin-bottom
:
35px
;
.title_container
{
width
:
100%
;
display
:
flex
;
...
...
@@ -8,6 +9,7 @@
i
{
width
:
230px
;
height
:
2px
;
margin
:
auto
;
background
:
linear-gradient
(
90deg
,
rgba
(
254
,
228
,
29
,
0
)
0%
,
...
...
@@ -47,10 +49,10 @@
height
:
22px
;
}
.container_content
{
background
:
url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_middle_bj.png")
center
center
no-repeat
;
background-size
:
100%
100%
;
background
:
url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_middle_bj.png")
;
background-size
:
contain
;
width
:
100%
;
min-height
:
25px
;
padding
:
5px
20px
;
}
}
src/components/activity/newyear-2019/preheat/YearCourse/index.js
0 → 100644
View file @
cd1d2192
This diff is collapsed.
Click to expand it.
src/components/activity/newyear-2019/preheat/YearCourse/index.scss
0 → 100644
View file @
cd1d2192
.course-box
{
display
:
flex
;
justify-content
:
space-between
;
flex-wrap
:
wrap
;
.course-container
{
width
:
158px
;
margin
:
15px
0
0
0
;
text-align
:
center
;
position
:
relative
;
}
.group-num
{
width
:
66px
;
height
:
16px
;
position
:
absolute
;
left
:
10px
;
top
:
10px
;
line-height
:
16px
;
background
:
#CA161C
;
opacity
:
0
.8
;
border-radius
:
1px
;
font-size
:
12px
;
color
:
#fff
;
text-align
:
center
;
}
.coupon-course__footer
{
.course-title
{
padding-left
:
10px
;
font-size
:
15px
;
color
:
#333
;
font-weight
:
500
;
margin-top
:
7px
;
}
.btn
{
display
:
inline-block
;
width
:
138px
;
height
:
24px
;
text-align
:
center
;
line-height
:
24px
;
border-radius
:
2px
;
font-size
:
12px
;
outline
:
none
;
border
:
none
;
letter-spacing
:
1px
;
}
.big-course
{
background-color
:
#FEE41D
;
border
:
1px
solid
#090F08
;
color
:
#090F08
;
margin-top
:
10px
;
}
.to-study
{
background-color
:
#09f
;
color
:
#fff
;
position
:
absolute
;
left
:
10px
;
bottom
:
10px
;
}
.free-study
{
background
:
linear-gradient
(
-90deg
,
#EB1612
0%
,
#F92927
100%
);
color
:
#fff
;
margin-top
:
10px
;
}
.free-course-num
{
font-size
:
12px
;
color
:
#070F08
;
margin-top
:
7px
;
letter-spacing
:
1px
;
span
{
font-size
:
14px
;
color
:
#FF0002
;
}
}
}
.type
{
text-align
:
left
;
padding-left
:
7px
;
margin-top
:
3px
;
.tag
{
display
:
inline-block
;
padding
:
0
6px
;
height
:
14px
;
line-height
:
15px
;
text-align
:
center
;
font-size
:
12px
;
color
:
#FFF
;
position
:
relative
;
z-index
:
0
;
}
.time
{
display
:
inline-block
;
height
:
15px
;
line-height
:
15px
;
padding
:
0
6px
;
margin-left
:
5px
;
position
:
relative
;
font-size
:
12px
;
color
:
#555
;
text-align
:
center
;
z-index
:
0
;
}
.time
:before
{
content
:
''
;
position
:
absolute
;
top
:
0
;
right
:
0
;
bottom
:
0
;
left
:
0
;
background-color
:
#E6E6E6
;
transform
:
skewX
(
-20deg
);
z-index
:
-1
;
}
.tag
:before
{
content
:
''
;
position
:
absolute
;
top
:
0
;
right
:
0
;
bottom
:
0
;
left
:
0
;
background-color
:
#FF0002
;
transform
:
skewX
(
-20deg
);
z-index
:
-1
;
}
}
.price
{
text-align
:
left
;
padding-left
:
5px
;
margin-top
:
3px
;
color
:
#FF0002
;
font-size
:
12px
;
.new-price
{
font-size
:
18px
;
}
.old-price
{
font-size
:
12px
;
color
:
#666
;
margin-left
:
8px
;
}
}
.status
{
text-align
:
left
;
padding-left
:
5px
;
position
:
absolute
;
bottom
:
10px
;
.status-btn
{
display
:
inline-block
;
height
:
22px
;
line-height
:
22px
;
border-radius
:
2px
;
text-align
:
center
;
font-size
:
12px
;
color
:
#fff
;
}
.to-buy
{
width
:
55px
;
background-color
:
#FF8080
;
}
.add-wish
,
.add-wish-success
{
width
:
88px
;
margin-left
:
5px
;
outline
:
none
;
color
:
#FF0002
;
background-color
:
#fff
;
border
:
1px
solid
#FF0002
;
img
{
width
:
12px
;
height
:
11px
;
margin-right
:
2px
;
position
:
relative
;
top
:
1px
;
}
}
.add-wish-success
{
color
:
#fff
;
background
:
linear-gradient
(
90deg
,
rgba
(
235
,
22
,
18
,
1
)
0%
,
rgba
(
249
,
41
,
39
,
1
)
100%
);
}
}
}
.bigcourse
.course-container
{
height
:
156px
;
}
.freecourse
.course-container
{
height
:
177px
;
}
.groupcourse
.course-container
{
height
:
195px
;
}
.ai-course__subtitle
{
width
:
73px
;
height
:
24px
;
margin
:
15px
auto
0
;
border-radius
:
12px
;
font-size
:
14px
;
font-weight
:
500
;
color
:
#070F08
;
text-align
:
center
;
line-height
:
22px
;
letter-spacing
:
2px
;
background-color
:
#FFE300
;
border
:
1px
solid
#070F08
;
}
.more-button
{
display
:
block
;
width
:
75px
;
height
:
26px
;
margin
:
15px
auto
5px
;
padding
:
0
;
border-radius
:
12px
;
font-size
:
12px
;
font-weight
:
400
;
color
:
#fff
;
line-height
:
26px
;
cursor
:
pointer
;
outline
:
none
;
background-color
:
#0F6237
;
border
:
none
;
letter-spacing
:
1px
;
}
src/components/activity/newyear-2019/preheat/index.js
View file @
cd1d2192
import
React
,
{
Component
}
from
'react'
import
'./index.scss'
import
LiveRoom
from
'./LiveRoom/index'
;
import
YearCourse
from
'./YearCourse/index'
;
export
default
class
index
extends
Component
{
render
()
{
return
(
<
div
>
<
div
className
=
{
'year-index'
}
>
<
LiveRoom
/>
<
YearCourse
/>
<
/div
>
)
}
...
...
src/components/activity/newyear-2019/preheat/index.scss
View file @
cd1d2192
.year-index
{
padding-bottom
:
30px
;
background-color
:
#BC2A18
;
}
\ No newline at end of file
src/components/activity/newyear-2019/year-wish/index.js
0 → 100644
View file @
cd1d2192
import
React
,
{
Component
}
from
'react'
import
'./index.scss'
import
{
http
,
SendMessageToApp
,
getParam
}
from
'@/utils'
import
CommonContainer
from
'./../common/commonContainer/index'
import
CourseItem
from
'../../../blessingPreheat/courseItem/index'
import
{
Link
,
withRouter
}
from
"react-router-dom"
class
YarnWish
extends
Component
{
state
=
{
list
:
[]
}
componentDidMount
()
{
this
.
fetchCourse
()
}
fetchCourse
=
()
=>
{
http
.
get
(
`
${
API
.
home
}
/activity/wish_course`
).
then
(
res
=>
{
const
{
code
,
data
}
=
res
.
data
if
(
code
===
200
)
{
this
.
setState
({
list
:
JSON
.
stringify
(
data
)
===
'{}'
?
[]
:
data
})
}
})
}
// 去课程详情页
toCourse
=
(
courseId
)
=>
{
const
{
history
}
=
this
.
props
if
(
!
getParam
(
'version'
))
{
history
.
push
(
`/detail?id=
${
courseId
}
`
)
}
else
{
SendMessageToApp
(
"toCourse"
,
courseId
)
}
}
render
()
{
const
{
list
}
=
this
.
state
return
(
<
div
className
=
'yarn-wish'
>
<
div
className
=
"banner"
><
img
src
=
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/xy_banner_bj.png"
alt
=
""
/><
/div
>
{
list
.
length
>
0
?
<
CommonContainer
>
<
div
className
=
'groupcourse course-box'
>
{
list
&&
list
.
length
>
0
&&
list
.
map
(
item
=>
(
<
CourseItem
image
=
{
item
.
image_name
}
key
=
{
item
.
course_id
}
id
=
{
item
.
course_id
}
toCourse
=
{
this
.
toCourse
}
>
{
item
.
type
==
4
&&
<
div
className
=
"group-num"
>
限量
300
个
<
/div
>
}
<
div
className
=
"coupon-course__footer"
>
{
item
.
is_buy
==
1
&&
<>
<
p
className
=
{
'course-title text-overflow-1'
}
>
{
item
.
course_title
}
<
/p
>
<
a
onClick
=
{()
=>
this
.
toCourse
(
item
.
course_id
)}
className
=
"btn to-study"
>
开始学习
<
/a
>
<
/
>
}
{
item
.
is_buy
==
0
&&
<>
<
div
className
=
"type"
>
{
item
.
type
==
0
&&
<>
<
span
className
=
"tag"
>
活动价
<
/span
>
<
span
className
=
"time"
>
12.23
开始
<
/span
>
<
/
>
}
{
item
.
type
==
1
&&
<>
<
span
className
=
"tag"
>
拼团价
<
/span
>
<
span
className
=
"time"
>
12.23
开团
<
/span
>
<
/
>
}
{
item
.
type
==
2
&&
<>
<
span
className
=
"tag"
>
好友帮帮砍
<
/span
>
<
span
className
=
"time"
>
12.23
开砍
<
/span
>
<
/
>
}
<
/div
>
<
div
className
=
"price"
>
{
item
.
type
==
2
?
'到手价最低:¥'
:
'¥'
}
<
span
className
=
"new-price"
>
{
item
.
price1
}
<
/span
>
<
span
className
=
"old-price"
>
{
item
.
type
==
2
?
''
:
'现价:'
}
<
s
>
¥
{
item
.
price0
}
<
/s></
span
>
<
/div
>
<
div
className
=
"status"
>
<
a
onClick
=
{()
=>
this
.
toCourse
(
item
.
course_id
)}
className
=
"status-btn to-buy"
>
直接购买
<
/a
>
{
item
.
is_join
==
1
&&
<
a
className
=
"status-btn add-wish"
><
img
src
=
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/add-success.png"
alt
=
""
/>
已加心愿单
<
/a
>
}
{
item
.
is_join
==
0
&&
<
a
onClick
=
{()
=>
this
.
addWishList
(
item
.
course_id
)}
className
=
"status-btn add-wish-success"
>
<
img
src
=
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/like_icon.png"
alt
=
""
/>
加入心愿单
<
/a
>
}
<
/div
>
<
/
>
}
<
/div
>
<
/CourseItem
>
))
}
<
/div
>
<
/CommonContainer
>
:
<
div
className
=
"notData"
>
<
img
src
=
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/icon-empty.png"
alt
=
""
/>
<
p
>
你的心愿单目前空空如也,
<
br
/>
快去挑选更多优惠课程吧~
<
/p
>
{
/*活动期间文案*/
}
{
/*<p>你的心愿单没有课程哦,感兴趣的课程可在双旦主会场直接购买!</p>*/
}
<
/div
>
}
<
/div
>
)
}
}
export
default
withRouter
(
YarnWish
)
src/components/activity/newyear-2019/year-wish/index.scss
0 → 100644
View file @
cd1d2192
html
,
body
,
#root
{
height
:
100%
;
}
.yarn-wish
{
height
:
100%
;
background-color
:
#BA2C21
;
padding-bottom
:
35px
;
.banner
{
width
:
100%
;
margin-bottom
:
30px
;
}
.course-box
{
display
:
flex
;
justify-content
:
space-between
;
flex-wrap
:
wrap
;
.course-container
{
width
:
158px
;
margin
:
15px
0
0
0
;
text-align
:
center
;
position
:
relative
;
}
.group-num
{
width
:
66px
;
height
:
16px
;
position
:
absolute
;
left
:
10px
;
top
:
10px
;
line-height
:
16px
;
background
:
#CA161C
;
opacity
:
0
.8
;
border-radius
:
1px
;
font-size
:
12px
;
color
:
#fff
;
text-align
:
center
;
}
.coupon-course__footer
{
.course-title
{
padding-left
:
10px
;
font-size
:
15px
;
color
:
#333
;
font-weight
:
500
;
margin-top
:
7px
;
}
.btn
{
display
:
inline-block
;
width
:
138px
;
height
:
24px
;
text-align
:
center
;
line-height
:
24px
;
border-radius
:
2px
;
font-size
:
12px
;
outline
:
none
;
border
:
none
;
letter-spacing
:
1px
;
}
.big-course
{
background-color
:
#FEE41D
;
border
:
1px
solid
#090F08
;
color
:
#090F08
;
margin-top
:
10px
;
}
.to-study
{
background-color
:
#09f
;
color
:
#fff
;
position
:
absolute
;
left
:
10px
;
bottom
:
10px
;
}
.free-study
{
background
:
linear-gradient
(
-90deg
,
#EB1612
0%
,
#F92927
100%
);
color
:
#fff
;
margin-top
:
10px
;
}
.free-course-num
{
font-size
:
12px
;
color
:
#070F08
;
margin-top
:
7px
;
letter-spacing
:
1px
;
span
{
font-size
:
14px
;
color
:
#FF0002
;
}
}
}
.type
{
text-align
:
left
;
padding-left
:
7px
;
margin-top
:
3px
;
.tag
{
display
:
inline-block
;
padding
:
0
6px
;
height
:
14px
;
line-height
:
15px
;
text-align
:
center
;
font-size
:
12px
;
color
:
#FFF
;
position
:
relative
;
z-index
:
0
;
}
.time
{
display
:
inline-block
;
height
:
15px
;
line-height
:
15px
;
padding
:
0
6px
;
margin-left
:
5px
;
position
:
relative
;
font-size
:
12px
;
color
:
#555
;
text-align
:
center
;
z-index
:
0
;
}
.time
:before
{
content
:
''
;
position
:
absolute
;
top
:
0
;
right
:
0
;
bottom
:
0
;
left
:
0
;
background-color
:
#E6E6E6
;
transform
:
skewX
(
-20deg
);
z-index
:
-1
;
}
.tag
:before
{
content
:
''
;
position
:
absolute
;
top
:
0
;
right
:
0
;
bottom
:
0
;
left
:
0
;
background-color
:
#FF0002
;
transform
:
skewX
(
-20deg
);
z-index
:
-1
;
}
}
.price
{
text-align
:
left
;
padding-left
:
5px
;
margin-top
:
3px
;
color
:
#FF0002
;
font-size
:
12px
;
.new-price
{
font-size
:
18px
;
}
.old-price
{
font-size
:
12px
;
color
:
#666
;
margin-left
:
8px
;
}
}
.status
{
text-align
:
left
;
padding-left
:
5px
;
position
:
absolute
;
bottom
:
10px
;
.status-btn
{
display
:
inline-block
;
height
:
22px
;
line-height
:
22px
;
border-radius
:
2px
;
text-align
:
center
;
font-size
:
12px
;
color
:
#fff
;
}
.to-buy
{
width
:
148px
;
background-color
:
#FF8080
;
}
}
}
.groupcourse
.course-container
{
height
:
195px
;
}
.notData
{
margin
:
100px
auto
0
;
text-align
:
center
;
img
{
width
:
56px
;
height
:
49px
;
}
p
{
font-size
:
16px
;
color
:
#fff
;
margin-top
:
20px
;
}
}
}
src/router/router-config.js
View file @
cd1d2192
...
...
@@ -238,4 +238,10 @@ export default [
path
:
'/year/yearIndex'
,
component
:
loadable
(()
=>
import
(
/* webpackChunkName: 'newyear-yearIndex' */
'@components/activity/newyear-2019/preheat/index'
))
}
,
// 双旦心愿单
{
path
:
'/year/yearWish'
,
component
:
loadable
(()
=>
import
(
/* webpackChunkName: 'newyear-yearIndex' */
'@components/activity/newyear-2019/year-wish/index'
))
}
]
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