Skip to content

M
mr-julyedu
Commit 4607dcfa by xuzhenghua
Options

master

parent ce8cd6c2
Showing with 147 additions and 146 deletions
.idea/workspace.xml
...@@ -2,15 +2,14 @@ ...@@ -2,15 +2,14 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="60bc3527-5f9e-436f-8ed9-968e6eddd66e" name="Default Changelist" comment=""> <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$/.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/carousel.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/carousel/carousel.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.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.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/common/scroll/scroll.js" 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/common/scroll/topscroll.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Index/topscroll.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Index/topscroll.js" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/node_modules/" /> <ignored path="$PROJECT_DIR$/node_modules/" />
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -24,53 +23,26 @@ ...@@ -24,53 +23,26 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/components/Index/index.js"> <entry file="file://$PROJECT_DIR$/src/components/Index/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="395"> <state relative-caret-position="334">
<caret line="114" column="51" lean-forward="true" selection-start-line="114" selection-start-column="51" selection-end-line="114" selection-end-column="51" /> <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> <folding>
<element signature="e#0#39#0" expanded="true" /> <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> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/Index/carousel.js"> <entry file="file://$PROJECT_DIR$/src/common/course/course.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" />
<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/index.scss">
<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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714"> <state relative-caret-position="231">
<caret line="42" column="20" lean-forward="true" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="20" /> <caret line="11" column="75" selection-start-line="11" selection-start-column="59" selection-end-line="11" selection-end-column="75" />
</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" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
...@@ -131,12 +103,14 @@ ...@@ -131,12 +103,14 @@
<option value="$PROJECT_DIR$/src/components/Index/carousel.js" /> <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/carousel.scss" />
<option value="$PROJECT_DIR$/src/components/Index/course.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/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> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6" fullScreen="true"> <component name="ProjectFrameBounds" fullScreen="true">
<option name="x" value="38" /> <option name="x" value="38" />
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1402" /> <option name="width" value="1402" />
...@@ -147,6 +121,7 @@ ...@@ -147,6 +121,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -163,20 +138,18 @@ ...@@ -163,20 +138,18 @@
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" /> <item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" /> <item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" /> <item name="common" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" /> <item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" /> <item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" /> <item name="components" type="462c0819:PsiDirectoryNode" />
<item name="Index" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -191,7 +164,13 @@ ...@@ -191,7 +164,13 @@
<property name="nodejs_package_manager_path" value="yarn" /> <property name="nodejs_package_manager_path" value="yarn" />
</component> </component>
<component name="RecentsManager"> <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"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/common" />
<recent name="$PROJECT_DIR$/src/components/Index" /> <recent name="$PROJECT_DIR$/src/components/Index" />
</key> </key>
</component> </component>
...@@ -237,11 +216,12 @@ ...@@ -237,11 +216,12 @@
<workItem from="1555481509516" duration="2393000" /> <workItem from="1555481509516" duration="2393000" />
<workItem from="1555494639819" duration="2193000" /> <workItem from="1555494639819" duration="2193000" />
<workItem from="1555583161462" duration="713000" /> <workItem from="1555583161462" duration="713000" />
<workItem from="1555596885912" duration="5052000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="20676000" /> <option name="totallyTimeSpent" value="25728000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="6" /> <frame x="0" y="0" width="1440" height="900" extended-state="6" />
...@@ -271,9 +251,6 @@ ...@@ -271,9 +251,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="editorHistoryManager"> <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"> <entry file="file://$PROJECT_DIR$/package-lock.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279"> <state relative-caret-position="279">
...@@ -310,13 +287,6 @@ ...@@ -310,13 +287,6 @@
</state> </state>
</provider> </provider>
</entry> </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/common/Tabbar/index.js" />
<entry file="file://$PROJECT_DIR$/src/components/Index/index.css" /> <entry file="file://$PROJECT_DIR$/src/components/Index/index.css" />
<entry file="file://$PROJECT_DIR$/src/common/Nav/index.scss"> <entry file="file://$PROJECT_DIR$/src/common/Nav/index.scss">
...@@ -336,46 +306,54 @@ ...@@ -336,46 +306,54 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/topscroll.js"> <entry file="file://$PROJECT_DIR$/src/common/Nav/NavLink/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84"> <state relative-caret-position="231">
<caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" /> <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> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#40#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/common/index.js"> <entry file="file://$PROJECT_DIR$/src/font/iconfont.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="21"> <state relative-caret-position="251">
<caret line="1" column="38" lean-forward="true" selection-start-line="1" selection-start-column="38" selection-end-line="1" selection-end-column="38" /> <caret line="25" column="9" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/common/Nav/NavLink/index.js"> <entry file="file://$PROJECT_DIR$/src/styles/variable.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231"> <state relative-caret-position="84">
<caret line="11" column="40" lean-forward="true" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" /> <caret line="4" column="13" lean-forward="true" selection-start-line="4" selection-end-line="5" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="21"> <state relative-caret-position="279">
<caret line="1" column="31" lean-forward="true" selection-start-line="1" selection-start-column="31" selection-end-line="1" selection-end-column="31" /> <caret line="267" column="37" selection-start-line="267" selection-start-column="25" selection-end-line="267" selection-end-column="37" />
<folding> </state>
<element signature="e#0#26#0" expanded="true" /> </provider>
</folding> </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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/common/Nav/index.js"> <entry file="file://$PROJECT_DIR$/src/common/Nav/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273"> <state relative-caret-position="231">
<caret line="13" column="53" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="53" /> <caret line="13" column="53" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="53" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#41#0" expanded="true" />
...@@ -383,54 +361,56 @@ ...@@ -383,54 +361,56 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/src/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189"> <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> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/index.css"> <entry file="file://$PROJECT_DIR$/src/menu.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="21">
<caret line="12" column="14" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/styles/variable.scss"> <entry file="file://$PROJECT_DIR$/src/common/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84"> <state relative-caret-position="21">
<caret line="4" column="13" lean-forward="true" selection-start-line="4" selection-end-line="5" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.history/config/webpack.config_20190418113120.js"> <entry file="file://$PROJECT_DIR$/src/index.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279"> <state relative-caret-position="252">
<caret line="267" column="37" selection-start-line="267" selection-start-column="25" selection-end-line="267" selection-end-column="37" /> <caret line="12" column="14" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="31">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/scroll.js"> <entry file="file://$PROJECT_DIR$/src/common/scroll/scroll.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126"> <state relative-caret-position="105">
<caret line="6" column="25" lean-forward="true" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" /> <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> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
...@@ -438,46 +418,49 @@ ...@@ -438,46 +418,49 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/index.js"> <entry file="file://$PROJECT_DIR$/src/common/carousel/carousel.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="395"> <state relative-caret-position="315">
<caret line="114" column="51" lean-forward="true" selection-start-line="114" selection-start-column="51" selection-end-line="114" selection-end-column="51" /> <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/carousel.js"> <entry file="file://$PROJECT_DIR$/src/common/carousel/carousel.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="63"> <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> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/course.scss"> <entry file="file://$PROJECT_DIR$/src/common/course/course.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714"> <state relative-caret-position="147">
<caret line="42" column="20" lean-forward="true" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="20" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/index.scss"> <entry file="file://$PROJECT_DIR$/src/common/course/course.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="231">
<caret line="10" column="27" lean-forward="true" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" /> <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> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="489"> <state relative-caret-position="334">
<caret line="31" column="21" lean-forward="true" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" /> <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> <folding>
<element signature="e#0#39#0" expanded="true" /> <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> </folding>
</state> </state>
</provider> </provider>
......
src/components/Index/course.js → src/common/course/course.js
...@@ -10,21 +10,12 @@ class Course extends Component { ...@@ -10,21 +10,12 @@ class Course extends Component {
this.props.data.map((item, index) => { this.props.data.map((item, index) => {
return ( return (
<li key={index}> <li key={index}>
{item.isbuy === 1 && <span className='audition'> {this.props.top}
<i className={'iconfont iconerji'}></i>
试听
</span>}
<a href=""> <a href="">
<img src={item.src} alt=""/> <img src={item.src} alt=""/>
<p className="course-title">{item.title}</p> <p className="course-title">{item.title}</p>
</a> </a>
{item.isbuy === 0 && <p className="course-price"> {this.props.bottom}
<span className="new">¥{item.price0}</span>
<span className="old">¥{item.price1}</span>
</p>}
{item.isbuy === 1 &&
<a href="" className="isbuy">已购买</a>
}
</li> </li>
) )
}) })
...@@ -35,5 +26,6 @@ class Course extends Component { ...@@ -35,5 +26,6 @@ class Course extends Component {
} }
} }
export default Course export default Course
src/components/Index/course.scss → src/common/course/course.scss
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
margin-top: 15px; margin-top: 15px;
margin-bottom: 5px; margin-bottom: 5px;
position: relative; position: relative;
.audition { .audition {
position: absolute; position: absolute;
top: 10px; top: 10px;
...@@ -20,15 +21,17 @@ ...@@ -20,15 +21,17 @@
color: #fff; color: #fff;
text-align: center; text-align: center;
border-radius: 1px; border-radius: 1px;
.iconerji { .iconerji {
font-size: 14px!important; font-size: 14px !important;
display: inline-block; display: inline-block;
margin-right: 4px; margin-right: 4px;
} }
} }
img { img {
width: 100%; width: 100%;
height:119px; height: 119px;
} }
.course-title { .course-title {
......
src/components/Index/index.js
import React, {Component} from 'react'; import React, {Component} from 'react';
import Course from './course.js'; import Course from '../../common/course/course.js';
import Scroll from './scroll.js'; import Scroll from '../../common/scroll/scroll.js';
import TopScroll from './topscroll.js'; import TopScroll from '../../common/scroll/topscroll.js';
import Carousel from './carousel.js'; import Carousel from '../../common/carousel/carousel.js';
import './index.scss'; import './index.scss';
...@@ -47,22 +47,38 @@ class Index extends Component { ...@@ -47,22 +47,38 @@ class Index extends Component {
} }
], ],
tabdata: [ 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',
{'src':'http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png','name':'赚奖学金'}, '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() { render() {
const top = <div>333</div>
return ( return (
<div className='indexbox'> <div className='indexbox'>
<TopScroll data={this.state.dataList} height='168px'></TopScroll> <TopScroll data={this.state.dataList} height='168px'></TopScroll>
<div className="tabbox"> <div className="tabbox">
<ul> <ul>
{ {
this.state.tabdata.map((item,index)=>{ this.state.tabdata.map((item, index) => {
return ( return (
<li key={index}> <li key={index}>
<img src={item.src} alt=""/> <img src={item.src} alt=""/>
...@@ -77,11 +93,11 @@ class Index extends Component { ...@@ -77,11 +93,11 @@ class Index extends Component {
<h2 className="title">近期直播</h2> <h2 className="title">近期直播</h2>
<Carousel> <Carousel>
{ {
this.state.dataList.map((item,index)=>{ this.state.dataList.map((item, index) => {
return( return (
<li key={index} className='scroll-item'> <li key={index} className='scroll-item'>
<a href=""> <a href="">
<img className="item-img" src={item.src} alt="" /> <img className="item-img" src={item.src} alt=""/>
<div className="item-content"> <div className="item-content">
<h2 className="item-title">{item.title}</h2> <h2 className="item-title">{item.title}</h2>
<p className="item-teacher">讲师：{item.teacher}</p> <p className="item-teacher">讲师：{item.teacher}</p>
...@@ -97,13 +113,20 @@ class Index extends Component { ...@@ -97,13 +113,20 @@ class Index extends Component {
<a href=""> <a href="">
<img <img
src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png" src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/home/5afe433d01.png"
alt="" /> alt=""/>
</a> </a>
</div> </div>
</div> </div>
<div className='category'> <div className='category'>
<h2 className="title">新上好课</h2> <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>
<div className='category'> <div className='category'>
<h2 className="title">热门推荐</h2> <h2 className="title">热门推荐</h2>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment