Skip to content

M
mr-julyedu
Commit 3102358e by xuzhenghua
Options

a标签

parent de0a67fe
Showing with 61 additions and 57 deletions
.idea/workspace.xml
...@@ -3,12 +3,8 @@ ...@@ -3,12 +3,8 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/Courseload/index.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/Courseload/listview.scss" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/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" />
<change beforePath="$PROJECT_DIR$/src/components/classify/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/index.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/" />
...@@ -22,11 +18,11 @@ ...@@ -22,11 +18,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="false"> <file pinned="false" current-in-tab="true">
<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="153"> <state relative-caret-position="168">
<caret line="61" column="40" lean-forward="true" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="40" /> <caret line="8" column="42" selection-start-line="8" selection-start-column="42" selection-end-line="8" selection-end-column="42" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
...@@ -37,20 +33,8 @@ ...@@ -37,20 +33,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="379"> <state relative-caret-position="336">
<caret line="21" column="23" lean-forward="true" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" /> <caret line="16" column="16" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/components/classify/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="103" column="46" selection-start-line="103" selection-start-column="46" selection-end-line="103" selection-end-column="46" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -82,9 +66,9 @@ ...@@ -82,9 +66,9 @@
<option value="$PROJECT_DIR$/src/common/Courseload/index.js" /> <option value="$PROJECT_DIR$/src/common/Courseload/index.js" />
<option value="$PROJECT_DIR$/src/common/index.js" /> <option value="$PROJECT_DIR$/src/common/index.js" />
<option value="$PROJECT_DIR$/src/components/Index/index.js" /> <option value="$PROJECT_DIR$/src/components/Index/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/components/classify/index.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -120,7 +104,14 @@ ...@@ -120,7 +104,14 @@
<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="VList" type="462c0819:PsiDirectoryNode" /> <item name="Carousel" 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="common" type="462c0819:PsiDirectoryNode" />
<item name="Course" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" /> <item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
...@@ -147,6 +138,13 @@ ...@@ -147,6 +138,13 @@
<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="my" 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="study" type="462c0819:PsiDirectoryNode" /> <item name="study" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
...@@ -201,18 +199,18 @@ ...@@ -201,18 +199,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="6239000" /> <workItem from="1555900140776" duration="7056000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6826000" /> <option name="totallyTimeSpent" value="7643000" />
</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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16420014" /> <window_info 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" />
...@@ -225,7 +223,7 @@ ...@@ -225,7 +223,7 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<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="Terminal" order="9" /> <window_info anchor="bottom" id="Terminal" order="9" weight="0.32891566" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<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" />
...@@ -291,16 +289,6 @@ ...@@ -291,16 +289,6 @@
</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="210">
<caret line="10" column="16" lean-forward="true" selection-end-line="18" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Courseload/index.scss"> <entry file="file://$PROJECT_DIR$/src/common/Courseload/index.scss">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -398,27 +386,44 @@ ...@@ -398,27 +386,44 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss"> <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="379"> <state relative-caret-position="-269">
<caret line="21" column="23" lean-forward="true" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" /> <caret line="60" column="30" lean-forward="true" selection-start-line="60" selection-start-column="30" selection-end-line="60" selection-end-column="30" />
<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/common/Course/course.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="7" column="16" lean-forward="true" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Course/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="189">
<caret line="61" column="40" lean-forward="true" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="40" /> <caret line="9" column="58" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="58" />
<folding> <folding>
<element signature="e#0#39#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/components/classify/index.js"> <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="272"> <state relative-caret-position="336">
<caret line="103" column="46" selection-start-line="103" selection-start-column="46" selection-end-line="103" selection-end-column="46" /> <caret line="16" column="16" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="8" column="42" selection-start-line="8" selection-start-column="42" selection-end-line="8" selection-end-column="42" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
......
src/components/classify/courselist.js
...@@ -6,12 +6,12 @@ class Classify extends Component { ...@@ -6,12 +6,12 @@ class Classify extends Component {
state = { state = {
mockData:[ mockData:[
{ {
title: '三月面试求职班', title: '三月面试求职三月面试求职三月面试求职',
imgUrl: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/4c5ccac604.jpg', imgUrl: 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/4c5ccac604.jpg',
contact: 'QQ群：449141326', contact: '学习到第2课2三月面试求职班三月面试求职班三月面试求职班分33秒6',
time: '03月12日', time: '03月12日',
record: '学习到第2课2分33秒', record: '学习到第2课2三月面试求职班三月面试求职班三月面试求职班分33秒',
isbuy: 0, isbuy: 1,
price0: 100, price0: 100,
price1: 100 price1: 100
}, },
...@@ -58,8 +58,8 @@ class Classify extends Component { ...@@ -58,8 +58,8 @@ 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'>{item.title}</p> <p className='title text-overflow-2'>{item.title}</p>
<p className='contact'>{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">
<span className="new">¥{item.price0}</span> <span className="new">¥{item.price0}</span>
......
src/components/classify/courselist.scss
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
.v-list-item { .v-list-item {
.content { .content {
border: none; border: none;
.cover { .cover {
flex: inherit; flex: inherit;
width: 42.2%;
} }
} }
.info { .info {
width: 52.3%;
.title { .title {
font-size: 16px; font-size: 16px;
color: $color_333; color: $color_333;
...@@ -19,9 +20,8 @@ ...@@ -19,9 +20,8 @@
margin-top: 14px; margin-top: 14px;
} }
.des { .des {
margin-top: 25px;
.course-price { .course-price {
margin-top: 15px;
.new { .new {
color: $red; color: $red;
font-size: 15px; font-size: 15px;
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
.isbuy { .isbuy {
display: inline-block; display: inline-block;
margin-top: 15px;
width: 61px; width: 61px;
height: 18px; height: 18px;
background-color: $bg_active; background-color: $bg_active;
......
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