Skip to content

X
xiaomai-cloud-class-web
Commit e0b2d8d7 by zangsuyun
Options

fix:dev

parent 8ee8d992
Showing with 34 additions and 7 deletions
src/modules/knowledge-base/components/Classification.jsx
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-19 18:05:23 * @Date: 2021-03-19 18:05:23
* @LastEditors: zangsuyun * @LastEditors: zangsuyun
* @LastEditTime: 2021-04-01 11:59:56 * @LastEditTime: 2021-04-06 11:17:10
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -67,6 +67,7 @@ class Classification extends Component { ...@@ -67,6 +67,7 @@ class Classification extends Component {
// 查询分类树 // 查询分类树
queryCategoryTree = (categoryName) => { queryCategoryTree = (categoryName) => {
let query = { let query = {
categoryName,
storeId: User.getStoreId(), storeId: User.getStoreId(),
withCount: true, withCount: true,
}; };
......
src/modules/knowledge-base/components/KnowledgeBaseFilter.jsx
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-12 11:16:38 * @Date: 2021-03-12 11:16:38
* @LastEditors: zangsuyun * @LastEditors: zangsuyun
* @LastEditTime: 2021-03-30 17:57:47 * @LastEditTime: 2021-04-02 15:32:13
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -102,7 +102,7 @@ class KnowledgeBaseFilter extends React.Component { ...@@ -102,7 +102,7 @@ class KnowledgeBaseFilter extends React.Component {
> >
{Reflect.ownKeys(ENUM.CourseTypeEnum).map((item) => { {Reflect.ownKeys(ENUM.CourseTypeEnum).map((item) => {
return ( return (
<Option value={item}>{ENUM.CourseTypeEnum[item]}</Option> <Option key={item} value={item}>{ENUM.CourseTypeEnum[item]}</Option>
); );
})} })}
</Select> </Select>
......
src/modules/knowledge-base/components/KnowledgeBaseList.jsx
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-12 14:49:40 * @Date: 2021-03-12 14:49:40
* @LastEditors: zangsuyun * @LastEditors: zangsuyun
* @LastEditTime: 2021-04-02 10:54:24 * @LastEditTime: 2021-04-06 11:53:45
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -90,7 +90,7 @@ class KnowledgeBaseList extends React.Component { ...@@ -90,7 +90,7 @@ class KnowledgeBaseList extends React.Component {
title: "课程名称", title: "课程名称",
key: "name", key: "name",
dataIndex: "name", dataIndex: "name",
width: 371, width: 391,
// fixed: "left", // fixed: "left",
render: (val, record) => { render: (val, record) => {
const { coverUrl, mediaCourseUrl } = record.source; const { coverUrl, mediaCourseUrl } = record.source;
...@@ -105,7 +105,11 @@ class KnowledgeBaseList extends React.Component { ...@@ -105,7 +105,11 @@ class KnowledgeBaseList extends React.Component {
if (item.contentType === "COVER") { if (item.contentType === "COVER") {
hasCover = true; hasCover = true;
return ( return (
<img className="course-cover" src={item.mediaUrl} /> <img
className="course-cover"
key={index}
src={item.mediaUrl}
/>
); );
} }
})} })}
...@@ -145,6 +149,25 @@ class KnowledgeBaseList extends React.Component { ...@@ -145,6 +149,25 @@ class KnowledgeBaseList extends React.Component {
> >
{ENUM.courseStateShow[record.source.courseState].title} {ENUM.courseStateShow[record.source.courseState].title}
</span> </span>
{record.hideToUser && (
<Tooltip
title={
<div>课程未成功开课，已在用户知识列表中隐藏</div>
}
>
<i
className="icon iconfont"
style={{
marginLeft: "5px",
cursor: "pointer",
color: "#bfbfbf",
fontSize: "14px",
}}
>
&#xe61d;
</i>
</Tooltip>
)}
</div> </div>
<div className="teacher-assistant"> <div className="teacher-assistant">
{record.source.teacherName.length > 4 ? ( {record.source.teacherName.length > 4 ? (
...@@ -187,7 +210,7 @@ class KnowledgeBaseList extends React.Component { ...@@ -187,7 +210,7 @@ class KnowledgeBaseList extends React.Component {
助教： 助教：
{record.source.admins.map((item, index) => { {record.source.admins.map((item, index) => {
return ( return (
<span> <span key={index}>
{item.adminName}{" "} {item.adminName}{" "}
{index < {index <
record.source.admins.length - 1 && ( record.source.admins.length - 1 && (
......
src/modules/knowledge-base/modal/AddCourse.jsx
...@@ -67,6 +67,7 @@ class AddCourse extends React.Component { ...@@ -67,6 +67,7 @@ class AddCourse extends React.Component {
excludeUsed: true, excludeUsed: true,
courseType: "LIVE", courseType: "LIVE",
storeId: User.getStoreId(), storeId: User.getStoreId(),
toRefKnowledgeCategoryId:this.props.categoryId
}, },
liveTotalCount: 0, liveTotalCount: 0,
selectLive: [], //弹窗内已选择的直播课程 selectLive: [], //弹窗内已选择的直播课程
...@@ -78,6 +79,7 @@ class AddCourse extends React.Component { ...@@ -78,6 +79,7 @@ class AddCourse extends React.Component {
courseType: "VOICE", courseType: "VOICE",
excludeUsed: true, excludeUsed: true,
storeId: User.getStoreId(), storeId: User.getStoreId(),
toRefKnowledgeCategoryId:this.props.categoryId
}, },
videoTotalCount: 0, videoTotalCount: 0,
selectVideo: [], //弹窗内已选择的视频课程 selectVideo: [], //弹窗内已选择的视频课程
...@@ -89,6 +91,7 @@ class AddCourse extends React.Component { ...@@ -89,6 +91,7 @@ class AddCourse extends React.Component {
excludeUsed: true, excludeUsed: true,
courseType: "PICTURE", courseType: "PICTURE",
storeId: User.getStoreId(), storeId: User.getStoreId(),
toRefKnowledgeCategoryId:this.props.categoryId
}, },
pictureTotalCount: 0, pictureTotalCount: 0,
selectPicture: [], //弹窗内已选择的图文课程 selectPicture: [], //弹窗内已选择的图文课程
......
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