From b369d36a3bc974576a99c9fa6903f8d3a316c7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 25 Sep 2019 15:24:34 +0800
Subject: [PATCH] Merge branches 'dev_aliyun' and 'onigin/ysl_a' of
 https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a

# Conflicts:
#	public/react/src/modules/courses/Resource/Fileslistitem.js
#	public/react/src/modules/courses/busyWork/CommonWorkItem.js
#	public/react/src/modules/courses/exercise/ExerciseListItem.js
#	public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
#	public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
#	public/react/src/modules/courses/poll/PollListItem.js
#	public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
#	public/react/src/modules/login/LoginDialog.js
---
 .../courses/graduation/topics/GraduateTopicItem.js        | 2 +-
 public/react/src/modules/login/LoginDialog.js             | 6 ++----
 public/react/src/modules/tpm/TPMIndexHOC.js               | 8 +++++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index cfb753501..45b54899f 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -17,7 +17,7 @@ class GraduateTopicItem extends Component{
   toDetailPage=(topicId)=>{
 
 		if(this.props.checkIfLogin()===false){
-			this.props.showLoginDialog()
+			this.props.showLoginDialog("iscancel")
 			return
 		}
 
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index dd34d8605..13ba02238 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -398,11 +398,9 @@ class LoginDialog extends Component {
         });
     }
     handleDialogClose = () => {
-
-     	console.log(this.props.match)
-debugger
-			if(this.props.match===undefined){
+			if(this.props.isloginCancel===undefined){
 			 window.location.href="/";
+				this.props.Modifyloginvalue();
 				// this.setState({
 				// 	isRender: false
 				// })
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 0f753b96c..4d2e4fbba 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -83,6 +83,7 @@ export function TPMIndexHOC(WrappedComponent) {
 
             globalLoading: false,
 					  dataquerys:{},
+					  isloginCancel:undefined
 	      }
 	    }
 
@@ -429,15 +430,16 @@ export function TPMIndexHOC(WrappedComponent) {
 			};
       hideLoginDialog = () => {
         this.setState({
-          isRender: false
+          isRender: false,
+					isloginCancel:undefined
         })
       }
       showLoginDialog = () => {
         this.setState({
-          isRender: true
+          isRender: true,
+					isloginCancel:"iscancel"
         })
       }
-      
       checkIfLogin = () => {
         return this.state.current_user && this.state.current_user.login != ''
       }