From c87c6280bf3d827cde1164c0885491be54c48650 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 24 Jul 2019 18:38:37 +0800
Subject: [PATCH] g

---
 .../courses/exercise/question/single.js       |  3 +-
 .../modules/user/account/AccountBasicEdit.js  | 27 +++++++------
 .../user/account/AccountCertification.js      | 38 ++++++++++++-------
 3 files changed, 41 insertions(+), 27 deletions(-)

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(
       <div className="pl30 pr30 singleDisplay">
         <Radio.Group disabled={ user_exercise_status == 1 ? true : false } defaultValue={questionType.user_answer[0]} onChange={this.changeItem}>
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
-              let prefix = `${tagArray[key]}.`
+              let prefix = isJudge ?  '' : `${tagArray[key]}.`
               return(
                 <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15 df" : "fl mr40"}>
                   <Radio className="fl lineh-20" value={item.choice_id}>{prefix}</Radio>
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 {
                 </AutoComplete>
               )}
             </Form.Item>
-            <div style={{marginLeft: '100px',height:"20px",lineHeight:"20px"}}>
+            
               {!filterSchoolList || (filterSchoolList && filterSchoolList.length==0 )&& school &&
-                <span>
-                  <span style={{color: '#CDCDCD'}}>未找到包含“{school}”的高校，</span>
-                  <span style={{color: '#4CACFF', cursor: 'pointer'}} onClick={this.showApplyForAddOrgModal}>申请新增</span>
-                </span>
+                <div style={{marginLeft: '100px',height:"20px",lineHeight:"20px"}}>
+                  <span>
+                    <span style={{color: '#CDCDCD'}}>未找到包含“{school}”的高校，</span>
+                    <span style={{color: '#4CACFF', cursor: 'pointer'}} onClick={this.showApplyForAddOrgModal}>申请新增</span>
+                  </span>
+                </div>
               }
-            </div>
             <Form.Item
               label="院系/部门"
               className="formItemInline mb0"
@@ -701,15 +702,17 @@ class AccountBasic extends Component {
                 </AutoComplete>
               )}
             </Form.Item>
-              <div style={{marginLeft: '100px',height:"20px",lineHeight:"20px"}}>
+              
               {
                 !filterDepartments || (filterDepartments && filterDepartments.length==0 )&& departmentsName && 
-                <span>
-                  <span style={{color: '#CDCDCD'}}>未找到包含“{departmentsName}”的院系/部门，</span>
-                  <span style={{color: '#4CACFF', cursor: 'pointer'}} onClick={this.showApplyForAddChildOrgModal}>申请新增</span>
-                </span>
+                <div style={{marginLeft: '100px',height:"20px",lineHeight:"20px"}}>
+                  <span>
+                    <span style={{color: '#CDCDCD'}}>未找到包含“{departmentsName}”的院系/部门，</span>
+                    <span style={{color: '#4CACFF', cursor: 'pointer'}} onClick={this.showApplyForAddChildOrgModal}>申请新增</span>
+                  </span>
+                </div>
               }
-              </div>
+              
 
                 {/* htmlType="submit"  */}
             {/* <Form.Item>
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 (
         <div>
-          {this.state.certification===1?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
-              wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
+          {this.state.certification===1?<RealNameCertificationModal  {...this.props}
+              wrappedComponentRef={(form) => this.realNameCertificationModal1 = form} certification={certification}
           ></RealNameCertificationModal>:""}
 
-					{this.state.certification===2?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
-          wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
+					{this.state.certification===2?<RealNameCertificationModal  {...this.props}
+          wrappedComponentRef={(form) => this.realNameCertificationModal2 = form} certification={certification}
       ></RealNameCertificationModal>:""}
           <div className="basicForm">
             <style>{`