Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import {Checkbox,Radio, Input,InputNumber} from "antd";
+import {Checkbox,Radio, Input,InputNumber,Spin} from "antd";
 
 import '../css/members.css'
 import '../css/busyWork.css'
@@ -75,7 +75,10 @@ class ExerciseReviewAndAnswer extends Component{
 
         Id:undefined,
         // 试卷总分
-        exerciseTotalScore:undefined
+        exerciseTotalScore:undefined,
+
+        // 加载效果
+        isSpin:false
       }
   }
   componentDidUpdate (prevProps) {
@@ -163,7 +166,8 @@ class ExerciseReviewAndAnswer extends Component{
   getInfo=()=>{
     this.setState({
       courseName:this.props.current_user.course_name,
-      userName:this.props.current_user.username
+      userName:this.props.current_user.username,
+      isSpin:true
     })
 
     let eId=this.props.match.params.Id;
@@ -187,7 +191,8 @@ class ExerciseReviewAndAnswer extends Component{
             exercise_questions:result.data.exercise_questions,
             user_exercise_status:1,
             Id:result.data.exercise_answer_user.user_id,
-            exerciseTotalScore:result.data.exercise_answer_user.score
+            exerciseTotalScore:result.data.exercise_answer_user.score,
+            isSpin:false
           })
         }
       }).catch((error)=>{
@@ -210,7 +215,8 @@ class ExerciseReviewAndAnswer extends Component{
             exercise_questions:result.data.exercise_questions,
             user_exercise_status:result.data.exercise.user_exercise_status,
             time:result.data.exercise.left_time,
-            exerciseTotalScore:result.data.user_score
+            exerciseTotalScore:result.data.user_score,
+            isSpin:false
           })
           if(result.data.exercise.left_time != null){
             this.remainTime();
@@ -498,7 +504,8 @@ class ExerciseReviewAndAnswer extends Component{
       ModalCancel,
       ModalSave,
       Loadtype,
-      exerciseTotalScore
+      exerciseTotalScore,
+      isSpin
     }=this.state
     let isAdmin = this.props.isAdmin();
     let isStudent =this.props.isStudent();
@@ -506,6 +513,7 @@ class ExerciseReviewAndAnswer extends Component{
     console.log(data&&data.exercise.user_name)
     return(
       <div className="newMain" style={{paddingTop:"0px"}}>
+        <Spin size="large" spinning={isSpin}>
         <style>{`
           .inputNumber30{
             height:30px;
@@ -834,6 +842,7 @@ class ExerciseReviewAndAnswer extends Component{
             </p>:""
           }
         </div>
+        </Spin>
       </div>
     )
   }

public/react/src/modules/courses/poll/PollDetailTabThird.js

@@ -8,7 +8,7 @@ import './pollStyle.css'
 
 import axios from 'axios';
 
-const map={1:"单选题",2:"多选题",3:"主观题"}
+const map={1:"单选题",2:"多选题",3:"主观题",4:"主观题"}
 class PollDetailTabThird extends Component{
   constructor(props){
     super(props);

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

@@ -71,43 +71,44 @@ class AccountPage extends Component {
       return (
           <div className="newMain clearfix">
             <div className="educontent df pt20">
-            <style>{`
+              <style>{`
-              .accountPage {
+                .accountPage {
-                display: flex;
+                  display: flex;
-              }
+                }
-            `}</style>
+              `}</style>
-            <AccountNav {...this.props} {...common}></AccountNav>
+              <AccountNav {...this.props} {...common}></AccountNav>
-           
+              <div className="basicFormWrap">
-            <Switch {...this.props}>
+                <Switch {...this.props}>
-              <Route exact path="/account/basic"
+                  <Route exact path="/account/basic"
-                      render={
+                          render={
-                        (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
+                            (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
-                      }
+                          }
-              ></Route>
+                  ></Route>
-              <Route exact path="/account/basic/edit"
+                  <Route exact path="/account/basic/edit"
-                      render={
+                          render={
-                        (props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
+                            (props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
-                      }
+                          }
-              ></Route>
+                  ></Route>
 
-              <Route exact path="/account/certification"
+                  <Route exact path="/account/certification"
-                      render={
+                          render={
-                        (props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)
+                            (props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)
-                      }
+                          }
-              ></Route>
+                  ></Route>
 
-              <Route exact path="/account/secure"
+                  <Route exact path="/account/secure"
-                      render={
+                          render={
-                        (props) => (<AccountSecure {...this.props} {...props} {...this.state} {...common} />)
+                            (props) => (<AccountSecure {...this.props} {...props} {...this.state} {...common} />)
-                      }
+                          }
-              ></Route>
+                  ></Route>
 
-              <Route exact path="/account"
+                  <Route exact path="/account"
-                      render={
+                          render={
-                        (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
+                            (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
-                      }
+                          }
-              ></Route>
+                  ></Route>
-            </Switch>
+                </Switch>
+              </div>
             </div>
           </div>
       );

public/react/src/modules/user/account/AccountBasic.js

@@ -22,7 +22,7 @@ class AccountBasicEdit extends Component {
     const {basicInfo} =this.props
     const showRealName = false;
     return (
-      <div className="basicFormWrap">
+      <div>
         <div className="basicForm">
           <style>{`
             .formItemInline {    

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -279,7 +279,7 @@ class AccountBasic extends Component {
     let{basicInfo}=this.props
 
     return (
-      <div className="basicFormWrap">
+      <div>
         <ApplyForAddOrgModal ref="applyForAddOrgModal" wrappedComponentRef={(form) => this.applyForAddOrgForm = form}  schoolName={school}
         {...this.props}></ApplyForAddOrgModal>
         <ApplyForAddChildOrgModal ref="applyForAddChildOrgModal" schoolName={school} schoolId={school_id} departmentName={departmentsName}

public/react/src/modules/user/account/AccountCertification.js

@@ -24,7 +24,7 @@ class AccountCertification extends Component {
       let {certification}=this.state
       let {basicInfo} = this.props;
       return (
-        <div className="basicFormWrap">
+        <div>
           <RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
               wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
           ></RealNameCertificationModal>

public/react/src/modules/user/account/AccountSecure.js

@@ -211,7 +211,7 @@ class AccountSecure extends Component {
     const { getFieldDecorator } = this.props.form;
     const { updating,seconds,secondsFlag } = this.state
     return (
-      <div className="basicFormWrap">
+      <div>
         <div className="basicForm settingForm">
           <style>{`