Merge branch 'gray' of https://xmgit.ixm5.cn/xiaomai-cloud-class/xiaomai-cloud-class-web into gray

src/modules/course-manage/components/GraphicsEditor.less

@@ -28,7 +28,7 @@
 
 
   .w-e-text-container {
   .w-e-text-container {
     border: none !important;
     border: none !important;
-    height: ~'calc(100% - 81px)' !important;
+    height: ~'calc(100% - 109px)' !important;
   }
   }
 
 
   .editor-tips {
   .editor-tips {
@@ -40,13 +40,13 @@
   }
   }
   .w-e-full-screen-editor {
   .w-e-full-screen-editor {
     .w-e-text-container {
     .w-e-text-container {
-      height: ~'calc(100vh - 81px)' !important;
+      height: ~'calc(100vh - 109px)' !important;
     }
     }
   }
   }
   &.introduce {
   &.introduce {
     height: 200px;
     height: 200px;
     .w-e-text-container {
     .w-e-text-container {
-      height: ~'calc(100% - 41px)' !important;
+      height: ~'calc(100% - 69px)' !important;
     }
     }
   }
   }
 }
 }
\ No newline at end of file

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

@@ -2,7 +2,7 @@
  * @Author: 吴文洁 
  * @Author: 吴文洁 
  * @Date: 2020-07-16 11:05:17 
  * @Date: 2020-07-16 11:05:17 
  * @Last Modified by: chenshu
  * @Last Modified by: chenshu
- * @Last Modified time: 2021-03-24 14:40:40
+ * @Last Modified time: 2021-03-25 11:25:02
  * @Description: 添加直播-简介
  * @Description: 添加直播-简介
  */
  */
 
 
@@ -166,8 +166,8 @@ class AddGraphicsIntro extends React.Component {
                 </Col>  
                 </Col>  
                 <Col span={21}>
                 <Col span={21}>
                   <div className="desc">
                   <div className="desc">
-                    <div>开启：图文课将在用户学员表中展示</div>
-                    <div>关闭：图文课将在用户学员表中隐藏</div>
+                    <div>开启：图文课将在用户学院图文课列表中展示</div>
+                    <div>关闭：图文课将在用户学院图文课列表中隐藏</div>
                   </div>
                   </div>
                 </Col> 
                 </Col> 
               </Row>
               </Row>

src/modules/course-manage/graphics-course/components/GraphicsCourseFilter.less

@@ -22,6 +22,8 @@
       width: 30%;
       width: 30%;
       margin-right: 3%;
       margin-right: 3%;
       margin-bottom: 12px;
       margin-bottom: 12px;
+      align-items: center;
+      display: flex;
       .search-name{
       .search-name{
         vertical-align: middle;
         vertical-align: middle;
       }
       }

src/modules/plan-manage/components/BasicInfo.jsx

@@ -292,7 +292,7 @@ class BasicInfo extends React.Component{
                   </Col>
                   </Col>
                 </Row>
                 </Row>
                 <Row>
                 <Row>
-                  <Col span={8}>
+                  <Col span={24}>
                     <Radio value="Assign_Operate">
                     <Radio value="Assign_Operate">
                       指定运营师
                       指定运营师
                       <span className="playback__text">仅被选择的运营师有权限可见</span>
                       <span className="playback__text">仅被选择的运营师有权限可见</span>