调整

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" >
 

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 = {

public/react/src/modules/user/LoginRegisterPage.js

@@ -1,30 +1,30 @@
-import React, { Component } from 'react';
+import React, { Component } from 'react';
-
+
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
+
-import Loading from '../../Loading';
+import Loading from '../../Loading';
-
+
-import Loadable from 'react-loadable';
+import Loadable from 'react-loadable';
-
+
-// import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
+// import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
-
+
-import { SnackbarHOC, getImageUrl } from 'educoder';
+import { SnackbarHOC, getImageUrl } from 'educoder';
-import LoginRegisterComponent from './LoginRegisterComponent';
+import LoginRegisterComponent from './LoginRegisterComponent';
-import FindPasswordComponent from './FindPasswordComponent';
+import FindPasswordComponent from './FindPasswordComponent';
-
+
-class LoginRegisterPage extends Component {
+class LoginRegisterPage extends Component {
-    render() {
+    render() {
-      // newMain clearfix
+      // newMain clearfix
-      return (
+      return (
-          <div className="">
+          <div className="">
-                  login
+
-            <LoginRegisterComponent {...this.props} {...this.state}></LoginRegisterComponent>
+            <LoginRegisterComponent {...this.props} {...this.state}></LoginRegisterComponent>
-            <br></br>
+            <br></br>
-            <br></br>
+            <br></br>
-            <FindPasswordComponent {...this.props} {...this.state}></FindPasswordComponent>
+            <FindPasswordComponent {...this.props} {...this.state}></FindPasswordComponent>
-          </div>
+          </div>
-      );
+      );
-    }
+    }
-}
+}
-
+
-export default SnackbarHOC() (  ( LoginRegisterPage ));
+export default SnackbarHOC() (  ( LoginRegisterPage ));