From 32c678ed3b8fa334765ed4c1461c043f662510df Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 22 Jun 2019 10:25:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E5=8D=B7=EF=BC=9Aq=5Fposition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/coursesPublic/HomeworkModal.js    | 6 +++---
 .../modules/courses/exercise/ExerciseReviewAndAnswer.js   | 2 +-
 .../src/modules/courses/exercise/question/fillEmpty.js    | 8 ++++----
 .../src/modules/courses/exercise/question/multiple.js     | 3 ++-
 .../src/modules/courses/exercise/question/simpleAnswer.js | 2 +-
 public/react/src/modules/user/usersInfo/Infos.js          | 2 +-
 public/react/src/modules/user/usersInfo/InfosProject.js   | 4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/HomeworkModal.js b/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
index f448483d2..bc2fb60b5 100644
--- a/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
+++ b/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
@@ -200,7 +200,7 @@ class HomeworkModal extends Component{
             {this.props.modaltype===undefined||this.props.modaltype===2||this.props.modaltype===4 
               || !course_groups || course_groups.length == 0 
               || this.props.usingCheckBeforePost ?"":<ul className="upload_select_box fl clearfix mt20 mb30"
-                style={{"overflow-y":"auto"}}
+                style={{"overflow-y":"auto",padding:"10px 0px"}}
                 id="search_not_members_list"
 
                 // onScroll={this.contentViewScroll}
@@ -221,8 +221,8 @@ class HomeworkModal extends Component{
                   {
                     course_groups.map((item,key)=>{
                       return(
-                        <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
-                          <li  style={{ width: '100%'}}>
+                        <div className="clearfix edu-txt-center lineh-40" key={key}>
+                          <li  style={{ width: '100%',padding: "0px 10px"}}>
                             <Checkbox
                               className="task-hide edu-txt-left"
                               name="shixun_homework[]"
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index 06291a8d6..0893a5e23 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -660,7 +660,7 @@ class ExerciseReviewAndAnswer extends Component{
                   return(
                     <div className="bor-top-greyE pt30 pb30" id={"Anchor_"+parseInt(key+1)}>
                       <p className="clearfix font-16 pl30 pr30">
-                        <span className="color-blue mr5">{exercise_questions.q_position}、{type[item.question_type]}</span><span className="color-grey-9 mr5">({item.question_score}分)</span>
+                        <span className="color-blue mr5">{item.q_position}、{type[item.question_type]}</span><span className="color-grey-9 mr5">({item.question_score}分)</span>
                         <span className="fr">
                           {
                             // 填空(一直都有调分)，和简答题调分：老师身份 已经评分的才能出现调分按钮
diff --git a/public/react/src/modules/courses/exercise/question/fillEmpty.js b/public/react/src/modules/courses/exercise/question/fillEmpty.js
index 030dec7e8..b5e8d62b5 100644
--- a/public/react/src/modules/courses/exercise/question/fillEmpty.js
+++ b/public/react/src/modules/courses/exercise/question/fillEmpty.js
@@ -65,7 +65,7 @@ class fillEmpty extends Component{
           if(array[i].value ==""){ count++; }
         }
         let k = count==array.length ? 0 : 1;
-        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.question_number)-1,k);
+        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position)-1,k);
       }
     }).catch((error)=>{
       console.log(error);
@@ -115,11 +115,11 @@ class fillEmpty extends Component{
                   <input value={item.value} className="input-100-35" style={{backgroundColor: "#F5F5F5",cursor:"default"}} placeholder={ isStudent && item.value ? `请输入填空${key+1}的答案` : "" } readOnly/>
                   :
                   <DMDEditor 
-                    ref={`md${questionType.question_number}${key}`}
+                    ref={`md${questionType.q_position}${key}`}
                     toMDMode={this.toMDMode} toShowMode={this.toShowMode}
                     height={150} className={'optionMdEditor'} watch={false} noStorage={true}
-                    mdID={item.q_id +"_"+ key} placeholder={`输入填空${key+1}的答案`} onChange={(value) => this.onOptionContentChange(value, key)}
-                    initValue={item.value} onCMBlur={()=>this.onBlurEmpty(key,questionType.question_number)}
+                    mdID={questionType.question_id +"_"+ key} placeholder={`输入填空${key+1}的答案`} onChange={(value) => this.onOptionContentChange(value, key)}
+                    initValue={item.value} onCMBlur={()=>this.onBlurEmpty(key,questionType.q_position)}
                   ></DMDEditor>
                 }
                 </div>
diff --git a/public/react/src/modules/courses/exercise/question/multiple.js b/public/react/src/modules/courses/exercise/question/multiple.js
index 5e271b30f..939122a48 100644
--- a/public/react/src/modules/courses/exercise/question/multiple.js
+++ b/public/react/src/modules/courses/exercise/question/multiple.js
@@ -25,7 +25,7 @@ class Multiple extends Component{
         }else{
           k=0;
         }
-        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.question_number)-1,k);
+        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position)-1,k);
       }
     }).catch((error)=>{
       console.log(error);
@@ -39,6 +39,7 @@ class Multiple extends Component{
       user_exercise_status
     }=this.props
     let isStudent =this.props.isStudent();
+    console.log(questionType);
     return(
       <div className="pl30 pr30">
         <Checkbox.Group disabled={ user_exercise_status == 1 ? true : false } onChange={this.saveId} defaultValue={questionType.user_answer}>
diff --git a/public/react/src/modules/courses/exercise/question/simpleAnswer.js b/public/react/src/modules/courses/exercise/question/simpleAnswer.js
index d623d8091..773c93708 100644
--- a/public/react/src/modules/courses/exercise/question/simpleAnswer.js
+++ b/public/react/src/modules/courses/exercise/question/simpleAnswer.js
@@ -30,7 +30,7 @@ class simpleAnswer extends Component{
         //   simpleValue:undefined
         // })
         let k= simpleAnswer == "" ? 0 :1;
-        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.question_number)-1,k);
+        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position)-1,k);
       }
     }).catch((error)=>{
       console.log(error);
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index 026ebc06b..81198b45c 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/public/react/src/modules/user/usersInfo/Infos.js
@@ -308,7 +308,7 @@ class Infos extends Component{
                   :
                   <div className="inline">
                     <a href="javascript:void(0);" onClick={this.followPerson} className="user_default_btn user_watch_btn user_private_btn fl mr20">{followed ? "取消关注":"关注"}</a>
-                    <a href={`/users/${login}/message_detail?user_id=${id}`} className="user_default_btn user_private_btn fl">私信</a>
+                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${login}/message_detail?user_id=${id}`} className="user_default_btn user_private_btn fl">私信</a>
                   </div>
                 }
               </div>
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 99232b8ef..cfd2bc443 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -122,7 +122,7 @@ class InfosProject extends Component{
         <div className="square-list clearfix">
           {
             !isStudent && page == 1 && !category && is_current &&
-            <Create href={"/projects/new"} name={"新建项目"} index="4"></Create>
+            <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建项目"} index="4"></Create>
           }
           {
             (!data || data.projects.length==0) && (isStudent || category) && <NoneData></NoneData>
@@ -130,7 +130,7 @@ class InfosProject extends Component{
           {
             data && data.projects && data.projects.map((item,key)=>{
               return(
-                <div className="square-Item" onClick={()=>this.turnToCourses(`/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer"}}>
+                <div className="square-Item" onClick={()=>this.turnToCourses(`${this.props.Headertop && this.props.Headertop.old_url}/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer"}}>
                   {
                     item.is_public==1 &&
                     <React.Fragment>

From beddaecc4ddaa451adba1cf100272609a81404d1 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, 22 Jun 2019 10:37:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/Resource/index.js     | 11 +++
 .../courses/coursesDetail/CoursesBanner.js    | 13 ++--
 .../src/modules/courses/exercise/Exercise.js  |  7 +-
 public/react/src/modules/courses/poll/Poll.js | 37 +++++-----
 .../courses/shixunHomework/shixunHomework.js  | 67 +++++++++++++------
 5 files changed, 88 insertions(+), 47 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 2cc5dbafb..1cae3d559 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -49,8 +49,19 @@ class Fileslists extends Component{
       this.seactall(parseInt(this.props.match.params.Id),1)
     }
     this.updadatalist();
+		on('updateNavSuccess', this.updateNavSuccess)
   }
 
+	updateNavSuccess=()=>{
+		this.setState({
+			isSpin:true
+		})
+		if(this.props.match.params.main_id){
+			this.seactall();
+		}else if(this.props.match.params.Id){
+			this.seactall(parseInt(this.props.match.params.Id),1)
+		}
+	}
   componentDidUpdate = (prevProps) => {
     if(prevProps.match.params.main_id != this.props.match.params.main_id){
       this.setState({
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index f587697f2..f46087ae5 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -55,12 +55,13 @@ class CoursesBanner extends Component {
       let courseId = this.props.match.params.coursesId;
       let url = "/courses/" + courseId + "/top_banner.json"
       axios.get(url).then((result) => {
-              let data = result.data;
-              this.setState({
-                  coursedata: data
-              })
-              // console.log(data)
-
+      	debugger
+      	if( result!=undefined){
+					let data = result.data;
+					this.setState({
+						coursedata: data
+					})
+				}
       })
   }
     showeditmenu = () => {
diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js
index 6f9470260..4a2426f3d 100644
--- a/public/react/src/modules/courses/exercise/Exercise.js
+++ b/public/react/src/modules/courses/exercise/Exercise.js
@@ -5,7 +5,7 @@ import ExerciseListItem from './ExerciseListItem'
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import '../css/members.css'
-import { WordsBtn } from 'educoder'
+import { WordsBtn,on, off, trigger } from 'educoder'
 import '../css/busyWork.css'
 import _ from 'lodash';
 import moment from 'moment'
@@ -54,8 +54,13 @@ class Exercise extends Component{
     // 加载列表
     componentDidMount(){
         this.reloadList();
+			on('updateNavSuccess', this.updateNavSuccess)
     }
 
+	updateNavSuccess=()=>{
+		this.reloadList();
+	}
+
     reloadList=()=>{
         this.setState({
             isSpin:true
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index aa01bcf47..9f9291b61 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -1,26 +1,18 @@
 import React,{ Component } from "react";
 import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip ,Spin} from "antd";
-import CourseLayoutcomponent from '../common/CourseLayoutComponent';
+import {WordsBtn, on, off, trigger } from 'educoder';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
-import ShixunModal from "../coursesPublic/ShixunModal";
-import PathModal from "../coursesPublic/PathModal";
 import AddcoursesNav from "../coursesPublic/AddcoursesNav";
-import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish'
-import ImmediatelyEnd from './pollPublicBtn/ImmediatelyEnd'
-import PollListItem from './PollListItem'
-import NoneData from '../coursesPublic/NoneData'
-import UseBank from '../busyWork/UseBank'
-
+import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish';
+import ImmediatelyEnd from './pollPublicBtn/ImmediatelyEnd';
+import PollListItem from './PollListItem';
+import NoneData from '../coursesPublic/NoneData';
+import UseBank from '../busyWork/UseBank';
 import _ from 'lodash';
-
-import '../css/members.css'
-import '../css/busyWork.css'
-
-
-import { WordsBtn } from 'educoder'
-import Modals from '../../modals/Modals'
-
-import axios from 'axios'
+import '../css/members.css';
+import '../css/busyWork.css';
+import Modals from '../../modals/Modals';
+import axios from 'axios';
 
 const Search = Input.Search;
 
@@ -144,7 +136,16 @@ class Poll extends Component{
     })
     let{type,StudentList_value,page}=this.state
     this.InitList(type,StudentList_value,page);
+
+		on('updateNavSuccess', this.updateNavSuccess)
   }
+	updateNavSuccess=()=>{
+		this.setState({
+			isSpin:true
+		})
+		let{type,StudentList_value,page}=this.state
+		this.InitList(type,StudentList_value,page);
+	}
   //切换分页
   changePage=(pageNumber)=>{
 
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 1933f1ad7..70acf0f80 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -57,29 +57,52 @@ class ShixunHomework extends Component{
       isSpin:false
     }
   }
-
+	updateNavSuccess=()=>{
+		this.setState({
+			isSpin:true
+		})
+		if(this.props.match.params.main_id){
+			this.setState({
+				isSpin:true
+			})
+			this.seactall();
+			if(this.props.isAdmin()===true){
+				this.updadatalist()
+			}
+
+		}else if(this.props.match.params.category_id){
+			this.setState({
+				isSpin:true
+			})
+			this.seactall(parseInt(this.props.match.params.category_id))
+			if(this.props.isAdmin()===true){
+				this.updadatalist()
+			}
+		}
+	}
   componentDidMount() {
-    this.setState({
-      isSpin:true
-    })
-    if(this.props.match.params.main_id){
-      this.setState({
-        isSpin:true
-      })
-      this.seactall();
-      if(this.props.isAdmin()===true){
-        this.updadatalist()
-      }
-
-    }else if(this.props.match.params.category_id){
-      this.setState({
-        isSpin:true
-      })
-      this.seactall(parseInt(this.props.match.params.category_id))
-      if(this.props.isAdmin()===true){
-        this.updadatalist()
-      }
-    }
+		this.setState({
+			isSpin:true
+		})
+		if(this.props.match.params.main_id){
+			this.setState({
+				isSpin:true
+			})
+			this.seactall();
+			if(this.props.isAdmin()===true){
+				this.updadatalist()
+			}
+
+		}else if(this.props.match.params.category_id){
+			this.setState({
+				isSpin:true
+			})
+			this.seactall(parseInt(this.props.match.params.category_id))
+			if(this.props.isAdmin()===true){
+				this.updadatalist()
+			}
+		}
+		on('updateNavSuccess', this.updateNavSuccess)
   }
   seactall=(id)=>{
    this.setState({

From f50e32075a2bf0ebc53cb73b9f4dcd687c287706 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, 22 Jun 2019 10:38:33 +0800
Subject: [PATCH 3/3] =?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/coursesDetail/CoursesBanner.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index f46087ae5..43e44c500 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -55,7 +55,6 @@ class CoursesBanner extends Component {
       let courseId = this.props.match.params.coursesId;
       let url = "/courses/" + courseId + "/top_banner.json"
       axios.get(url).then((result) => {
-      	debugger
       	if( result!=undefined){
 					let data = result.data;
 					this.setState({