diff --git a/public/react/src/modules/courses/exercise/question/single.js b/public/react/src/modules/courses/exercise/question/single.js index aa23aa3d9..2edf8ab05 100644 --- a/public/react/src/modules/courses/exercise/question/single.js +++ b/public/react/src/modules/courses/exercise/question/single.js @@ -35,12 +35,13 @@ class single extends Component{ }=this.props let isStudent =this.props.isStudent(); + let isJudge = questionType.question_type == 2 return(
{ questionType.question_choices && questionType.question_choices.map((item,key)=>{ - let prefix = `${tagArray[key]}.` + let prefix = isJudge ? '' : `${tagArray[key]}.` return(

{prefix} diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js index c3b150229..7fa4f4cc1 100644 --- a/public/react/src/modules/user/account/AccountBasicEdit.js +++ b/public/react/src/modules/user/account/AccountBasicEdit.js @@ -663,14 +663,15 @@ class AccountBasic extends Component { )} -

+ {!filterSchoolList || (filterSchoolList && filterSchoolList.length==0 )&& school && - - 未找到包含“{school}”的高校, - 申请新增 - +
+ + 未找到包含“{school}”的高校, + 申请新增 + +
} -
)} -
+ { !filterDepartments || (filterDepartments && filterDepartments.length==0 )&& departmentsName && - - 未找到包含“{departmentsName}”的院系/部门, - 申请新增 - +
+ + 未找到包含“{departmentsName}”的院系/部门, + 申请新增 + +
} -
+ {/* htmlType="submit" */} {/* diff --git a/public/react/src/modules/user/account/AccountCertification.js b/public/react/src/modules/user/account/AccountCertification.js index 455967398..3b37dc394 100644 --- a/public/react/src/modules/user/account/AccountCertification.js +++ b/public/react/src/modules/user/account/AccountCertification.js @@ -15,36 +15,46 @@ class AccountCertification extends Component { } checkBasicInfo = (index) => { - if (this.props.basicInfo.base_info_completed == true) { + if (index == 1) { + if ( this.props.basicInfo.base_info_completed == true) { + this.showRealNameCertificationModal(index) + } else { + this.props.confirm({ + okText: `立即完善`, + content: `请先完善基本信息`, + onOk: () => { + this.props.history.push('/account/profile/edit') + } + }) + } + } else if (index == 2) { this.showRealNameCertificationModal(index) - } else { - this.props.confirm({ - okText: `立即完善`, - content: `请先完善基本信息`, - onOk: () => { - this.props.history.push('/account/profile/edit') - } - }) } + } showRealNameCertificationModal = (index) => { this.setState({ certification:index, + }, () => { + if (index == 1) { + this.realNameCertificationModal1.setVisible(true) + } else if (index == 2) { + this.realNameCertificationModal2.setVisible(true) + } }) - this.realNameCertificationModal.setVisible(true) } render() { let {certification}=this.state let {basicInfo} = this.props; return (
- {this.state.certification===1? this.realNameCertificationModal = form} certification={certification} + {this.state.certification===1? this.realNameCertificationModal1 = form} certification={certification} >:""} - {this.state.certification===2? this.realNameCertificationModal = form} certification={certification} + {this.state.certification===2? this.realNameCertificationModal2 = form} certification={certification} >:""}