Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/package.json

@@ -6,7 +6,7 @@
     "@flatten/array": "^1.1.7",
     "@icedesign/base": "^0.2.5",
     "@novnc/novnc": "^1.1.0",
-    "antd": "^3.6.5",
+    "antd": "^3.20.1",
     "array-flatten": "^2.1.2",
     "autoprefixer": "7.1.6",
     "axios": "^0.18.0",

public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js

@@ -322,7 +322,7 @@ class GraduationTasksnew extends Component {
 							</div>
 
 
-							{/*<Form labelCol={{span: 5}} wrapperCol={{span: 12}}*/}
+							{/*<Form*/}
 							{/*			onSubmit={GraduationTasksnewtype === true ? this.handleSubmit : ""}>*/}
 								<style>
 									{

public/react/src/modules/courses/new/CoursesNew.js

@@ -72,7 +72,7 @@ class CoursesNew extends Component {
                 console.log(error);
             })
         }else{
-            console.log(user_school);
+            // console.log(user_school);
             this.props.form.setFieldsValue({
                 school:user_school,
             });
@@ -259,7 +259,7 @@ class CoursesNew extends Component {
         axios.post(url,{
             search:value
         }).then((result)=>{
-            console.log(result.data)
+            // console.log(result.data)
             this.setState({
                 searchlist:result.data.course_lists,
                 // course:value,
@@ -357,7 +357,7 @@ class CoursesNew extends Component {
                                `}
                             </style>
 
-                            <Form labelCol={{span: 5}} wrapperCol={{span: 12}} onSubmit={this.handleSubmit}
+                            <Form onSubmit={this.handleSubmit}
                                   className={"edu-back-white newcourses"}>
                                 {/*内容*/}
                                 <style>

public/react/src/modules/courses/shixunHomework/CommitSummary.js

@@ -115,7 +115,7 @@ class CommitSummary extends Component{
         return (
             <div>
                 <div className="newMain clearfix">
-                    {/*<Form labelCol={{span: 5}} wrapperCol={{span: 12}} onSubmit={this.handleSubmit}>*/}
+                    {/*<Form onSubmit={this.handleSubmit}>*/}
                     <div className={"educontent mb20"}>
                         <div style={{
                           width:'100%',
@@ -148,7 +148,7 @@ class CommitSummary extends Component{
                             内容</span>
                                   </div>
                                   <div className="new-wrap">
-                                      <Form labelCol={{span: 5}}layout='vertical' onSubmit={this.handleSubmit}  wrapperCol={{span: 12}}>
+                                      <Form layout='vertical' onSubmit={this.handleSubmit} >
                                           <Form.Item
                                           >
                                               <div style={{ "background": "#fff","padding-bottom":"20px","padding-left":"20px","padding-right":"20px"}}
@@ -166,7 +166,7 @@ class CommitSummary extends Component{
                                               </div>
                                           </Form.Item>
 
-                                          <Form.Item wrapperCol={{span: 12, offset: 5}}>
+                                          <Form.Item>
                                               <div className="clearfix mt40 mb30">
                                                   <Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20" >
                                                       提交