Merge branches 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/paths/PathDetail/sendPanel.js

@@ -2,6 +2,7 @@ import React,{ Component } from "react";
 import { Modal,Radio,Input,Tooltip,Checkbox,Select, Row,Col } from "antd";
 import axios from 'axios';
 import { SnackbarHOC } from 'educoder';
+import moment from 'moment';
 import Modals from '../../modals/Modals';
 const Option = Select.Option;
 const CheckboxGroup = Checkbox.Group;
@@ -148,14 +149,16 @@ class sendPanel extends Component{
           destroyOnClose={true}
         >
           <div className="newupload_conbox">
-            <div className="mb20" onMouseLeave={this.closeList}>
+            <div className="mb20"
+								 // onMouseLeave={this.closeList}
+						>
               <Select
               placeholder="请选择您要发送的课堂" 
               style={{"width":"100%"}} 
               onSelect={this.selectCloseList}
-              onMouseEnter={this.openList}
+              // onMouseEnter={this.openList}
               defaultOpen={false}
-              open={openSearch}
+              // open={openSearch}
               optionLabelProp="name"
               >
               {
@@ -164,7 +167,9 @@ class sendPanel extends Component{
                       <Option key={item.course_id} id={key} name={item.course_name}>
                         <Row>
                           <Col className="fl with70 task-hide">{item.course_name}</Col>
-                          <Col className="fl color-grey-9 with30 edu-txt-center">{item.created_at}</Col>
+                          <Col className="fl color-grey-9 with30 edu-txt-center">
+														{moment( item.created_at ).format('YYYY-MM-DD HH:mm')}
+                          </Col>
                         </Row>
                       </Option>                    
                   )

public/react/src/modules/tpm/NewHeader.js

@@ -270,7 +270,7 @@ class NewHeader extends Component {
       console.log(error);
     })
   }
-  
+
   hideAddcoursestypes=()=>{
     this.setState({
       Addcoursestypes:false