Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc

src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx

@@ -313,11 +313,6 @@ class GraphicsCourseList extends React.Component {
 	//改变上架状态
 	//改变上架状态
 	changeShelfState = (index, item, checked) => {
 	changeShelfState = (index, item, checked) => {
 		let _shelfState = checked ? 'YES' : 'NO'
 		let _shelfState = checked ? 'YES' : 'NO'
-    // if(_shelfState==='NO'){
-    //   _shelfState = "YES";
-    // }else{
-    //   _shelfState = "NO"
-    // }
 		const params = {
 		const params = {
 			courseId: item.id,
 			courseId: item.id,
 			shelfState: _shelfState,
 			shelfState: _shelfState,

src/modules/resource-disk/modal/ScanFileModal.jsx

@@ -34,7 +34,7 @@ class ScanFileModal extends React.Component {
               style={{ width: 632, objectFit: "cover" }}
               style={{ width: 632, objectFit: "cover" }}
             />
             />
           )}
           )}
-          {fileType === "VIDEO" && (
+          {(fileType ==="VIDEO" || fileType === "MP4") && (
             <div>
             <div>
               <Player
               <Player
                 src={item.mediaUrl || item.ossAddress || item.ossUrl}
                 src={item.mediaUrl || item.ossAddress || item.ossUrl}

src/modules/teach-tool/components/CourseCategorySiderTree.less

@@ -30,7 +30,7 @@
       text-align: center;
       text-align: center;
       margin-top: 100%;
       margin-top: 100%;
       .empty-tree-btn {
       .empty-tree-btn {
-        color: #2966FF;
+        color: #2966ff;
         cursor: pointer;
         cursor: pointer;
       }
       }
     }
     }
@@ -39,8 +39,6 @@
       font-weight: 400;
       font-weight: 400;
       color: #666666;
       color: #666666;
       width: 234px;
       width: 234px;
-      // overflow-x: scroll;
-      // overflow-y: hidden;
       .anticon {
       .anticon {
         color: #999999;
         color: #999999;
       }
       }
@@ -52,7 +50,7 @@
           white-space: nowrap;
           white-space: nowrap;
         }
         }
         .ant-tree-node-content-wrapper.ant-tree-node-selected {
         .ant-tree-node-content-wrapper.ant-tree-node-selected {
-          color: #2966FF;
+          color: #2966ff;
         }
         }
       }
       }
       .ant-tree-treenode-selected:hover::before,
       .ant-tree-treenode-selected:hover::before,