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
4607dcfa
Commit
4607dcfa
authored
Apr 19, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
master
parent
ce8cd6c2
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
147 additions
and
146 deletions
+147
-146
.idea/workspace.xml
+101
-118
src/common/carousel/carousel.js
+0
-0
src/common/carousel/carousel.scss
+0
-0
src/common/course/course.js
+3
-11
src/common/course/course.scss
+5
-2
src/common/scroll/scroll.js
+0
-0
src/common/scroll/topscroll.js
+0
-0
src/components/Index/index.js
+38
-15
No files found.
.idea/workspace.xml
View file @
4607dcfa
...
...
@@ -2,15 +2,14 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"60bc3527-5f9e-436f-8ed9-968e6eddd66e"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/src/components/Index/carousel.js"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/src/components/Index/carousel.scss"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/course.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/Index/course.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/course.scss"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/Index/course.scss"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/carousel.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/common/carousel/carousel.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/carousel.scss"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/common/carousel/carousel.scss"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/course.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/common/course/course.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/course.scss"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/common/course/course.scss"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/index.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/Index/index.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/index.scss"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/Index/index.scss"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/scroll.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/Index/scroll.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/topscroll.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/Index/topscroll.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/scroll.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/common/scroll/scroll.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Index/topscroll.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/common/scroll/topscroll.js"
afterDir=
"false"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/node_modules/"
/>
<ignored
path=
"$PROJECT_DIR$/.tmp/"
/>
...
...
@@ -24,53 +23,26 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"395"
>
<caret
line=
"114"
column=
"51"
lean-forward=
"true"
selection-start-line=
"114"
selection-start-column=
"51"
selection-end-line=
"114"
selection-end-column=
"51"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/carousel.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"63"
>
<caret
line=
"3"
column=
"34"
lean-forward=
"true"
selection-start-line=
"3"
selection-start-column=
"34"
selection-end-line=
"3"
selection-end-column=
"34"
/>
<state
relative-caret-position=
"334"
>
<caret
line=
"87"
column=
"30"
lean-forward=
"true"
selection-start-line=
"87"
selection-start-column=
"30"
selection-end-line=
"87"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
<element
signature=
"e#275#1694#0"
/>
<element
signature=
"e#1713#2342#0"
/>
<element
signature=
"e#3088#4531#0"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/com
ponents/Index/index.scs
s"
>
<entry
file=
"file://$PROJECT_DIR$/src/com
mon/course/course.j
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"210"
>
<caret
line=
"10"
column=
"27"
lean-forward=
"true"
selection-start-line=
"10"
selection-start-column=
"27"
selection-end-line=
"10"
selection-end-column=
"27"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/course.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"714"
>
<caret
line=
"42"
column=
"20"
lean-forward=
"true"
selection-start-line=
"42"
selection-start-column=
"20"
selection-end-line=
"42"
selection-end-column=
"20"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/course.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"489"
>
<caret
line=
"31"
column=
"21"
lean-forward=
"true"
selection-start-line=
"31"
selection-start-column=
"21"
selection-end-line=
"31"
selection-end-column=
"21"
/>
<state
relative-caret-position=
"231"
>
<caret
line=
"11"
column=
"75"
selection-start-line=
"11"
selection-start-column=
"59"
selection-end-line=
"11"
selection-end-column=
"75"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
</folding>
...
...
@@ -131,12 +103,14 @@
<option
value=
"$PROJECT_DIR$/src/components/Index/carousel.js"
/>
<option
value=
"$PROJECT_DIR$/src/components/Index/carousel.scss"
/>
<option
value=
"$PROJECT_DIR$/src/components/Index/course.scss"
/>
<option
value=
"$PROJECT_DIR$/src/components/Index/index.js"
/>
<option
value=
"$PROJECT_DIR$/src/components/Index/course.js"
/>
<option
value=
"$PROJECT_DIR$/src/common/course/course.scss"
/>
<option
value=
"$PROJECT_DIR$/src/components/Index/index.js"
/>
<option
value=
"$PROJECT_DIR$/src/common/course/course.js"
/>
</list>
</option>
</component>
<component
name=
"ProjectFrameBounds"
extendedState=
"6"
fullScreen=
"true"
>
<component
name=
"ProjectFrameBounds"
fullScreen=
"true"
>
<option
name=
"x"
value=
"38"
/>
<option
name=
"y"
value=
"23"
/>
<option
name=
"width"
value=
"1402"
/>
...
...
@@ -147,6 +121,7 @@
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"Scope"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -163,20 +138,18 @@
<item
name=
"mr-julyedu"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"mr-julyedu"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"com
ponents
"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"com
mon
"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"mr-julyedu"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"mr-julyedu"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"components"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"Index"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
</expand>
<select
/>
</subPane>
</pane>
<pane
id=
"Scope"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -191,7 +164,13 @@
<property
name=
"nodejs_package_manager_path"
value=
"yarn"
/>
</component>
<component
name=
"RecentsManager"
>
<key
name=
"MoveFile.RECENT_KEYS"
>
<recent
name=
"$PROJECT_DIR$/src/common/scroll"
/>
<recent
name=
"$PROJECT_DIR$/src/common/course"
/>
<recent
name=
"$PROJECT_DIR$/src/common/carousel"
/>
</key>
<key
name=
"CopyFile.RECENT_KEYS"
>
<recent
name=
"$PROJECT_DIR$/src/common"
/>
<recent
name=
"$PROJECT_DIR$/src/components/Index"
/>
</key>
</component>
...
...
@@ -237,11 +216,12 @@
<workItem
from=
"1555481509516"
duration=
"2393000"
/>
<workItem
from=
"1555494639819"
duration=
"2193000"
/>
<workItem
from=
"1555583161462"
duration=
"713000"
/>
<workItem
from=
"1555596885912"
duration=
"5052000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"2
0676
000"
/>
<option
name=
"totallyTimeSpent"
value=
"2
5728
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"0"
y=
"0"
width=
"1440"
height=
"900"
extended-state=
"6"
/>
...
...
@@ -271,9 +251,6 @@
<option
name=
"version"
value=
"1"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/src/components/my/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/package-lock.json"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"279"
>
...
...
@@ -310,13 +287,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/components/study/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"168"
>
<caret
line=
"8"
column=
"18"
lean-forward=
"true"
selection-start-line=
"6"
selection-start-column=
"12"
selection-end-line=
"8"
selection-end-column=
"18"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/common/Tabbar/index.js"
/>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/index.css"
/>
<entry
file=
"file://$PROJECT_DIR$/src/common/Nav/index.scss"
>
...
...
@@ -336,46 +306,54 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/com
ponents/Index/topscroll
.js"
>
<entry
file=
"file://$PROJECT_DIR$/src/com
mon/Nav/NavLink/index
.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
84
"
>
<caret
line=
"
4"
lean-forward=
"true"
selection-start-line=
"4"
selection-end-line=
"4
"
/>
<state
relative-caret-position=
"
231
"
>
<caret
line=
"
11"
column=
"40"
lean-forward=
"true"
selection-start-line=
"11"
selection-start-column=
"40"
selection-end-line=
"11"
selection-end-column=
"40
"
/>
<folding>
<element
signature=
"e#0#
39
#0"
expanded=
"true"
/>
<element
signature=
"e#0#
40
#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/
common/index.j
s"
>
<entry
file=
"file://$PROJECT_DIR$/src/
font/iconfont.cs
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"21"
>
<caret
line=
"
1"
column=
"38"
lean-forward=
"true"
selection-start-line=
"1"
selection-start-column=
"38"
selection-end-line=
"1"
selection-end-column=
"38
"
/>
<state
relative-caret-position=
"2
5
1"
>
<caret
line=
"
25"
column=
"9"
selection-start-line=
"25"
selection-start-column=
"1"
selection-end-line=
"25"
selection-end-column=
"9
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/
common/Nav/NavLink/index.j
s"
>
<entry
file=
"file://$PROJECT_DIR$/src/
styles/variable.scs
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"231"
>
<caret
line=
"11"
column=
"40"
lean-forward=
"true"
selection-start-line=
"11"
selection-start-column=
"40"
selection-end-line=
"11"
selection-end-column=
"40"
/>
<folding>
<element
signature=
"e#0#40#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"84"
>
<caret
line=
"4"
column=
"13"
lean-forward=
"true"
selection-start-line=
"4"
selection-end-line=
"5"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
src/menu
.js"
>
<entry
file=
"file://$PROJECT_DIR$/
.history/config/webpack.config_20190418113120
.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"21"
>
<caret
line=
"1"
column=
"31"
lean-forward=
"true"
selection-start-line=
"1"
selection-start-column=
"31"
selection-end-line=
"1"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"e#0#26#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"279"
>
<caret
line=
"267"
column=
"37"
selection-start-line=
"267"
selection-start-column=
"25"
selection-end-line=
"267"
selection-end-column=
"37"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/index.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"210"
>
<caret
line=
"10"
column=
"27"
selection-start-line=
"10"
selection-start-column=
"27"
selection-end-line=
"10"
selection-end-column=
"27"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/components/study/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"126"
>
<caret
line=
"6"
column=
"17"
lean-forward=
"true"
selection-start-line=
"6"
selection-start-column=
"17"
selection-end-line=
"6"
selection-end-column=
"17"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/common/Nav/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
73
"
>
<state
relative-caret-position=
"2
31
"
>
<caret
line=
"13"
column=
"53"
selection-start-line=
"13"
selection-start-column=
"43"
selection-end-line=
"13"
selection-end-column=
"53"
/>
<folding>
<element
signature=
"e#0#41#0"
expanded=
"true"
/>
...
...
@@ -383,54 +361,56 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/font/iconfont.css"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"251"
>
<caret
line=
"25"
column=
"9"
selection-start-line=
"25"
selection-start-column=
"1"
selection-end-line=
"25"
selection-end-column=
"9"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"189"
>
<caret
line=
"9"
column=
"
29"
lean-forward=
"true"
selection-start-line=
"9"
selection-start-column=
"29"
selection-end-line=
"9"
selection-end-column=
"29
"
/>
<caret
line=
"9"
column=
"
11"
lean-forward=
"true"
selection-start-line=
"9"
selection-start-column=
"11"
selection-end-line=
"9"
selection-end-column=
"11
"
/>
<folding>
<element
signature=
"e#0#26#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/
index.cs
s"
>
<entry
file=
"file://$PROJECT_DIR$/src/
menu.j
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"252"
>
<caret
line=
"12"
column=
"14"
selection-start-line=
"12"
selection-start-column=
"14"
selection-end-line=
"12"
selection-end-column=
"14"
/>
<state
relative-caret-position=
"21"
>
<caret
line=
"1"
column=
"31"
lean-forward=
"true"
selection-start-line=
"1"
selection-start-column=
"31"
selection-end-line=
"1"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"e#0#26#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/
styles/variable.scs
s"
>
<entry
file=
"file://$PROJECT_DIR$/src/
common/index.j
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
84
"
>
<caret
line=
"
4"
column=
"13"
lean-forward=
"true"
selection-start-line=
"4"
selection-end-line=
"5
"
/>
<state
relative-caret-position=
"
21
"
>
<caret
line=
"
1"
column=
"38"
lean-forward=
"true"
selection-start-line=
"1"
selection-start-column=
"38"
selection-end-line=
"1"
selection-end-column=
"38
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
.history/config/webpack.config_20190418113120.j
s"
>
<entry
file=
"file://$PROJECT_DIR$/
src/index.cs
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
79
"
>
<caret
line=
"
267"
column=
"37"
selection-start-line=
"267"
selection-start-column=
"25"
selection-end-line=
"267"
selection-end-column=
"37
"
/>
<state
relative-caret-position=
"2
52
"
>
<caret
line=
"
12"
column=
"14"
selection-start-line=
"12"
selection-start-column=
"14"
selection-end-line=
"12"
selection-end-column=
"14
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/carousel.scss"
>
<entry
file=
"file://$PROJECT_DIR$/src/components/my/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/common/scroll/topscroll.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"315"
>
<caret
line=
"15"
lean-forward=
"true"
selection-start-line=
"15"
selection-end-line=
"15"
/>
<state
relative-caret-position=
"31"
>
<caret
line=
"4"
lean-forward=
"true"
selection-start-line=
"4"
selection-end-line=
"4"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/com
ponents/Index
/scroll.js"
>
<entry
file=
"file://$PROJECT_DIR$/src/com
mon/scroll
/scroll.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
26
"
>
<state
relative-caret-position=
"1
05
"
>
<caret
line=
"6"
column=
"25"
lean-forward=
"true"
selection-start-line=
"6"
selection-start-column=
"25"
selection-end-line=
"6"
selection-end-column=
"25"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
...
...
@@ -438,46 +418,49 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/com
ponents/Index/index.j
s"
>
<entry
file=
"file://$PROJECT_DIR$/src/com
mon/carousel/carousel.scs
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"395"
>
<caret
line=
"114"
column=
"51"
lean-forward=
"true"
selection-start-line=
"114"
selection-start-column=
"51"
selection-end-line=
"114"
selection-end-column=
"51"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"315"
>
<caret
line=
"15"
lean-forward=
"true"
selection-start-line=
"15"
selection-end-line=
"15"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/com
ponents/Index
/carousel.js"
>
<entry
file=
"file://$PROJECT_DIR$/src/com
mon/carousel
/carousel.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"63"
>
<caret
line=
"3"
column=
"34"
lean-forward=
"true"
selection-start-line=
"3"
selection-start-column=
"34"
selection-end-line=
"3"
selection-end-column=
"34"
/>
<caret
line=
"3"
column=
"34"
selection-start-line=
"3"
selection-start-column=
"34"
selection-end-line=
"3"
selection-end-column=
"34"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/com
ponents/Index
/course.scss"
>
<entry
file=
"file://$PROJECT_DIR$/src/com
mon/course
/course.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
714
"
>
<caret
line=
"
42"
column=
"20"
lean-forward=
"true"
selection-start-line=
"42"
selection-start-column=
"20"
selection-end-line=
"42"
selection-end-column=
"20
"
/>
<state
relative-caret-position=
"
147
"
>
<caret
line=
"
19"
column=
"22"
lean-forward=
"true"
selection-start-line=
"19"
selection-start-column=
"22"
selection-end-line=
"19"
selection-end-column=
"22
"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/com
ponents/Index/index.scs
s"
>
<entry
file=
"file://$PROJECT_DIR$/src/com
mon/course/course.j
s"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"210"
>
<caret
line=
"10"
column=
"27"
lean-forward=
"true"
selection-start-line=
"10"
selection-start-column=
"27"
selection-end-line=
"10"
selection-end-column=
"27"
/>
<state
relative-caret-position=
"231"
>
<caret
line=
"11"
column=
"75"
selection-start-line=
"11"
selection-start-column=
"59"
selection-end-line=
"11"
selection-end-column=
"75"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/
course
.js"
>
<entry
file=
"file://$PROJECT_DIR$/src/components/Index/
index
.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
489
"
>
<caret
line=
"
31"
column=
"21"
lean-forward=
"true"
selection-start-line=
"31"
selection-start-column=
"21"
selection-end-line=
"31"
selection-end-column=
"21
"
/>
<state
relative-caret-position=
"
334
"
>
<caret
line=
"
87"
column=
"30"
lean-forward=
"true"
selection-start-line=
"87"
selection-start-column=
"30"
selection-end-line=
"87"
selection-end-column=
"30
"
/>
<folding>
<element
signature=
"e#0#39#0"
expanded=
"true"
/>
<element
signature=
"e#275#1694#0"
/>
<element
signature=
"e#1713#2342#0"
/>
<element
signature=
"e#3088#4531#0"
/>
</folding>
</state>
</provider>
...
...
src/com
ponents/Index
/carousel.js
→
src/com
mon/carousel
/carousel.js
View file @
4607dcfa
File moved
src/com
ponents/Index
/carousel.scss
→
src/com
mon/carousel
/carousel.scss
View file @
4607dcfa
File moved
src/com
ponents/Index
/course.js
→
src/com
mon/course
/course.js
View file @
4607dcfa
...
...
@@ -10,21 +10,12 @@ class Course extends Component {
this
.
props
.
data
.
map
((
item
,
index
)
=>
{
return
(
<
li
key
=
{
index
}
>
{
item
.
isbuy
===
1
&&
<
span
className
=
'audition'
>
<
i
className
=
{
'iconfont iconerji'
}
><
/i
>
试听
<
/span>
}
{
this
.
props
.
top
}
<
a
href
=
""
>
<
img
src
=
{
item
.
src
}
alt
=
""
/>
<
p
className
=
"course-title"
>
{
item
.
title
}
<
/p
>
<
/a
>
{
item
.
isbuy
===
0
&&
<
p
className
=
"course-price"
>
<
span
className
=
"new"
>
¥
{
item
.
price0
}
<
/span
>
<
span
className
=
"old"
>
¥
{
item
.
price1
}
<
/span
>
<
/p>
}
{
item
.
isbuy
===
1
&&
<
a
href
=
""
className
=
"isbuy"
>
已购买
<
/a
>
}
{
this
.
props
.
bottom
}
<
/li
>
)
})
...
...
@@ -35,5 +26,6 @@ class Course extends Component {
}
}
export
default
Course
src/com
ponents/Index
/course.scss
→
src/com
mon/course
/course.scss
View file @
4607dcfa
...
...
@@ -9,6 +9,7 @@
margin-top
:
15px
;
margin-bottom
:
5px
;
position
:
relative
;
.audition
{
position
:
absolute
;
top
:
10px
;
...
...
@@ -20,15 +21,17 @@
color
:
#fff
;
text-align
:
center
;
border-radius
:
1px
;
.iconerji
{
font-size
:
14px
!
important
;
font-size
:
14px
!
important
;
display
:
inline-block
;
margin-right
:
4px
;
}
}
img
{
width
:
100%
;
height
:
119px
;
height
:
119px
;
}
.course-title
{
...
...
src/com
ponents/Index
/scroll.js
→
src/com
mon/scroll
/scroll.js
View file @
4607dcfa
File moved
src/com
ponents/Index
/topscroll.js
→
src/com
mon/scroll
/topscroll.js
View file @
4607dcfa
File moved
src/components/Index/index.js
View file @
4607dcfa
import
React
,
{
Component
}
from
'react'
;
import
Course
from
'./course.js'
;
import
Scroll
from
'./scroll.js'
;
import
TopScroll
from
'./topscroll.js'
;
import
Carousel
from
'./carousel.js'
;
import
Course
from
'.
./../common/course
/course.js'
;
import
Scroll
from
'.
./../common/scroll
/scroll.js'
;
import
TopScroll
from
'.
./../common/scroll
/topscroll.js'
;
import
Carousel
from
'.
./../common/carousel
/carousel.js'
;
import
'./index.scss'
;
...
...
@@ -47,22 +47,38 @@ class Index extends Component {
}
],
tabdata
:
[
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'公开课'
},
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'精品特惠'
},
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'赚奖学金'
},
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'每日一题'
},
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'企业内训'
}
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'公开课'
},
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'精品特惠'
},
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'赚奖学金'
},
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'每日一题'
},
{
'src'
:
'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png'
,
'name'
:
'企业内训'
}
]
}
render
()
{
const
top
=
<
div
>
333
<
/div
>
return
(
<
div
className
=
'indexbox'
>
<
TopScroll
data
=
{
this
.
state
.
dataList
}
height
=
'168px'
><
/TopScroll
>
<
div
className
=
"tabbox"
>
<
ul
>
{
this
.
state
.
tabdata
.
map
((
item
,
index
)
=>
{
this
.
state
.
tabdata
.
map
((
item
,
index
)
=>
{
return
(
<
li
key
=
{
index
}
>
<
img
src
=
{
item
.
src
}
alt
=
""
/>
...
...
@@ -77,11 +93,11 @@ class Index extends Component {
<
h2
className
=
"title"
>
近期直播
<
/h2
>
<
Carousel
>
{
this
.
state
.
dataList
.
map
((
item
,
index
)
=>
{
return
(
this
.
state
.
dataList
.
map
((
item
,
index
)
=>
{
return
(
<
li
key
=
{
index
}
className
=
'scroll-item'
>
<
a
href
=
""
>
<
img
className
=
"item-img"
src
=
{
item
.
src
}
alt
=
""
/>
<
img
className
=
"item-img"
src
=
{
item
.
src
}
alt
=
""
/>
<
div
className
=
"item-content"
>
<
h2
className
=
"item-title"
>
{
item
.
title
}
<
/h2
>
<
p
className
=
"item-teacher"
>
讲师:
{
item
.
teacher
}
<
/p
>
...
...
@@ -97,13 +113,20 @@ class Index extends Component {
<
a
href
=
""
>
<
img
src
=
"http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png"
alt
=
""
/>
alt
=
""
/>
<
/a
>
<
/div
>
<
/div
>
<
div
className
=
'category'
>
<
h2
className
=
"title"
>
新上好课
<
/h2
>
<
Course
data
=
{
this
.
state
.
dataList
}
><
/Course
>
<
Course
data
=
{
this
.
state
.
dataList
}
top
=
{
<
span
className
=
'audition'
>
<
i
className
=
{
'iconfont iconerji'
}
><
/i
>
试听
<
/span
>
}
bottom
=
{
<
p
>
{
aaa
}
<
/p
>
}
><
/Course
>
<
/div
>
<
div
className
=
'category'
>
<
h2
className
=
"title"
>
热门推荐
<
/h2
>
...
...
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