黑客松需求调整

课堂学生用户权限控制调整
实训作业报告用户提示体验调整

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -130,16 +130,29 @@ class CoursesBanner extends Component {
       axios.get(url,{params:
         dataqueryss
       }).then((result) => {
-      	if( result!=undefined){
+      	debugger
-					let data = result.data;
+				if(result.data.status===-2){
-            this.setState({
+  				this.setState({
-              coursedata: data,
+						AccountProfiletype:true,
-              excellent:data.excellent,
+						content:result.data.message,
-            })
+						okText:"立即认证",
-					this.props.ispostexcellenttype(data.excellent)
+						cannelText:"稍后认证",
+						okHref:`/account/certification`,
+						Accounturltype:true
+					})
 				}else{
-					this.onloadupdatabanner()
+						if( result!=undefined){
+							let data = result.data;
+							this.setState({
+								coursedata: data,
+								excellent:data.excellent,
+							})
+							this.props.ispostexcellenttype(data.excellent)
+						}else{
+							this.onloadupdatabanner()
+						}
 				}
+
       })
   };
   foo=(url)=> {
@@ -452,7 +465,12 @@ class CoursesBanner extends Component {
 
   hideAccountProfile=()=>{
 		this.setState({
-			AccountProfiletype:false
+			AccountProfiletype:false,
+			content:undefined,
+			okText:undefined,
+			okHref:undefined,
+			cannelText:undefined,
+			Accounturltype:undefined
 		})
 	};
   ysljoinmodalCancel=()=>{

public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js

@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {WordsBtn} from 'educoder';
-import {Table,Tooltip,} from "antd";
+import {Table,Tooltip} from "antd";
 import {Link,Switch,Route,Redirect} from 'react-router-dom';
 
 class ConclusionEvaluation extends Component {
@@ -23,10 +23,18 @@ class ConclusionEvaluation extends Component {
 			dataIndex: 'type',
 			key: 'type',
 			render: (text, record) => (
-          <span style={{color:'#FF6800'}}>{record.type}</span>
+				<Tooltip placement="bottom" title={
+					<pre>
+						按照总分的百分比评价，而不是分值<br/>
+						[90,100]优秀<br/>
+						[70,90]良好<br/>
+						[60,70]及格<br/>
+						[0,60]不及格<br/>
+					</pre>
+				}> <span style={{color:'#FF6800'}}>{record.type}</span></Tooltip>
 			),
 		}, {
-			title: '获得经验值',
+			title:<span><Tooltip placement="top" title={"用户在作用的提交有效范围截止前"}>获得经验值</Tooltip></span>,
 			dataIndex: 'empirical',
 			key: 'empirical',
 			render: (text, record) => (

public/react/src/modules/osshackathon/Osshackathon.css

@@ -37,11 +37,9 @@
 }
 
 .OsshackathonCardtitle{
-    height:24px;
     font-size:24px;
     font-weight:400;
     color:rgba(5,16,26,1);
-    line-height:24px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

public/react/src/modules/osshackathon/Osshackathon.js

@@ -357,6 +357,7 @@ class Osshackathon extends Component {
 										</Col>
 
 										<Col span={6} className={"fr textright"}>
+											<span style={{"line-height":"30px","margin-right": "30px"}}>报名人数：{item.hack_users_count}</span>
 											{item.entry_info===true?<Button type="primary fr mr20" disabled>
 												已报名
 											</Button>:<Button type="primary fr issignup" onClick={()=>this.Signupentry(item.id)}>立即报名</Button>}

public/react/src/modules/user/AccountProfile.js

@@ -31,18 +31,23 @@ class AccountProfile extends Component {
 
 	}
 
-	gotoback=()=>{
+	gotoback=(type)=>{
-		if(this.props.AccountProfiletype!=undefined){
+  	if(type===true){
-			this.setState({
-				AccountProfiletype:false
-			})
-			this.props.hideAccountProfile()
-		}else{
 			window.location.href="/";
-			this.setState({
+		}else{
-				AccountProfiletype:false
+			if(this.props.AccountProfiletype!=undefined){
-			})
+				this.setState({
+					AccountProfiletype:false
+				})
+				this.props.hideAccountProfile()
+			}else{
+				window.location.href="/";
+				this.setState({
+					AccountProfiletype:false
+				})
+			}
 		}
+
 	}
 
 
@@ -52,7 +57,7 @@ okText: '立即完成',
 okHref: '/account/certification'
  */ 
 render() {
-	const { content, okText, okHref } = this.props;
+	const { content, okText, okHref,cannelText,Accounturltype} = this.props;
     return(
          <Modal
          keyboard={false}
@@ -67,7 +72,7 @@ render() {
 					<div className="task-popup-content">
 						<p className="task-popup-text-center font-16"> {content || '您需要去完善您的个人资料，才能使用此功能'}</p>
 						<div className="clearfix mt30 edu-txt-center">
-							<a  className="task-btn mr30" onClick={()=>this.gotoback()}>稍后完善</a>
+							<a  className="task-btn mr30" onClick={()=>this.gotoback(Accounturltype)}>{cannelText ||'稍后完善'}</a>
 							<a className="task-btn task-btn-orange"  href={ okHref || "/account/profile/edit" }> {okText || '立即完善'}</a>
 						</div>
 					</div>