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

public/react/src/AppConfig.js

@@ -114,6 +114,7 @@ export function initAxiosInterceptors(props) {
                 notification.open({
                     message:"提示",
                     description: response.data.message || '服务器异常，请联系管理员。',
+
                 });
                 // notification['error']({
                 //   message:"提示",

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -2030,7 +2030,7 @@ class Studentshavecompletedthelist extends Component {
 			//===0 不包括主观题
 			if (indexi === exercise_users.length) {
 				//都没评论 不显示评论
-				if (response.data.poll_types.groups_count > 0) {
+				if (response.data.exercise_types.groups_count > 0) {
 					// console.log("77771111111");
 					 //分班大于0显示分班
 					//7ge
@@ -2273,7 +2273,7 @@ class Studentshavecompletedthelist extends Component {
 			} else {
 				   //已经评论
 				// response.data.course_groups.length
-				if (response.data.poll_types.groups_count > 0) {
+				if (response.data.exercise_types.groups_count > 0) {
 					//显示分班
 					//8ge
 					this.setState({
@@ -2546,7 +2546,7 @@ class Studentshavecompletedthelist extends Component {
 			//包括主观题
 			if (indexi === exercise_users.length) {
 				console.log("2548包含主观题不包含分班");
-				if (response.data.poll_types.groups_count> 0){
+				if (response.data.exercise_types.groups_count> 0){
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -2837,7 +2837,7 @@ class Studentshavecompletedthelist extends Component {
 				}
 			} else {
 				console.log("2699包含主观题包含分班");
-				if (response.data.poll_types.groups_count> 0) {
+				if (response.data.exercise_types.groups_count> 0) {
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,

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

@@ -177,7 +177,8 @@ 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"}}>© 2019 EduCoder 湘ICP备17009477号 Trustie   &   IntelliDE inside</div>
+
 
                     </div>
                 </div>

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

@@ -353,6 +353,7 @@ class LoginDialog extends Component {
             }
 
         }).catch((error) => {
+          console.log("356");
             console.log(error)
         })
     }

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

@@ -331,6 +331,9 @@ class NewHeader extends Component {
   }
   educoderlogin=()=>{
     //退出账号
+    // this.setState({
+    //   isRender:true
+    // })
     var url = `/accounts/logout.json`;
 
     axios.get((url)).then((result) => {