From f18b50406a577d3a7d007febdcc6b7de0a4138d5 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 6 Jul 2019 10:01:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/ExerciseReviewAndAnswer.js       | 21 ++++--
 .../courses/poll/PollDetailTabThird.js        |  2 +-
 public/react/src/modules/user/AccountPage.js  | 69 ++++++++++---------
 .../src/modules/user/account/AccountBasic.js  |  2 +-
 .../modules/user/account/AccountBasicEdit.js  |  2 +-
 .../user/account/AccountCertification.js      |  2 +-
 .../src/modules/user/account/AccountSecure.js |  2 +-
 7 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index 31c293659..b9f0f67f9 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/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>
     )
   }
diff --git a/public/react/src/modules/courses/poll/PollDetailTabThird.js b/public/react/src/modules/courses/poll/PollDetailTabThird.js
index c3994c7c0..d322c9544 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabThird.js
+++ b/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);
diff --git a/public/react/src/modules/user/AccountPage.js b/public/react/src/modules/user/AccountPage.js
index 435d1e0d6..c61eed4c4 100644
--- a/public/react/src/modules/user/AccountPage.js
+++ b/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>{`
-              .accountPage {
-                display: flex;
-              }
-            `}</style>
-            <AccountNav {...this.props} {...common}></AccountNav>
-           
-            <Switch {...this.props}>
-              <Route exact path="/account/basic"
-                      render={
-                        (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
-                      }
-              ></Route>
-              <Route exact path="/account/basic/edit"
-                      render={
-                        (props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
-                      }
-              ></Route>
+              <style>{`
+                .accountPage {
+                  display: flex;
+                }
+              `}</style>
+              <AccountNav {...this.props} {...common}></AccountNav>
+              <div className="basicFormWrap">
+                <Switch {...this.props}>
+                  <Route exact path="/account/basic"
+                          render={
+                            (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
+                          }
+                  ></Route>
+                  <Route exact path="/account/basic/edit"
+                          render={
+                            (props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
+                          }
+                  ></Route>
 
-              <Route exact path="/account/certification"
-                      render={
-                        (props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)
-                      }
-              ></Route>
+                  <Route exact path="/account/certification"
+                          render={
+                            (props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)
+                          }
+                  ></Route>
 
-              <Route exact path="/account/secure"
-                      render={
-                        (props) => (<AccountSecure {...this.props} {...props} {...this.state} {...common} />)
-                      }
-              ></Route>
+                  <Route exact path="/account/secure"
+                          render={
+                            (props) => (<AccountSecure {...this.props} {...props} {...this.state} {...common} />)
+                          }
+                  ></Route>
 
-              <Route exact path="/account"
-                      render={
-                        (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
-                      }
-              ></Route>
-            </Switch>
+                  <Route exact path="/account"
+                          render={
+                            (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
+                          }
+                  ></Route>
+                </Switch>
+              </div>
             </div>
           </div>
       );
diff --git a/public/react/src/modules/user/account/AccountBasic.js b/public/react/src/modules/user/account/AccountBasic.js
index e1d084cc4..831fd39ca 100644
--- a/public/react/src/modules/user/account/AccountBasic.js
+++ b/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 {    
diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 016a32eb5..9d6b4706c 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/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}
diff --git a/public/react/src/modules/user/account/AccountCertification.js b/public/react/src/modules/user/account/AccountCertification.js
index 7ab110fdc..56381d5fa 100644
--- a/public/react/src/modules/user/account/AccountCertification.js
+++ b/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>
diff --git a/public/react/src/modules/user/account/AccountSecure.js b/public/react/src/modules/user/account/AccountSecure.js
index 2abf09f7a..19a959de6 100644
--- a/public/react/src/modules/user/account/AccountSecure.js
+++ b/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>{`
 

From 1b867cef2ed37b867469b020ffab21cd2f389028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 6 Jul 2019 10:03:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Resource/Fileslistitem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 6239f1b3d..1af027757 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -42,7 +42,7 @@ class Fileslistitem extends Component{
               let link = document.createElement('a');
 							document.body.appendChild(link);
               link.href = result.data.url;
-							console.log(filesname)
+							console.log(value)
               link.download = value;
               //兼容火狐浏览器
               let evt = document.createEvent("MouseEvents");