From befc6f03f6a33dfa729f31a7946dc9355679620c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 17 Oct 2019 10:16:15 +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

---
 public/react/src/App.js                         | 11 ++++++++++-
 public/react/src/modules/login/EducoderLogin.js |  7 ++++---
 public/react/src/modules/tpm/NewFooter.js       |  2 +-
 public/react/src/modules/tpm/TPMIndexHOC.js     | 11 ++++++++++-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index fd945914a..b2ec1a3a3 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -287,7 +287,7 @@ class App extends Component {
 			Addcoursestypes:false,
 			mydisplay:false,
 			occupation:0,
-			mygetHelmetapi:undefined,
+			mygetHelmetapi: null,
 		}
 
 	}
@@ -386,6 +386,9 @@ class App extends Component {
 					}
 					document.head.appendChild(link);
 				}else {
+					this.setState({
+						mygetHelmetapi: undefined
+					});
 					document.title = "EduCoder";
 					var link = document.createElement('link'),
 						oldLink = document.getElementById('dynamic-favicon');
@@ -399,6 +402,9 @@ class App extends Component {
 				}
 
 			}else{
+				this.setState({
+					mygetHelmetapi: undefined
+				});
 				document.title = "EduCoder";
 				var link = document.createElement('link'),
 					oldLink = document.getElementById('dynamic-favicon');
@@ -412,6 +418,9 @@ class App extends Component {
 			}
 
 		}).catch((error) => {
+			this.setState({
+				mygetHelmetapi: undefined
+			});
 			document.title = "EduCoder";
 			var link = document.createElement('link'),
 				oldLink = document.getElementById('dynamic-favicon');
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 680c4bbc7..8cf99a793 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -140,8 +140,8 @@ class EducoderLogin extends Component {
 
     render() {
         let {showbool,loginstatus,logini} = this.state;
-        console.log("EducoderLogingetHelmetapi");
-        console.log(this.props);
+        // console.log("EducoderLogingetHelmetapi");
+        // console.log(this.props);
         // console.log(this.props.mygetHelmetapi);
         return (
             <div style={newContainer} className=" clearfix" >
@@ -154,7 +154,8 @@ class EducoderLogin extends Component {
                         "width": "100%"
                     }}>
                         <div style={{cursor:"pointer"}}>
-                            {
+                            {this.props.mygetHelmetapi === null ? ""
+                              :
                                 this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined?
                                   <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
                                   :
diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js
index 5d2403a04..5369aef20 100644
--- a/public/react/src/modules/tpm/NewFooter.js
+++ b/public/react/src/modules/tpm/NewFooter.js
@@ -39,7 +39,7 @@ class NewFooter extends Component {
             </ul>
           </div>
           <div>
-						{
+            {this.props.mygetHelmetapi === null ? "" :
 							this.props.mygetHelmetapi===undefined|| this.props.mygetHelmetapi.footer===null||this.props.mygetHelmetapi.footer===undefined?
 								<p className="footer_con-p inline lineh-30  font-14">
 									<span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index ad3f517d7..b5f35e1ad 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -84,7 +84,7 @@ export function TPMIndexHOC(WrappedComponent) {
             globalLoading: false,
 					  dataquerys:{},
 					  isloginCancel:undefined,
-					  mygetHelmetapi:undefined,
+					mygetHelmetapi: null,
 	      }
 	    }
 
@@ -306,6 +306,9 @@ export function TPMIndexHOC(WrappedComponent) {
 							}
 							document.head.appendChild(link);
 						}else {
+							this.setState({
+								mygetHelmetapi: undefined
+							});
 							document.title = "EduCoder";
 							var link = document.createElement('link'),
 								oldLink = document.getElementById('dynamic-favicon');
@@ -319,6 +322,9 @@ export function TPMIndexHOC(WrappedComponent) {
 						}
 
 					}else{
+						this.setState({
+							mygetHelmetapi: undefined
+						});
 						document.title = "EduCoder";
 						var link = document.createElement('link'),
 							oldLink = document.getElementById('dynamic-favicon');
@@ -332,6 +338,9 @@ export function TPMIndexHOC(WrappedComponent) {
 					}
 
 				}).catch((error) => {
+					this.setState({
+						mygetHelmetapi: undefined
+					});
 					document.title = "EduCoder";
 					var link = document.createElement('link'),
 						oldLink = document.getElementById('dynamic-favicon');