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
a73c3fea
Commit
a73c3fea
authored
5 years ago
by
FE
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
formal activity basic complete
parent
44da469c
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
49 deletions
+73
-49
src/components/activity/newyear-2019/common/commonContainer/index.scss
+2
-1
src/components/activity/newyear-2019/preheat/YearCourse/index.js
+0
-0
src/components/activity/newyear-2019/preheat/YearCourse/index.scss
+25
-40
src/components/activity/newyear-2019/year-wish/index.js
+0
-0
src/components/activity/newyear-2019/year-wish/index.scss
+46
-7
src/components/detail/index.js
+0
-1
No files found.
src/components/activity/newyear-2019/common/commonContainer/index.scss
View file @
a73c3fea
...
@@ -49,11 +49,12 @@
...
@@ -49,11 +49,12 @@
width
:
100%
;
width
:
100%
;
height
:
22px
;
height
:
22px
;
}
}
.container_content
{
.container_content
{
background
:
url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_middle_bj.png")
;
background
:
url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_middle_bj.png")
;
background-size
:
contain
;
background-size
:
contain
;
width
:
100%
;
width
:
100%
;
min-height
:
25px
;
min-height
:
25px
;
padding
:
5px
20
px
;
padding
:
5px
15
px
;
}
}
}
}
This diff is collapsed.
Click to expand it.
src/components/activity/newyear-2019/preheat/YearCourse/index.js
View file @
a73c3fea
This diff is collapsed.
Click to expand it.
src/components/activity/newyear-2019/preheat/YearCourse/index.scss
View file @
a73c3fea
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
.course-container
{
.course-container
{
width
:
1
5
8px
;
width
:
1
6
8px
;
margin
:
15px
0
0
0
;
margin
:
15px
0
0
0
;
text-align
:
center
;
text-align
:
center
;
position
:
relative
;
position
:
relative
;
...
@@ -27,6 +27,20 @@
...
@@ -27,6 +27,20 @@
text-align
:
center
;
text-align
:
center
;
}
}
.bargain-price
{
position
:
absolute
;
left
:
4px
;
top
:
10px
;
margin
:
0
;
height
:
18px
;
padding
:
0
8px
;
border-radius
:
0
9px
9px
0
;
font-size
:
12px
;
color
:
#fff
;
line-height
:
18px
;
background-color
:
#F01D0E
;
}
.coupon-course__footer
{
.coupon-course__footer
{
.course-title
{
.course-title
{
padding-left
:
10px
;
padding-left
:
10px
;
...
@@ -144,58 +158,29 @@
...
@@ -144,58 +158,29 @@
}
}
.price
{
.price
{
text-align
:
left
;
padding-left
:
5px
;
margin-top
:
3px
;
margin-top
:
3px
;
color
:
#FF0002
;
padding-left
:
4px
;
font-size
:
12px
;
font-size
:
12px
;
color
:
#FF0002
;
text-align
:
left
;
&
.price-group
{
&
.price-group
{
font-size
:
0
;
height
:
30px
;
height
:
30px
;
}
}
.new-price
{
font-size
:
18px
;
}
.old-price
{
font-size
:
12px
;
color
:
#666
;
margin-left
:
8px
;
}
}
.price-label
{
.price-label
{
position
:
relative
;
width
:
49px
;
height
:
14px
;
margin
:
5px
0
0
19px
;
line-height
:
14px
;
background-color
:
#357345
;
span
{
font-size
:
12px
;
font-size
:
12px
;
color
:
#fff
;
}
}
&
:
:
before
{
.new-price
{
content
:
''
;
font-size
:
16px
;
position
:
absolute
;
top
:
0
;
left
:
-14px
;
border
:
7px
solid
;
border-color
:
transparent
#357345
#357345
transparent
;
}
}
&
:
:
after
{
.old-price
{
content
:
''
;
margin-left
:
2px
;
position
:
absolute
;
font-size
:
12px
;
top
:
0
;
color
:
#666
;
right
:
-14px
;
border
:
7px
solid
;
border-color
:
#357345
transparent
transparent
#357345
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/components/activity/newyear-2019/year-wish/index.js
View file @
a73c3fea
This diff is collapsed.
Click to expand it.
src/components/activity/newyear-2019/year-wish/index.scss
View file @
a73c3fea
...
@@ -18,7 +18,7 @@ html, body, #root {
...
@@ -18,7 +18,7 @@ html, body, #root {
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
.course-container
{
.course-container
{
width
:
1
5
8px
;
width
:
1
6
8px
;
margin
:
15px
0
0
0
;
margin
:
15px
0
0
0
;
text-align
:
center
;
text-align
:
center
;
position
:
relative
;
position
:
relative
;
...
@@ -148,31 +148,46 @@ html, body, #root {
...
@@ -148,31 +148,46 @@ html, body, #root {
transform
:
skewX
(
-20deg
);
transform
:
skewX
(
-20deg
);
z-index
:
-1
;
z-index
:
-1
;
}
}
.tag
[
data-color
=
"green"
]
:before
{
background-color
:
#357345
;
}
}
}
.price
{
.price
{
text-align
:
left
;
padding-left
:
5px
;
margin-top
:
3px
;
margin-top
:
3px
;
padding-left
:
4px
;
font-size
:
12
;
color
:
#FF0002
;
color
:
#FF0002
;
text-align
:
left
;
&
.price-group
{
font-size
:
0
;
height
:
30px
;
}
.price-label
{
font-size
:
12px
;
font-size
:
12px
;
}
.new-price
{
.new-price
{
font-size
:
1
8
px
;
font-size
:
1
6
px
;
}
}
.old-price
{
.old-price
{
margin-left
:
2px
;
font-size
:
12px
;
font-size
:
12px
;
color
:
#666
;
color
:
#666
;
margin-left
:
8px
;
}
}
}
}
.status
{
.status
{
text-align
:
left
;
padding-left
:
5px
;
position
:
absolute
;
position
:
absolute
;
left
:
0
;
bottom
:
10px
;
bottom
:
10px
;
right
:
0
;
padding
:
0
5px
;
text-align
:
left
;
.status-btn
{
.status-btn
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -189,6 +204,30 @@ html, body, #root {
...
@@ -189,6 +204,30 @@ html, body, #root {
background-color
:
#FF8080
;
background-color
:
#FF8080
;
}
}
.to-group
{
display
:
block
;
width
:
100%
;
height
:
22px
;
border-radius
:
11px
;
box-sizing
:
border-box
;
font-size
:
14px
;
color
:
#fff
;
text-align
:
center
;
line-height
:
22px
;
background
:
linear-gradient
(
-90deg
,
rgba
(
235
,
22
,
18
,
1
)
0%
,
rgba
(
255
,
0
,
2
,
1
)
100%
);
&
[
data-status
=
"study"
]
{
background
:
#0099FF
;
}
&
[
data-status
=
"done"
]
{
border
:
1px
solid
#090F08
;
font-size
:
12px
;
color
:
#090F08
;
background
:
#FEE41D
;
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/components/detail/index.js
View file @
a73c3fea
...
@@ -447,7 +447,6 @@ class Detail extends Component {
...
@@ -447,7 +447,6 @@ class Detail extends Component {
this
.
fetchCourseInfo
();
this
.
fetchCourseInfo
();
}
else
{
}
else
{
history
.
replace
(
'/shopcart'
);
history
.
replace
(
'/shopcart'
);
ß
}
}
}
else
if
(
res
.
data
.
code
===
15001
)
{
}
else
if
(
res
.
data
.
code
===
15001
)
{
history
.
replace
(
'/shopcart'
);
history
.
replace
(
'/shopcart'
);
...
...
This diff is collapsed.
Click to expand it.
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