From cb970e2223b62f28f222d03cd8616d85546c4214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 24 Jun 2019 11:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                 |  2 +-
 .../tasks/GraduationTasksSubmitnew.js         | 46 ++++++++++++++++---
 .../react/src/modules/login/EducoderLogin.js  |  4 +-
 public/react/src/modules/tpm/NewHeader.js     | 36 ++++++---------
 public/react/src/modules/tpm/TPMIndexHOC.js   |  9 +---
 5 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 05a4463cd..6c4a20fa9 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -31,7 +31,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
         proxy = "https://testeduplus2.educoder.net"
-        // proxy="http://47.96.87.25:48080"
+        proxy="http://47.96.87.25:48080"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 7421170d6..b68458e3f 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -83,7 +83,7 @@ class GraduationTasksSubmitnew extends Component{
     }
 
     handleSubmit=(e) => {
-
+      console.log("86");
       let {fileList,selectmemberslist,workslist}=this.state;
 
       if(fileList.length === 0){
@@ -91,7 +91,7 @@ class GraduationTasksSubmitnew extends Component{
           Modalstype:true,
           Modalstopval:'请上传附件!',
           Loadtype:true,
-          ModalCancel:this.cancelAttachment
+          ModalSave:this.cancelAttachment,
         })
 
 
@@ -119,7 +119,7 @@ class GraduationTasksSubmitnew extends Component{
         listid.push(list.response.id)
       }
 
-      e.preventDefault();
+      // e.preventDefault();
       if( GraduationTasksnewtype===true){
         this.props.form.validateFields((err, values) => {
           if (!err) {
@@ -408,7 +408,27 @@ class GraduationTasksSubmitnew extends Component{
       selectmemberslist:selects
     })
   }
+  onSearchKeywordKeyUp = (e) => {
+    if (e.keyCode === 13) {
+    }
+  }
+  onSearckeyd=(e)=>{
+      if(e.keyCode){
+
+        let {search} = this.state;
 
+        this.searchList(search,1,10)
+      }
+  }
+  onSearchKeywordKeyUps= (e)=>{
+      if(e.keyCode=== 13){
+      }
+  }
+  onKeywordSearchKeyDown = (e) => {
+    if(e.keyCode == 13) {
+      return false;
+    }
+  }
   gocannel=()=>{
     window.history.go(-1)
   }
@@ -483,7 +503,8 @@ render(){
         <a className="color-grey-6 fr font-16 ml30 mt10 mr20" onClick={this.goback}>返回</a>
       </div>
 
-      <Form labelCol={{ span: 5 }} wrapperCol={{ span: 12 }} onSubmit={GraduationTasksnewtype===true?this.handleSubmit:""} >
+      {/*<Form labelCol={{ span: 5 }} wrapperCol={{ span: 12 }} onSubmit={GraduationTasksnewtype===true?this.handleSubmit:"return false"}*/}
+      {/*>*/}
         <div className="stud-class-set pd20 coursenavbox edu-back-white">
           <style>{`
                 .uploadBtn.ant-btn {
@@ -536,6 +557,16 @@ render(){
           >
             <div>
               <div className={"fl ml20"}>成员要求：2～5人</div>
+              <input type="text"  style={{width:"0px",height:"0px",display:"none"}}   onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
+                     onkeydown={(e)=>this.onSearchKeywordKeyUps(e)}/>
+
+              <Search
+                style={{width:"0px",height:"0px",display:"none"}}
+                onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
+                onkeydown={(e)=>this.onSearchKeywordKeyUps(e)}
+                onPressEnter={this.onKeywordSearchKeyDown}
+                autoComplete="off"
+              ></Search>
               <Search
                 className={"fl mt5 ml20"}
                 style={{width:"270px"}}
@@ -544,8 +575,11 @@ render(){
                 value={search}
                 onInput={this.inputSearchValue}
                 onSearch={this.searchValue}
+                onPressEnter={this.onKeywordSearchKeyDown}
+                onKeyUp={(e) => this.onSearckeyd(e)}
                 autoComplete="off"
               ></Search>
+              <input type="text" style={{display: "none",height:0, width: 0, border: "none"}}/>
             </div>
 
 
@@ -652,11 +686,11 @@ render(){
 
         <Form.Item>
           <div className="clearfix mt30 mb30">
-            <Button type="primary" htmlType="submit"   className="defalutSubmitbtn fl mr20">提交</Button>
+            <Button type="primary" htmlType="submit"  onClick={this.handleSubmit} className="defalutSubmitbtn fl mr20">提交</Button>
             <a onClick={this.gocannel} className="defalutCancelbtn fl">取消</a>
           </div>
         </Form.Item>
-      </Form>
+      {/*</Form>*/}
 
       </div>
     </div>
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 91e8fac3d..f084dec66 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -177,9 +177,7 @@ class EducoderLogin extends Component {
                         "align-items": "center",
                         "width": "100%",
                     }}>
-                        <div className="font-14 color-grey-9 " style={{marginTop:"15px"}}>© 2019 EduCoder 湘ICP备17009477号 Trustie   &   IntelliDE inside</div>
-
-
+                        <div className="font-14 color-grey-9 " style={{marginTop:"15px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
                     </div>
                 </div>
             </div>
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 9b57d72f0..ef629e27c 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -209,27 +209,18 @@ class NewHeader extends Component {
   }
 
   componentDidUpdate = (prevProps) => {
-    // console.log("211");
-    // console.log(prevProps);
-    // console.log(prevProps.user);
-    // console.log(this.props.user);
-    // if(this.props.user !== undefined){
-    //   this.setState({
-    //         user_phone_binded :this.props.user.user_phone_binded,
-    //       })
-    // }
-    // if(prevProps.user!=this.props.user){
-    //   console.log("216")
-    //   console.log(prevProps.user);
-    //   // if(this.props.current_user!==undefined){
-    //   //   this.setState({
-    //   //     user_phone_binded :this.props.current_user.user_phone_binded,
-    //   //   })
-    //   // }
-    // }else {
-    //
-    //
-    // }
+    if(prevProps.user!=this.props.user){
+      // console.log("216")
+      // console.log(prevProps.user);
+      // console.log(this.props.user);
+      if(this.props.user !== undefined){
+        this.setState({
+              user_phone_binded :this.props.user.user_phone_binded,
+            })
+      }
+
+
+    }
   }
   componentWillReceiveProps(newProps, oldProps) {
     this.setState({
@@ -615,7 +606,8 @@ submittojoinclass=(value)=>{
     // join_course_url: "https://www.educoder.net/courses/join_course_multi_role"
     // join_project_url: "https://www.educoder.net/applied_project/applied_project_info"
     //    rolearr:["",""],
-    // console.log()
+    console.log("618");
+    console.log(user_phone_binded);
     return (
 
       <div className="newHeader" id="nHeader">
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 77d2e13bb..3f2efd531 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -256,7 +256,6 @@ export function TPMIndexHOC(WrappedComponent) {
             if (response.data) {
               this.initCommonState(response.data)
               this.setState({
-                user_phone_binded:response.data.user_phone_binded,
                 tpmLoading: false,
                 coursedata: {
                   course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined,
@@ -274,7 +273,7 @@ export function TPMIndexHOC(WrappedComponent) {
           })
       }
 	  	render() {
-          let{Headertop,Footerdown,user_phone_binded}=this.state;
+          let{Headertop,Footerdown}=this.state;
           const common = {
             isSuperAdmin:this.isSuperAdmin,
             isAdminOrCreator:this.isAdminOrCreator,
@@ -288,13 +287,7 @@ export function TPMIndexHOC(WrappedComponent) {
           }
 		    return (
 		    	<div>
-            {/*{*/}
-            {/*  user_phone_binded === undefined?*/}
-            {/*     ""*/}
-            {/*    :*/}
-            {/*    <Trialapplication  {...this.state} user_phone_binded={user_phone_binded} setTrialapplication = {this.setTrialapplication} ></Trialapplication>*/}
 
-            {/*}*/}
 
             <SiderBar
                         Headertop={Headertop}