From 6e47803988303b1a8c98ce141a680af11e753024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 5 Jul 2019 16:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/Listofworks.js |  2 +-
 .../courses/shixunHomework/Listofworksstudentone.js   |  2 +-
 public/react/src/modules/login/LoginDialog.js         | 11 +++++++----
 public/react/src/modules/tpm/NewHeader.js             |  1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 09516a5f9..37ad51216 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1515,7 +1515,7 @@ class Listofworks extends Component {
 							typelist={teacherdata === undefined ? [""] : teacherdata.homework_status}
 						/>
 						<a className="color-grey-9 fr font-16  summaryname  ml20 mr20"
-							 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id}`}>返回</a>
+							 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? ""  : jobsettingsdata.data.category.category_id===undefined?"": jobsettingsdata.data.category.category_id}`}>返回</a>
 						<a className="color-grey-9 fr font-16 mr20"
 							 href={`/shixuns/${teacherdata === undefined ? "" : teacherdata.shixun_identifier}/challenges`}
 							 target={"_blank"}>实训详情</a>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index ed87ecc0d..4e9cb3e00 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1005,7 +1005,7 @@ class Listofworksstudentone extends Component {
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<ActionBtn
 									className=" fl "
-									to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
+									to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<WordsBtn className="fl">作业详情</WordsBtn>
 							</p>
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 9bcd35a1d..36a9530b9 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -317,10 +317,13 @@ class LoginDialog extends Component {
         });
     }
     handleDialogClose() {
-      this.setState({
-        isRender: false
-      })
-        // window.location.href="/";
+      if(this.props.match.path==="/"){
+        this.setState({
+          isRender: false
+        })
+      }else{
+      window.location.href="/";
+      }
     }
 
     loginEDU=()=>{
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 251f608ca..e31603f3c 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -613,6 +613,7 @@ submittojoinclass=(value)=>{
         {/*  isRender&& isRender === true?*/}
               <LoginDialog
                   {...this.state}
+                  {...this.props}
               />
         {/*      :""*/}
         {/*}*/}