Merge remote-tracking branch 'origin/master'

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

@@ -245,7 +245,9 @@ class TPMBanner extends Component {
                 Searchvalue:"",
                 pages:1
             })
-            window.location.href = response.data.url;
+           // window.location.href = response.data.url;
+					// response.data.course_id
+					this.props.history.replace("/courses");
 
         }).catch((error) => {
             console.log(error)

public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js

@@ -17,6 +17,7 @@ import { getImageUrl, toPath } from 'educoder'
 import axios from 'axios';
 
 import './Collaborators.css';
+import SchoolSelect from "../../../courses/members/modal/AddStudentModal";
 
 const $ = window.$;
 
@@ -40,7 +41,9 @@ class Collaborators extends Component {
             collaborators_deletevalue: null,
             onSearchcalue:"",
             collaboratorListsum:10,
-            collaboratorListsumtype:true
+            collaboratorListsumtype:true,
+					  user_name:undefined,
+					  school_name:undefined
         }
     }
     componentDidMount() {
@@ -151,16 +154,21 @@ class Collaborators extends Component {
         })
     }
     onSearchadmin = (value) => {
-        let {collaboratorList} = this.state;
-        if (value === "") {
-            this.setState({
-                Searchadmin: [],
-                collaboratorList: collaboratorList
-            })
-        } else {
+        let {collaboratorList,user_name,school_name} = this.state;
+        // if (value === "") {
+        //     this.setState({
+        //         Searchadmin: [],
+        //         collaboratorList: collaboratorList
+        //     })
+        // } else {
+				//
+        // }
 			let id = this.props.match.params.shixunId;
-            let url = "/shixuns/" + id + "/add_collaborators.json?search=" + value;
-            axios.get(url).then((response) => {
+			let url = "/shixuns/" + id + "/add_collaborators.json";
+			axios.get(url,{params:{
+					user_name:user_name ,
+					school_name:school_name,
+				}}).then((response) => {
 				if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 
 				}else{
@@ -179,8 +187,6 @@ class Collaborators extends Component {
 			});
     }
 
-    }
-
     selectChangenickname = (e, key) => {
         let {Searchadmin} = this.state;
         let newlist = Searchadmin;
@@ -342,7 +348,9 @@ class Collaborators extends Component {
             collaborators_deletetype,
             onSearchcalue,
             collaboratorListsum,
-           collaboratorListsumtype
+            collaboratorListsumtype,
+						user_name,
+						school_name
         } = this.state;
         let {loadingContent} = this.props;
         const radioStyle = {
@@ -415,20 +423,33 @@ class Collaborators extends Component {
                     closable={false}
                     footer={null}
                 >
-                    <Search
-                        placeholder="输入用户的姓名、昵称、邮箱进行搜索"
-                        value={onSearchcalue}
-                        onSearch={(value) => this.onSearchadmin(value)}
-                        onInput={this.onSearchadmins}
-                        style={{width: '100%'}}
-                    />
-
-                    <div className="mt20" style={{background: '#f7f9fd'}}>
-                        <p className="clearfix pl35">
-                            <span className="fl edu-txt-w80 task-hide font-bd ml30">姓名</span>
-                            <span className="fl edu-txt-w80 task-hide font-bd">职位</span>
-                            <span className="fl edu-txt-w180 task-hide font-bd">单位</span>
+                    {/*<Search*/}
+                        {/*placeholder="输入用户的姓名、昵称、邮箱进行搜索"*/}
+                        {/*value={onSearchcalue}*/}
+                        {/*onSearch={(value) => this.onSearchadmin(value)}*/}
+                        {/*onInput={this.onSearchadmins}*/}
+                        {/*style={{width: '100%'}}*/}
+                    {/*/>*/}
+									<span className="mr10">姓名:</span>
+
+									<Input allowClear placeholder="请输入真实姓名" value={user_name} onInput={(e) => {this.setState({user_name: e.target.value})}}
+												 style={{ width: '130px'}}
+									></Input>
+									<span className="label ml10 " style={{ minWidth: '36px' }}>单位:</span>
+								 <Input allowClear placeholder="请输入单位名称" className="ml10" value={school_name} onInput={(e) => {this.setState({school_name: e.target.value})}}
+									style={{ width: '135px'}}>
+								</Input>
+
+									<a className="task-btn task-btn-orange" onClick={() => this.onSearchadmin()}
+										 style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
+									>搜索</a>
+									<p className="clearfix pl35 mt20">
+										<span className="fl edu-txt-w80 task-hide font-bd ml10 edu-txt-left">姓名</span>
+										<span className="fl edu-txt-w80 task-hide font-bd">呢称</span>
+										<span className="fl edu-txt-w180 task-hide font-bd ml50">单位</span>
 									</p>
+                    <div className="mt5" style={{background: '#f7f9fd'}}>
+
                         <div className="clearfix">
                             <ul className="upload_select_box fl" id="search_not_teachers_list">
                                 {Searchadmin.length === 0 ? <li style={{textAlign: 'center'}}>
@@ -454,7 +475,7 @@ class Collaborators extends Component {
 
                     <div className="mt10 clearfix">
 
-              <span className="fl mr15 ml10">
+              <span className="fl mr15">
                   <Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox>
                   <div className="fl" style={{height: '27px'}}>
                       <span className="color-orange fl" id="add_teacher_notice"