From 434a34bda555d0fdfbb02a21e32b07040f14c508 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 3 Sep 2019 11:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/exercise/ExerciseDisplay.js      | 9 +++++----
 .../modules/user/usersInfo/banks/ExerciseBanksDetail.js  | 2 +-
 .../react/src/modules/user/usersInfo/banks/banksMenu.js  | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/ExerciseDisplay.js b/public/react/src/modules/courses/exercise/ExerciseDisplay.js
index 984f96114..cbaf38c80 100644
--- a/public/react/src/modules/courses/exercise/ExerciseDisplay.js
+++ b/public/react/src/modules/courses/exercise/ExerciseDisplay.js
@@ -56,11 +56,12 @@ class ExerciseDisplay extends Component{
       const url = `/${this.props.urlPath || 'exercises'}/${Id}.json`
       axios.get(url)
         .then((response) => {
-          if (response.data.status == 0) {
-            response.data.exercise_description = response.data.exercise_description || response.data.description
-            response.data.exercise_name = response.data.exercise_name || response.data.name
-            response.data.exercise_status = response.data.exercise_status == undefined ? 1 : response.data.exercise_status
+          if (response.data.exercise) {
+            response.data.exercise.exercise_description = response.data.exercise.exercise_description || response.data.exercise.description
+            response.data.exercise.exercise_name = response.data.exercise.exercise_name || response.data.exercise.name
+            response.data.exercise.exercise_status = response.data.exercise.exercise_status == undefined ? 1 : response.data.exercise.exercise_status
             this.setState({...response.data})
+            this.props.detailFetchCallback && this.props.detailFetchCallback(response);
           }
         })
         .catch(function (error) {
diff --git a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js
index 4c14c2a7c..7f261da82 100644
--- a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js
+++ b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js
@@ -29,7 +29,7 @@ class ExerciseBanksDetail extends Component{
         menuArray:[//tab以及tab路由
             {to:`/banks/exercise/${Id}`,content:'内容详情'}
         ],
-        category:'exercise',//毕设选题
+        category:'exercise',//
         tos: `/banks/exercise/${Id}/edit`,
         id: Id,
 
diff --git a/public/react/src/modules/user/usersInfo/banks/banksMenu.js b/public/react/src/modules/user/usersInfo/banks/banksMenu.js
index 0d7d1a24a..7680dc748 100644
--- a/public/react/src/modules/user/usersInfo/banks/banksMenu.js
+++ b/public/react/src/modules/user/usersInfo/banks/banksMenu.js
@@ -126,7 +126,7 @@ class BanksMenu extends Component{
         
         <span className="fr mt18">
           <WordsBtn onClick={()=>this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除</WordsBtn>
-          <WordsBtn to={banksMenu&&banksMenu.category==='poll'?banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
+          <WordsBtn to={ banksMenu.tos ? banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
           <WordsBtn onClick={()=>this.sendTopics()} style="blue" className="ml20 font-16">发送</WordsBtn>
         </span>
       </div>