Skip to content

M
mr-julyedu
Commit 8c55c8bc by xuzhenghua
Options

大小写

parent 3102358e
Showing with 72 additions and 66 deletions
.idea/workspace.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +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/common/Topscroll/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/Topscroll/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/classify/courselist.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/courselist.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/components/classify/courselist.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/courselist.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/classify/courselist.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/courselist.scss" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/components/classify/courselist.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/courselist.scss" afterDir="false" />
</list> </list>
...@@ -18,11 +18,23 @@ ...@@ -18,11 +18,23 @@
</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/classify/courselist.js"> <entry file="file://$PROJECT_DIR$/src/components/classify/courselist.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168"> <state relative-caret-position="101">
<caret line="8" column="42" selection-start-line="8" selection-start-column="42" selection-end-line="8" selection-end-column="42" /> <caret line="52" column="27" lean-forward="true" selection-start-line="52" selection-start-column="27" selection-end-line="53" selection-end-column="9" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/common/Topscroll/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="379">
<caret line="23" selection-start-line="23" selection-end-line="23" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
...@@ -33,8 +45,8 @@ ...@@ -33,8 +45,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss"> <entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="147">
<caret line="16" column="16" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" /> <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -69,6 +81,7 @@ ...@@ -69,6 +81,7 @@
<option value="$PROJECT_DIR$/src/components/classify/index.js" /> <option value="$PROJECT_DIR$/src/components/classify/index.js" />
<option value="$PROJECT_DIR$/src/components/classify/courselist.scss" /> <option value="$PROJECT_DIR$/src/components/classify/courselist.scss" />
<option value="$PROJECT_DIR$/src/components/classify/courselist.js" /> <option value="$PROJECT_DIR$/src/components/classify/courselist.js" />
<option value="$PROJECT_DIR$/src/common/Topscroll/index.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -104,54 +117,20 @@ ...@@ -104,54 +117,20 @@
<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="common" type="462c0819:PsiDirectoryNode" /> <item name="common" type="462c0819:PsiDirectoryNode" />
<item name="Carousel" type="462c0819:PsiDirectoryNode" /> <item name="Scroll" 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="common" type="462c0819:PsiDirectoryNode" /> <item name="common" type="462c0819:PsiDirectoryNode" />
<item name="Course" type="462c0819:PsiDirectoryNode" /> <item name="Topscroll" 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" />
</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="classify" 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>
<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="my" 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="study" 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="styles" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -199,18 +178,18 @@ ...@@ -199,18 +178,18 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1555481508116</updated> <updated>1555481508116</updated>
<workItem from="1555481509516" duration="544000" /> <workItem from="1555481509516" duration="544000" />
<workItem from="1555900140776" duration="7056000" /> <workItem from="1555900140776" duration="7767000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7643000" /> <option name="totallyTimeSpent" value="8354000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" /> <frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16420014" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16420014" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="npm" order="2" side_tool="true" /> <window_info id="npm" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
...@@ -379,13 +358,6 @@ ...@@ -379,13 +358,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Index/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="65">
<caret line="178" selection-start-line="178" selection-end-line="206" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/index.js"> <entry file="file://$PROJECT_DIR$/src/components/classify/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-269"> <state relative-caret-position="-269">
...@@ -396,6 +368,16 @@ ...@@ -396,6 +368,16 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/common/Course/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="9" column="58" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="58" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Course/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="147"> <state relative-caret-position="147">
...@@ -403,27 +385,44 @@ ...@@ -403,27 +385,44 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/common/Course/index.js"> <entry file="file://$PROJECT_DIR$/src/components/Index/index.scss">
<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="354">
<caret line="9" column="58" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="58" /> <caret line="95" column="5" selection-start-line="95" selection-start-column="5" selection-end-line="97" selection-end-column="25" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss"> <entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="147">
<caret line="16" column="16" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" /> <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Scroll/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="15" column="25" lean-forward="true" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.js"> <entry file="file://$PROJECT_DIR$/src/components/classify/courselist.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168"> <state relative-caret-position="101">
<caret line="8" column="42" selection-start-line="8" selection-start-column="42" selection-end-line="8" selection-end-column="42" /> <caret line="52" column="27" lean-forward="true" selection-start-line="52" selection-start-column="27" selection-end-line="53" selection-end-column="9" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Topscroll/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="379">
<caret line="23" selection-start-line="23" selection-end-line="23" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
......
src/common/Topscroll/index.js
...@@ -21,7 +21,6 @@ class Topscroll extends Component { ...@@ -21,7 +21,6 @@ class Topscroll extends Component {
background: '#fff', background: '#fff',
borderRadius: '4px', borderRadius: '4px',
}} }}
beforeChange={(from, to) => console.log(`slide from ${from} to ${to}`)}
afterChange={index => this.setState({ slideIndex: index })} afterChange={index => this.setState({ slideIndex: index })}
> >
{this.props.data.map((val, index) => ( {this.props.data.map((val, index) => (
......
src/components/classify/courselist.js
...@@ -58,7 +58,7 @@ class Classify extends Component { ...@@ -58,7 +58,7 @@ class Classify extends Component {
{this.state.mockData.map((item, index) => { {this.state.mockData.map((item, index) => {
const Info = ( const Info = (
<div className="info"> <div className="info">
<p className='title text-overflow-2'>{item.title}</p> <p className='title'>{item.title}</p>
<p className='contact text-overflow-2'>{item.contact}</p> <p className='contact text-overflow-2'>{item.contact}</p>
<div className='des'> <div className='des'>
{item.isbuy === 0 && <p className="course-price"> {item.isbuy === 0 && <p className="course-price">
...@@ -73,7 +73,7 @@ class Classify extends Component { ...@@ -73,7 +73,7 @@ class Classify extends Component {
</div> </div>
) )
return ( return (
<VList handleClick={handleClick} {...item} key={index} info={Info}></VList> <VList handleClick={handleClick} key={index} info={Info}></VList>
) )
})} })}
</ul> </ul>
......
src/components/classify/courselist.scss
...@@ -5,14 +5,21 @@ ...@@ -5,14 +5,21 @@
.cover { .cover {
flex: inherit; flex: inherit;
width: 42.2%; width: 42.2%;
img {
width: 100%;
}
} }
} }
.info { .info {
width: 52.3%; width: 52.3%;
position: relative;
.title { .title {
font-size: 16px; font-size: 16px;
color: $color_333; color: $color_333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.contact { .contact {
font-size: 14px; font-size: 14px;
...@@ -20,7 +27,8 @@ ...@@ -20,7 +27,8 @@
margin-top: 14px; margin-top: 14px;
} }
.des { .des {
margin-top: 25px; position: absolute;
bottom: 0;
.course-price { .course-price {
.new { .new {
color: $red; color: $red;
......
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