Skip to content

M
mr-julyedu
Commit 55e85b36 by xuzhenghua
Options

master

parent 631e7c00
Showing with 20 additions and 33 deletions
.idea/workspace.xml
...@@ -2,14 +2,7 @@ ...@@ -2,14 +2,7 @@
<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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Index/index.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> </list>
<ignored path="$PROJECT_DIR$/node_modules/" /> <ignored path="$PROJECT_DIR$/node_modules/" />
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -23,11 +16,11 @@ ...@@ -23,11 +16,11 @@
</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="true"> <file pinned="false" current-in-tab="false">
<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="334"> <state relative-caret-position="430">
<caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" /> <caret line="121" column="53" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="53" />
<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#275#1694#0" />
...@@ -38,11 +31,11 @@ ...@@ -38,11 +31,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/common/course/course.js"> <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="231"> <state relative-caret-position="252">
<caret line="11" column="75" selection-start-line="11" selection-start-column="59" selection-end-line="11" selection-end-column="75" /> <caret line="12" column="52" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="52" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
...@@ -105,8 +98,8 @@ ...@@ -105,8 +98,8 @@
<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/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/common/course/course.scss" />
<option value="$PROJECT_DIR$/src/components/Index/index.js" />
<option value="$PROJECT_DIR$/src/common/course/course.js" /> <option value="$PROJECT_DIR$/src/common/course/course.js" />
<option value="$PROJECT_DIR$/src/components/Index/index.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -140,12 +133,6 @@ ...@@ -140,12 +133,6 @@
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" /> <item name="common" type="462c0819:PsiDirectoryNode" />
</path> </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" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -216,12 +203,12 @@ ...@@ -216,12 +203,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" /> <workItem from="1555596885912" duration="5360000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="25728000" /> <option name="totallyTimeSpent" value="26036000" />
</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" />
...@@ -241,7 +228,7 @@ ...@@ -241,7 +228,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="10" /> <window_info anchor="bottom" id="Terminal" order="10" weight="0.32891566" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
...@@ -442,25 +429,25 @@ ...@@ -442,25 +429,25 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/common/course/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="231"> <state relative-caret-position="430">
<caret line="11" column="75" selection-start-line="11" selection-start-column="59" selection-end-line="11" selection-end-column="75" /> <caret line="121" column="53" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="53" />
<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>
<entry file="file://$PROJECT_DIR$/src/components/Index/index.js"> <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="334"> <state relative-caret-position="252">
<caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" /> <caret line="12" column="52" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="52" />
<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/index.js
...@@ -125,7 +125,7 @@ class Index extends Component { ...@@ -125,7 +125,7 @@ class Index extends Component {
试听 试听
</span> </span>
} bottom = { } bottom = {
<p>{aaa}</p> <p>{top}</p>
}></Course> }></Course>
</div> </div>
<div className='category'> <div className='category'>
......
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