Skip to content

B
biz.qingxiao.com
Commit bb14bb52 authored by wangxuelai's avatar wangxuelai
Browse files
Options

''

parent cc0b9bff
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 21 deletions
index.html
View file @ bb14bb52
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script src="dist/main.js?1574661027178" charset="utf-8"></script> <script src="dist/main.js?1574664499625" charset="utf-8"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/pages/coursegather/detail/CourseBox.js
View file @ bb14bb52
...@@ -128,7 +128,7 @@ class CourseBoxForm extends React.Component { ...@@ -128,7 +128,7 @@ class CourseBoxForm extends React.Component {
}} }}
dataSource={list} dataSource={list}
renderItem={item => ( renderItem={item => (
<List.Item style={{ minWidth: '320px' }}> <List.Item style={{ minWidth: '320px' }} className={pageStyle.listitem}>
<Card bodyStyle={{ padding: 20, minWidth: '320px' }}> <Card bodyStyle={{ padding: 20, minWidth: '320px' }}>
<Card.Meta <Card.Meta
style={{ padding: 0, borderRadius: '6px' }} style={{ padding: 0, borderRadius: '6px' }}
...@@ -139,10 +139,33 @@ class CourseBoxForm extends React.Component { ...@@ -139,10 +139,33 @@ class CourseBoxForm extends React.Component {
</div> </div>
} }
description={ description={
<span className={pageStyle.itemTime}>{item.created_at}</span> <div>
<span className={pageStyle.itemTime}>{item.created_at}</span>
<div>
<span className="hreflink" style={{ marginRight: '20px', color: '#2194FF', lineHeight: 1 }}>编辑课件</span>
<span className="hreflink" onClick={() => toEditSingleCourse(item)} style={{ marginRight: '20px', color: '#2194FF', lineHeight: 1 }}>管理课程</span>
<Dropdown
className={pageStyle.editStatus}
overlay={
<Menu>
<Menu.Item key="0">
<span onClick={() => changeStatus(item)}>{item.status === 1 ? '下架' : '上架'}</span>
</Menu.Item>
<Menu.Item key="1">
<span onClick={() => delGatherCourse(item)}>删除</span>
</Menu.Item>
</Menu>
}
trigger={['click']}
>
<span className="hreflink" style={{ marginRight: '20px', color: '#2194FF', lineHeight: 1 }}>更多</span>
</Dropdown>
</div>
</div>
} }
/> />
<div className={pageStyle.editbtn}> {item.status == 2 && <img className={pageStyle.notpublishicon} src={`${__IMGCDN__}/course/notpublish_b.png`} alt="" />}
{/* <div className={pageStyle.editbtn}>
<div className={pageStyle.itemBtn} onClick={() => toEditSingleCourse(item)}> <div className={pageStyle.itemBtn} onClick={() => toEditSingleCourse(item)}>
<Icon style={{ marginRight: 5 }} type="edit" /> 编辑课程 <Icon style={{ marginRight: 5 }} type="edit" /> 编辑课程
</div> </div>
...@@ -162,7 +185,7 @@ class CourseBoxForm extends React.Component { ...@@ -162,7 +185,7 @@ class CourseBoxForm extends React.Component {
> >
<div className={pageStyle.moreoperate}>更多</div> <div className={pageStyle.moreoperate}>更多</div>
</Dropdown> </Dropdown>
</div> </div> */}
</Card> </Card>
</List.Item> </List.Item>
)} )}
......
src/pages/coursegather/detail/CourseBox.less
View file @ bb14bb52
...@@ -28,20 +28,21 @@ ...@@ -28,20 +28,21 @@
.itemTitleWrap { .itemTitleWrap {
position: relative; position: relative;
.itemTitle { .itemTitle {
max-height: 46px; max-height: 33px;
min-height:46px; min-height: 33px;
text-overflow: ellipsis; text-overflow: ellipsis;
word-break:break-all; word-break:break-all;
white-space: normal; white-space: normal;
word-wrap: break-word; word-wrap: break-word;
// width: 90%; // width: 90%;
font-size: 15px; font-size: 14px;
overflow: hidden; overflow: hidden;
display: -webkit-box; display: -webkit-box;
align-items:center; align-items:center;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
color: #575757; color: #575757;
line-height: 1.2;
} }
.deleteIcon { .deleteIcon {
position: absolute; position: absolute;
...@@ -56,7 +57,7 @@ ...@@ -56,7 +57,7 @@
font-weight:400; font-weight:400;
color:rgba(124,124,124,1); color:rgba(124,124,124,1);
display: inline-block; display: inline-block;
margin-top: 10px; margin-bottom: 10px;
} }
.editbtn { .editbtn {
display: flex; display: flex;
...@@ -85,7 +86,17 @@ ...@@ -85,7 +86,17 @@
color: #808080; color: #808080;
background-color: #EEEEEE; background-color: #EEEEEE;
} }
} }
.listitem {
position: relative;
}
.notpublishicon {
bottom: 28px;
right: 44px;
width: 71px;
height: 44px;
position: absolute;
}
} }
.noData { .noData {
width: 100%; width: 100%;
......
src/pages/coursegather/detail/index.js
View file @ bb14bb52
...@@ -706,7 +706,7 @@ class StaticCenter extends React.Component { ...@@ -706,7 +706,7 @@ class StaticCenter extends React.Component {
<div className={pageStyle.gatherstatus}>已发布</div> <div className={pageStyle.gatherstatus}>已发布</div>
} }
{gatherDetail.status && gatherDetail.status == 2 && {gatherDetail.status && gatherDetail.status == 2 &&
<div className={pageStyle.gatherstatus}>已下架</div> <div className={pageStyle.gatherstatusnotpublish}>已下架</div>
} }
<div className={pageStyle.gathertime}>创建于：{gatherDetail.created_at || ''}</div> <div className={pageStyle.gathertime}>创建于：{gatherDetail.created_at || ''}</div>
</div> </div>
......
src/pages/coursegather/detail/index.less
View file @ bb14bb52
...@@ -50,6 +50,17 @@ ...@@ -50,6 +50,17 @@
padding: 0 7px; padding: 0 7px;
line-height: 21px; line-height: 21px;
} }
.gatherstatusnotpublish {
color: #FF3B3B;
border:1px solid rgba(255,59,59,1);
background-color: #fff;
background:rgba(255,59,59,0.05);
border-radius: 4px;
margin-right: 10px;
text-align: center;
padding: 0 7px;
line-height: 21px;
}
.gathertime { .gathertime {
color: #7C7C7C; color: #7C7C7C;
font-size: 14px; font-size: 14px;
......
src/pages/coursegather/index/Card.js
View file @ bb14bb52
...@@ -23,6 +23,7 @@ const MediaCard = (props) => { ...@@ -23,6 +23,7 @@ const MediaCard = (props) => {
<div className={pageStyle.coursecount}><span style={{ color: 'red', paddingRight: '2px' }}>{info.sub_courses_count}</span>个课程</div> <div className={pageStyle.coursecount}><span style={{ color: 'red', paddingRight: '2px' }}>{info.sub_courses_count}</span>个课程</div>
</div> </div>
</div> </div>
{info.status == 2 && <img className={pageStyle.notpublishicon} src={`${__IMGCDN__}/course/notpublish_a.png`} alt="" />}
</div> </div>
); );
}; };
......
src/pages/coursegather/index/Card.less
View file @ bb14bb52
...@@ -8,7 +8,15 @@ ...@@ -8,7 +8,15 @@
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
padding: 10px; padding: 10px;
display: flex; display: flex;
position: relative;
cursor: pointer; cursor: pointer;
.notpublishicon {
width: 49px;
height: 43px;
position: absolute;
right: 13px;
bottom: 7px;
}
.image { .image {
width: 90px; width: 90px;
height: 90px; height: 90px;
......
src/pages/onlineclasses/singleclass/index.js
View file @ bb14bb52
...@@ -157,8 +157,8 @@ class ClassMgtForm extends React.Component { ...@@ -157,8 +157,8 @@ class ClassMgtForm extends React.Component {
} }
dataSource={courseList} dataSource={courseList}
renderItem={item => ( renderItem={item => (
<List.Item> <List.Item className={pageStyle.listitem}>
<Card bodyStyle={{ padding: 20, minHeight: 172 }}> <Card bodyStyle={{ padding: 20 }}>
<Card.Meta <Card.Meta
style={{ padding: 0 }} style={{ padding: 0 }}
avatar={ avatar={
...@@ -171,12 +171,19 @@ class ClassMgtForm extends React.Component { ...@@ -171,12 +171,19 @@ class ClassMgtForm extends React.Component {
</div> </div>
} }
description={ description={
<span className={pageStyle.itemTime}>{item.created_at}</span> <div>
<div className={pageStyle.itemTime}>{item.created_at}</div>
<div>
<span className="hreflink" style={{ paddingRight: '20px', color: '#2194FF', lineHeight: 1 }}>上传课件</span>
<span className="hreflink" style={{ color: '#2194FF', lineHeight: 1 }} onClick={() => this.goEditCourse(item.id)}>管理课程</span>
</div>
</div>
} }
/> />
<div className={pageStyle.itemBtn} onClick={() => this.goEditCourse(item.id)}> {item.status == 2 && <img className={pageStyle.notpublishicon} src={`${__IMGCDN__}/course/notpublish_b.png`} alt="" />}
{/* <div className={pageStyle.itemBtn} onClick={() => this.goEditCourse(item.id)}>
<Icon style={{ marginRight: 5 }} type="edit" /> 编辑课程 <Icon style={{ marginRight: 5 }} type="edit" /> 编辑课程
</div> </div> */}
</Card> </Card>
</List.Item> </List.Item>
)} )}
......
src/pages/onlineclasses/singleclass/index.less
View file @ bb14bb52
...@@ -32,14 +32,15 @@ ...@@ -32,14 +32,15 @@
.itemTitleWrap { .itemTitleWrap {
position: relative; position: relative;
.itemTitle { .itemTitle {
max-height: 46px; line-height: 1.2;
min-height:46px; max-height: 33px;
min-height: 33px;
text-overflow: ellipsis; text-overflow: ellipsis;
word-break:break-all; word-break:break-all;
white-space: normal; white-space: normal;
word-wrap: break-word; word-wrap: break-word;
width: 90%; width: 90%;
font-size: 15px; font-size: 14px;
overflow: hidden; overflow: hidden;
display: -webkit-box; display: -webkit-box;
align-items:center; align-items:center;
...@@ -63,7 +64,9 @@ ...@@ -63,7 +64,9 @@
font-weight:400; font-weight:400;
color:rgba(124,124,124,1); color:rgba(124,124,124,1);
display: inline-block; display: inline-block;
margin-top: 10px; line-height: 1;
margin-bottom: 10px;
// margin-top: 10px;
} }
.itemBtn { .itemBtn {
width: 210px; width: 210px;
...@@ -78,6 +81,16 @@ ...@@ -78,6 +81,16 @@
margin: 20px auto 0; margin: 20px auto 0;
cursor: pointer; cursor: pointer;
} }
.listitem {
position: relative;
}
.notpublishicon {
bottom: 28px;
right: 44px;
width: 71px;
height: 44px;
position: absolute;
}
} }
} }
.noData { .noData {
......
src/pages/onlineclasses/singleclass/singleDetail.js
View file @ bb14bb52
...@@ -186,7 +186,7 @@ class singleDetailForm extends React.Component { ...@@ -186,7 +186,7 @@ class singleDetailForm extends React.Component {
</Dropdown> </Dropdown>
</div> </div>
<div className={pageStyle.publish}> <div className={pageStyle.publish}>
<div className={pageStyle.tip}>{addCourseObj.status === 1 ? '已发布' : '未发布'}</div> 创建于：{addCourseObj.created_at} <div className={`${pageStyle.tip} ${addCourseObj.status === 2 && pageStyle.tipnotpublist}`}>{addCourseObj.status === 1 ? '已发布' : '未发布'}</div> 创建于：{addCourseObj.created_at}
</div> </div>
</div> </div>
<Tabs className={pageStyle.tabs} defaultActiveKey="1" onChange={this.callback} animated={false}> <Tabs className={pageStyle.tabs} defaultActiveKey="1" onChange={this.callback} animated={false}>
......
src/pages/onlineclasses/singleclass/singleDetail.less
View file @ bb14bb52
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
margin-right: 10px; margin-right: 10px;
&.tipnotpublist{
color: #FF3B3B;
border-color: #FF3B3B;
background-color: rgba(255,59,59,0.05);
}
} }
} }
} }
......
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