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

---
 .../react/src/modules/login/EducoderLogin.js  |  2 +
 public/react/src/modules/tpm/TPMIndexHOC.js   | 13 ----
 .../src/modules/user/LoginRegisterPage.js     | 60 +++++++++----------
 3 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index eed3a9add..8a85de374 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -138,6 +138,8 @@ class EducoderLogin extends Component {
 
     render() {
         let {showbool,loginstatus,logini} = this.state;
+        console.log("EducoderLogingetHelmetapi");
+        console.log(this.props.getHelmetapi);
         return (
             <div style={newContainer} className=" clearfix" >
 
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index f0dacf2be..f83834a33 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -594,19 +594,6 @@ export function TPMIndexHOC(WrappedComponent) {
       hideGlobalLoading = () => {
         this.setState({ globalLoading: false })
       }
-			getAppdata=()=>{
-				let url = "/setting.json";
-				axios.get(url).then((response) => {
-					if(response){
-						this.setState({
-							getHelmetapi:response.data.setting
-						})
-					}
-
-				}).catch((error) => {
-
-				});
-			};
 	  	render() {
           let{Headertop,Footerdown, isRender, AccountProfiletype}=this.state;
           const common = {
diff --git a/public/react/src/modules/user/LoginRegisterPage.js b/public/react/src/modules/user/LoginRegisterPage.js
index 1990f118f..8990f1d78 100644
--- a/public/react/src/modules/user/LoginRegisterPage.js
+++ b/public/react/src/modules/user/LoginRegisterPage.js
@@ -1,30 +1,30 @@
-import React, { Component } from 'react';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import Loading from '../../Loading';
-
-import Loadable from 'react-loadable';
-
-// import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
-
-import { SnackbarHOC, getImageUrl } from 'educoder';
-import LoginRegisterComponent from './LoginRegisterComponent';
-import FindPasswordComponent from './FindPasswordComponent';
-
-class LoginRegisterPage extends Component {
-    render() {
-      // newMain clearfix
-      return (
-          <div className="">
-                  login
-            <LoginRegisterComponent {...this.props} {...this.state}></LoginRegisterComponent>
-            <br></br>
-            <br></br>
-            <FindPasswordComponent {...this.props} {...this.state}></FindPasswordComponent>
-          </div>
-      );
-    }
-}
-
-export default SnackbarHOC() (  ( LoginRegisterPage ));
+import React, { Component } from 'react';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import Loading from '../../Loading';
+
+import Loadable from 'react-loadable';
+
+// import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
+
+import { SnackbarHOC, getImageUrl } from 'educoder';
+import LoginRegisterComponent from './LoginRegisterComponent';
+import FindPasswordComponent from './FindPasswordComponent';
+
+class LoginRegisterPage extends Component {
+    render() {
+      // newMain clearfix
+      return (
+          <div className="">
+
+            <LoginRegisterComponent {...this.props} {...this.state}></LoginRegisterComponent>
+            <br></br>
+            <br></br>
+            <FindPasswordComponent {...this.props} {...this.state}></FindPasswordComponent>
+          </div>
+      );
+    }
+}
+
+export default SnackbarHOC() (  ( LoginRegisterPage ));