Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

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/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -17,6 +17,8 @@ const CheckboxGroup = Checkbox.Group;
 const Search = Input.Search;
 const qs = require('qs');
 
+
+
 class GraduationTaskssettinglist extends Component{
 
 	constructor(props){

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) => {

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

@@ -249,7 +249,6 @@ class Infos extends Component{
                   {
                     data && is_current == false && data.identity =="学生" ? "" : <span className="mypost fl mr10">{data && data.identity}</span>
                   }
-                  <span className="mypost fl mr10">{data && data.identity}</span>
                   <a href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/authentication` :"javascript:void(0)"} target="_blank" className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
                     <Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>
                       <i className={ data && data.authentication ? "iconfont icon-shenfenrenzheng font-13 color-blue":"iconfont icon-shenfenrenzheng font-13 color-grey-9"}></i>
@@ -300,8 +299,8 @@ class Infos extends Component{
                       data && data.can_apply_trial == false ?
                         data.attendance_signed ? 
                         <React.Fragment>
-                          <span className="user_default_btn user_grey_btn mb5 fl">已签到</span>
+                          <span className="user_default_btn user_grey_btn mb5">已签到</span>
-                          <span id="attendance_notice" className="none font-12 color-grey-6" style={{"display":"block"}}>明日签到&nbsp;<font className="color-orange">+{next_gold}</font>&nbsp;金币</span>
+                          <p id="attendance_notice" className="none font-12 color-grey-6" style={{"display":"block"}}>明日签到&nbsp;<font className="color-orange">+{next_gold}</font>&nbsp;金币</p>
                         </React.Fragment>
                         :
                         <a herf="javascript:void(0);" onClick={this.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>

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

@@ -171,7 +171,7 @@ class InfosShixun extends Component{
                     item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span><img src={getImageUrl("/images/educoder/tag2.png")}/></div>
                   }
                   <a href="javascript:void(0)" className="square-img">
-                    <img alt="Shixun6" src={getImageUrl(`${item.image_url}`)}/>
+                    <img alt="Shixun6" src={`${item.image_url}`}/>
                   </a>
                   <div className="square-main">
                     <p className="task-hide">