Merge branch 'feature/zhangleyuan/20200220/training-program' into dev

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

@@ -2,7 +2,7 @@
  * @Author: zhangleyuan
  * @Author: zhangleyuan
  * @Date: 2021-02-20 16:45:51
  * @Date: 2021-02-20 16:45:51
  * @LastEditors: zhangleyuan
  * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-09 14:13:39
+ * @LastEditTime: 2021-03-09 15:53:46
  * @Description: 描述一下
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -483,7 +483,7 @@ class TrainingTask extends React.Component {
                 {record.courseState === "EXPIRED" &&
                 {record.courseState === "EXPIRED" &&
                   <span className="icon iconfont tip">&#xe834;</span>
                   <span className="icon iconfont tip">&#xe834;</span>
                 }
                 }
-                { record.courseState &&
+                { record.courseType==="LIVE" &&
                   <span className="course-state">{courseStateShow[record.courseState].title}</span>
                   <span className="course-state">{courseStateShow[record.courseState].title}</span>
                 }
                 }
                
                

src/modules/plan-manage/modal/relatedCourseModal.jsx

@@ -361,7 +361,7 @@ class SelectOperatorModal extends React.Component {
                 <Tabs defaultActiveKey="video" onChange={(activeKey)=>{this.setState({activeKey:activeKey})}}>
                 <Tabs defaultActiveKey="video" onChange={(activeKey)=>{this.setState({activeKey:activeKey})}}>
                     <TabPane tab="视频课" key="video">
                     <TabPane tab="视频课" key="video">
                         <div className="search-container">
                         <div className="search-container">
-                            <Search placeholder="搜索课程名称"  style={{ width: 200 }} onChange={(e) => { this.handleChangVideoCourseName(e.target.value)}}  onSearch={ () => { this.handleFetchVideoDataList()}}/>
+                            <Search enterButton={<span className="icon iconfont">&#xe832;</span>} placeholder="搜索课程名称"  style={{ width: 200 }} onChange={(e) => { this.handleChangVideoCourseName(e.target.value)}}  onSearch={ () => { this.handleFetchVideoDataList()}}/>
                         </div>
                         </div>
                         <div>
                         <div>
                             <span>
                             <span>
@@ -414,7 +414,7 @@ class SelectOperatorModal extends React.Component {
                     </TabPane>
                     </TabPane>
                     <TabPane tab="直播课" key="live">
                     <TabPane tab="直播课" key="live">
                         <div className="search-container">
                         <div className="search-container">
-                            <Search placeholder="搜索课程名称"  style={{ width: 200 }}  onChange={(e) => { this.handleChangLiveCourseName(e.target.value)}}  onSearch={ () => { this.handleFetchLiveDataList()}} />
+                            <Search enterButton={<span className="icon iconfont">&#xe832;</span>} placeholder="搜索课程名称"  style={{ width: 200 }}  onChange={(e) => { this.handleChangLiveCourseName(e.target.value)}}  onSearch={ () => { this.handleFetchLiveDataList()}} />
                         </div>
                         </div>
                         <div>
                         <div>
                             <span>
                             <span>

src/modules/plan-manage/modal/relatedCourseModal.less

@@ -9,4 +9,7 @@
             color:#5289FA;
             color:#5289FA;
         }
         }
     }
     }
+    .search-container{
+        margin-bottom:16px;
+    }
 }
 }
\ No newline at end of file