查看最新成绩
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 0046afb19..2b06936cf 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1699,16 +1699,66 @@ class Trainingjobsetting extends Component {
if(this.state.allowreplenishment === false){
whethertopays=false;
}
- this.setState({
- flagPageEditsbox:true,
- flagPageEdit: true,
- whethertopay:whethertopays,
- flagPageEditstwo:releasetime,
- flagPageEditsthrees:deadline,
- flagPageEditsfor:endtime,
- completionefficiencyscore:true,
- unifiedsetting:this.state.unifiedsetting,
- })
+ if(this.state.jobsettingsdata!==undefined){
+
+ }
+
+ try {
+ if(this.state.jobsettingsdata&& this.state.jobsettingsdata.data.homework_status[0]==="未发布"){
+ this.setState({
+ flagPageEditsbox:true,
+ flagPageEdit: true,
+ whethertopay:whethertopays,
+ flagPageEditstwo:releasetime,
+ flagPageEditsthrees:deadline,
+ flagPageEditsfor:endtime,
+ completionefficiencyscore:true,
+ work_efficiencys:true,
+ unifiedsetting:this.state.unifiedsetting,
+ latedeductiontwo:20,
+ });
+ }else {
+ this.setState({
+ flagPageEditsbox:true,
+ flagPageEdit: true,
+ whethertopay:whethertopays,
+ flagPageEditstwo:releasetime,
+ flagPageEditsthrees:deadline,
+ flagPageEditsfor:endtime,
+
+ unifiedsetting:this.state.unifiedsetting,
+ });
+ if(this.state.work_efficiencys===true){
+ this.setState({
+ completionefficiencyscore:true,
+ })
+ }else{
+ this.setState({
+ completionefficiencyscore:false,
+ })
+ }
+ }
+ }catch (e) {
+ this.setState({
+ flagPageEditsbox:true,
+ flagPageEdit: true,
+ whethertopay:whethertopays,
+ flagPageEditstwo:releasetime,
+ flagPageEditsthrees:deadline,
+ flagPageEditsfor:endtime,
+ unifiedsetting:this.state.unifiedsetting,
+ });
+ if(this.state.work_efficiencys===true){
+ this.setState({
+ completionefficiencyscore:true,
+ })
+ }else{
+ this.setState({
+ completionefficiencyscore:false,
+ })
+ }
+ }
+
if(this.state.proportion === "自定义分值"){
this.setState({
boolUnitetwoname:"自定义分值",
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.css b/public/react/src/modules/paths/PathDetail/DetailTop.css
index 40363f056..975da0f09 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.css
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.css
@@ -17,7 +17,7 @@
box-sizing: border-box;
}
.userNavs{
- line-height: 96px;
+ line-height: 75px;
background: #fff;
height:96px;
background:rgba(255,255,255,1);
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js
index c6c2f1a75..f9da464d3 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.js
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.js
@@ -5,10 +5,12 @@ import SendPanel from "./sendPanel.js";
import { getImageUrl } from 'educoder';
import axios from 'axios';
import Modals from '../../modals/Modals';
+import AccountProfile from"../../user/AccountProfile";
import OpenCourse from './OpenCourse';
-import Jointheclass from '../../modals/Jointheclass'
+import Jointheclass from '../../modals/Jointheclass';
import './DetailTop.css';
+
const Search = Input.Search;
const RadioGroup = Radio.Group;
class DetailTop extends Component{
@@ -262,6 +264,18 @@ class DetailTop extends Component{
}
putappointment=()=>{
+ if(this.props.checkIfLogin()===false){
+ this.props.showLoginDialog()
+ return
+ }
+
+ if(this.props.current_user&&this.props.current_user.profile_completed===false){
+ this.setState({
+ AccountProfiletype:true
+ })
+ return
+ }
+
this.setState({
Modalstype:true,
Modalstopval:"是否确认立即预约？",
@@ -321,9 +335,15 @@ class DetailTop extends Component{
this.cardsModalcancel()
})
}
+
+ hideAccountProfile=()=>{
+ this.setState({
+ AccountProfiletype:false
+ })
+ }
render(){
let{detailInfoList}=this.props;
- let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype}=this.state;
+ let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype,AccountProfiletype}=this.state;
const radioStyle = {
display: 'block',
height: '30px',
@@ -353,6 +373,12 @@ class DetailTop extends Component{
return(
+ {AccountProfiletype===true?
this.hideAccountProfile()}
+ {...this.props}
+ {...this.state}
+ />:""}
+
- {this.props.courses===undefined||isadminallow_statistics===true?"":
+ {this.props.courses===undefined||isadminallow_statistics===true?"":
- {this.props.courses===undefined||this.props.courses.length===0?"":
+ {this.props.courses===undefined||this.props.courses.length===0?"":
{this.state.courseslist.map((item,key)=>{
if(item.course_identity<4){
@@ -651,7 +677,10 @@ class DetailTop extends Component{
.mt26{
margin-top:26px;
}
-
+ .mt10block{
+ margin-top: 10px;
+ display: inline-block;
+ }
`
}
@@ -671,8 +700,8 @@ class DetailTop extends Component{
预约报名成功:""}
{/*{item.course_status.status===0?即将开课
:""}*/}
- {item.course_status.status===1?{item.course_status.time}
:""}
- {item.course_status.status===2&&item.course_identity<6?已结束
:""}
+ {item.course_status.status===1?{item.course_status.time}
:""}
+ {item.course_status.status===2&&item.course_identity<6?已结束
:""}
{/*已结束
*/}
{item.course_status.status===0?
item.course_identity<5?
@@ -690,7 +719,7 @@ class DetailTop extends Component{
{item.course_status.status===2?
item.course_identity<6?
进入课堂
- :已结束
:""}
+ :已结束
:""}
)})}
@@ -712,8 +741,8 @@ class DetailTop extends Component{
:""}
{applypath===true&&this.props.courses.length===0?this.state.MenuItemskey===this.props.courses.length||coursestypes===true?
- 当前预约报名人数：{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}人
- 当预约报名人数达到 {this.props.detailInfoList&&this.props.detailInfoList.student_count} 人时即将开课
+ 当前预约报名人数：{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}人
+ 当预约报名人数达到 {this.props.detailInfoList&&this.props.detailInfoList.student_count} 人时即将开课
{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
getappointmenttype===true?预约报名成功:this.putappointment()}>期待开课并预约报名:
预约报名成功}
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index 23037f360..28569cd97 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -50,10 +50,10 @@ class InfosBanner extends Component{
-
+
-
+