Merge branch 'dev' of…

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

src/modules/course-manage/video-course/AddVideoCourse.jsx

@@ -2,15 +2,14 @@
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:07:47
  * @LastEditors: yuananting
- * @LastEditTime: 2021-07-18 16:54:33
+ * @LastEditTime: 2021-07-23 14:26:26
  * @Description: 线上课新增/编辑页
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
 
 import React from 'react'
-import { Button, Input, message, Modal, Tooltip, Form, Popconfirm, Menu, Dropdown, Cascader } from 'antd'
+import { Button, Input, message, Modal, Cascader, Tooltip, Form, Popconfirm, Menu, Dropdown } from 'antd'
 import { FileTypeIcon } from '@/common/constants/academic/lessonEnum'
-import { CourseCatalogSelect } from '@/modules/common/'
 import ShowTips from '@/components/ShowTips'
 import Breadcrumbs from '@/components/Breadcrumbs'
 import moment from 'moment'
@@ -122,8 +121,19 @@ class AddVideoCourse extends React.Component {
   }
 
   catalogChange = (value, _categoryName) => {
-    console.log(value, _categoryName)
-    this.setState({ categoryId: value, categoryName: _categoryName[0] })
+    const categoryName = _.pluck(_categoryName, 'categoryName').join('-')
+    const changeValueLength = value.length
+    switch (changeValueLength) {
+      case 1:
+        this.setState({ categoryId: value[0], categoryName })
+        break
+      case 2:
+        this.setState({ categoryId: value[1], categoryName })
+        break
+      default:
+        this.setState({ categoryId: null })
+        break
+    }
   }
   // 获取线上课详情
   handleFetchScheudleDetail = (courseId) => {
@@ -712,7 +722,6 @@ class AddVideoCourse extends React.Component {
       imageFile,
       selectTypeList,
       accept,
-      categoryId,
     } = this.state
     const defaultCover = 'https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png'
     const isDefaultCover = coverUrl === defaultCover || coverUrl == null
@@ -907,7 +916,6 @@ class AddVideoCourse extends React.Component {
                   }
                 />
               )}
-              {/* <CourseCatalogSelect courseCatalogList={courseCatalogList} value={categoryId} onChange={this.catalogChange} /> */}
             </div>
             <div className='intro-info mt16'>
               <AddVideoIntro

src/modules/teach-tool/components/CourseCategoryManage.jsx

 /*
  * @Author: yuananting
  * @Date: 2021-02-23 18:28:50
- * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-06-25 14:35:20
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-07-23 15:03:50
  * @Description: 助学工具-课程分类
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */

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

@@ -31,7 +31,7 @@
         height: 44px;
         padding: 0;
         span {
-          line-height: 44px;
+          line-height: 47px;
           vertical-align: middle;
         }
         .ant-tree-node-content-wrapper.ant-tree-node-selected {
@@ -45,10 +45,10 @@
             *.node-title-div {
               width: 100%;
               display: flex;
-              justify-content: space-between;
               .title-opts {
                 visibility: hidden;
-                margin-right: 16px;
+                margin-left: 24px;
+                margin-bottom: 4px;
               }
             }
           }

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

@@ -8,8 +8,8 @@
 .xm-audio {
   display: flex;
   align-items: center;
-  width: 280px;
-  padding: 10px 20px;
+  width: 315px;
+  padding: 10px 0 10px 20px;
   border-radius: 5px;
   background-color: #ffffff;
   .audio-image {

src/modules/teach-tool/paper-manage/modal/PreviewPaperModal.less

@@ -101,7 +101,6 @@
       .voice-box {
         margin-bottom: 12px;
         box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-        padding: 10px 20px;
         width: 320px;
       }
     }

src/modules/teach-tool/question-manage/components/OperateQuestionTab.less

@@ -314,7 +314,6 @@
         .audio-box {
           position: relative;
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
           margin-bottom: 12px;
           .icon_sider {

src/modules/teach-tool/question-manage/modal/PreviewQuestionModal.less

@@ -68,7 +68,6 @@
       .voice-box {
         margin-bottom: 12px;
         box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-        padding: 10px 20px;
         width: 320px;
       }
     }
@@ -144,7 +143,6 @@
         .voice-box {
           margin-bottom: 12px;
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
         }
       }
@@ -248,7 +246,6 @@
         margin-bottom: 16px;
         .audio-box {
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
           margin-bottom: 12px;
         }