From e62ffdc46342cb6f48d120ed86c36e3426185847 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 7 Aug 2019 17:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                          |  2 +-
 public/react/src/common/components/LinkAfterLogin.js   | 10 +++++++++-
 .../src/modules/courses/coursesDetail/CoursesBanner.js |  2 +-
 public/react/src/modules/moop_cases/CaseList.js        |  5 ++++-
 .../react/src/modules/paths/PathDetail/DetailCards.js  |  2 +-
 public/react/src/modules/tpm/TPMBanner.js              |  2 +-
 public/react/src/modules/tpm/TPMIndexHOC.js            |  8 ++++----
 .../modules/tpm/shixunchild/Challenges/Challenges.js   |  2 +-
 8 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 8a5a48004..c7bd7d307 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -29,7 +29,7 @@ if (isDev) {
   	}
     debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
         window.location.search.indexOf('debug=s') != -1 ? 'student' :
-        window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || ''
+        window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
 }
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
diff --git a/public/react/src/common/components/LinkAfterLogin.js b/public/react/src/common/components/LinkAfterLogin.js
index d0df08f0a..e7365abba 100644
--- a/public/react/src/common/components/LinkAfterLogin.js
+++ b/public/react/src/common/components/LinkAfterLogin.js
@@ -8,7 +8,15 @@ class LinkAfterLogin extends Component {
 	}
     checkAuth = () => {
         if (this.props.checkIfLogin()) {
-            this.props.history.push(this.props.to)
+					if(this.props.checkProfileComplete){
+						if(this.props.checkIfProfileCompleted()){
+							this.props.history.push(this.props.to)
+						}else{
+							this.props.showProfileCompleteDialog();
+						}
+					}else{
+						this.props.history.push(this.props.to)
+					}
         } else {
             this.props.showLoginDialog()
         }
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index afe7b606a..7e3b2e0e4 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -353,8 +353,8 @@ class CoursesBanner extends Component {
 
 						{AccountProfiletype===true?<AccountProfile
 							hideAccountProfile={()=>this.hideAccountProfile()}
-							{...this.state}
 							{...this.props}
+							{...this.state}
 						/>:""}
 
 
diff --git a/public/react/src/modules/moop_cases/CaseList.js b/public/react/src/modules/moop_cases/CaseList.js
index 9bbafe98c..626b06eb8 100644
--- a/public/react/src/modules/moop_cases/CaseList.js
+++ b/public/react/src/modules/moop_cases/CaseList.js
@@ -94,6 +94,7 @@ class CaseList extends Component{
   render(){
     let { type , search ,libraries , totalCount ,pageSize ,page } = this.state;
     let { checkIfLogin } = this.props;
+
     return(
       <React.Fragment>
         <img src={mainImg} width="100%" />
@@ -101,7 +102,9 @@ class CaseList extends Component{
           <div className="edu-back-white mb30 mt30">
             <p className="padding20-30 clearfix bor-bottom-greyE">
               <span className="font-18 fl color-grey-3">教学案例</span>
-              <LinkAfterLogin {...this.props} to={'/moop_cases/new'} className="fr edu-default-btn edu-blueline-btn">发布案例</LinkAfterLogin>
+              <LinkAfterLogin {...this.props} to={'/moop_cases/new'} className="fr edu-default-btn edu-blueline-btn" checkProfileComplete = {true}
+                
+              >发布案例</LinkAfterLogin>
               {/* <ActionBtn style="colorBlue" className="fr" to="/moop_cases/new">发布案例</ActionBtn> */}
             </p>
             <div className="clearfix pl30 pr30">
diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js
index 19894e856..21165ff57 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCards.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCards.js
@@ -330,8 +330,8 @@ class DetailCards extends Component{
       <div>
 				{AccountProfiletype===true?<AccountProfile
 					hideAccountProfile={()=>this.hideAccountProfile()}
-					{...this.state}
 					{...this.props}
+					{...this.state}
 				/>:""}
 
         <Modals
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index c75eb3071..26e2350a6 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -571,8 +571,8 @@ class TPMBanner extends Component {
 
 			{AccountProfiletype===true?<AccountProfile
 				hideAccountProfile={()=>this.hideAccountProfile()}
-				{...this.state}
 				{...this.props}
+				{...this.state}
 			/>:""}
 
 
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 0b4f312e4..229c4bbae 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -310,12 +310,12 @@ export function TPMIndexHOC(WrappedComponent) {
 
       hideAccountProfile = () => {
         this.setState({
-          hideAccountProfile: false
+          AccountProfiletype: false
         })
       }
       showProfileCompleteDialog = () => {
         this.setState({
-          hideAccountProfile: true
+          AccountProfiletype: true
         })
       }
       checkIfProfileCompleted = () => {
@@ -344,13 +344,13 @@ export function TPMIndexHOC(WrappedComponent) {
 		    	<div>
             {isRender===true ? <LoginDialog
               Modifyloginvalue={()=>this.hideLoginDialog()}
-              {...this.state}
               {...this.props}
+              {...this.state}
             /> : ""}
             {AccountProfiletype===true ? <AccountProfile
               hideAccountProfile={()=>this.hideAccountProfile()}
-              {...this.state}
               {...this.props}
+              {...this.state}
             />:""}
             <SiderBar Headertop={Headertop}/>
             {/* 注释掉了1440 影响到了手机屏幕的展示 */}
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 32d92e22c..980e1d5b2 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -299,8 +299,8 @@ class Challenges extends Component {
       <React.Fragment>
 				{AccountProfiletype===true?<AccountProfile
 					hideAccountProfile={()=>this.hideAccountProfile()}
-					{...this.state}
 					{...this.props}
+					{...this.state}
 				/>:""}
 
         {loadingContent ?