Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/css/Courses.css

@@ -949,6 +949,11 @@ kbd,
 samp {
     font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
+
+/* 表格间距太大 */
+.ant-table-tbody>tr>td, .ant-table-thead>tr>th {
+    padding: 16px 0px;
+}
 /* FORM START */
 .ant-form label{
     /* 为了覆盖antd的样式，这里使用了important，TODO */

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

@@ -72,7 +72,7 @@ class GraduationTasksappraiseMainEditor extends Component{
   }
   clearInputs = () => {
     this.setState({
-      score: 0,
+      score: undefined,
       same_score: false,
       fileList: []
     })

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

@@ -1067,7 +1067,6 @@ class Listofworksstudentone extends Component {
 			}
 		}
 		let columns2=	arr;
-		var teacherlist = undefined;
 		var teacherlists = undefined;
 		if (teacherdata !== undefined) {
 			// console.log("seacthdata设置数据")
@@ -1075,7 +1074,6 @@ class Listofworksstudentone extends Component {
 			if (teacherdata.id === undefined) {
 				this.setState({
 					data: [],
-					teacherlist: undefined,
 					loadingstate: false,
 					styletable: styletable,
 				})
@@ -1115,10 +1113,6 @@ class Listofworksstudentone extends Component {
 					// 	current: this.state.page,
 					// }
 					styletable = {"display": "block",}
-				} else {
-					// console.log("seacthdata设置数据2")
-					teacherlist = undefined;
-
 				}
 			}
 
@@ -1488,7 +1482,7 @@ class Listofworksstudentone extends Component {
 			limit:20,
 		}
 		axios.post(urll, data).then((result) => {
-			// debugger
+			debugger
 				if (result !== undefined) {
 					// console.log(url)
 					// console.log("作品列表6789077")
@@ -1583,7 +1577,7 @@ class Listofworksstudentone extends Component {
 
 	// 设置数据
 	seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
-		// debugger
+	 debugger
 		let {page, limit} = this.state;
 		let datalist = [];
 		let columns = this.state.columns;
@@ -1707,11 +1701,9 @@ class Listofworksstudentone extends Component {
 			}
 
 		} else {
-			var teacherlist = undefined;
 		}
 		this.setState({
 			data: datalist,
-			teacherlist: teacherlist,
 			columns: columns2,
 			loadingstate: false,
 		})
@@ -2197,10 +2189,10 @@ class Listofworksstudentone extends Component {
 
 		// console.log(this.state.data);
 		// console.log("841");
-		// console.log(this.state.columns);
+		console.log(this.state.columns);
-		// console.log(data);
+		console.log(data);
-		// console.log("2202");
+		console.log("2202");
-		// console.log(this.props.isAdmin());
+		console.log(this.props.isAdmin());
 
 		return (
 			this.props.isAdmin() === true ?

public/react/src/modules/login/LoginDialog.js

@@ -346,10 +346,7 @@ class LoginDialog extends Component {
             if(response===undefined){
                 return
             }
-					if(response.data.identity === null || response.data.identity === undefined){
+
-						this.props.history.push("/interesse");
-						return;
-					}
             if(response.status===200){
                 if (response.data.status === 402) {
                     window.location.href = response.data.url;
@@ -359,6 +356,10 @@ class LoginDialog extends Component {
 										description:response.data.message,
 									});
 								}else{
+                  if(response.data.identity === null || response.data.identity === undefined){
+                    this.props.history.push("/interesse");
+                    return;
+                  }
                     broadcastChannelPostMessage('refreshPage')
                     this.setState({
                         isRender:false

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -424,8 +424,8 @@ class AccountBasic extends Component {
                 }],
               })(
                 <RadioGroup>
-                  <Radio value="0">男</Radio>
+                  <Radio value="0" disabled={basicInfo.authentication != 'uncertified'}>男</Radio>
-                  <Radio value="1">女</Radio>
+                  <Radio value="1" disabled={basicInfo.authentication != 'uncertified'}>女</Radio>
                 </RadioGroup>
               )}
             </Form.Item>

public/react/src/modules/user/usersInfo/Infos.js

@@ -63,6 +63,10 @@ class Infos extends Component{
           login:this.props.current_user.login
         })
       }
+    } else {
+      if (prevProps.match.params.username != this.props.match.params.username) {
+        this.getInfo(this.props.match.params.username);
+      }
     }
   }