调整

public/react/src/App.js

@@ -366,7 +366,7 @@ class App extends Component {
 						oldLink = document.getElementById('dynamic-favicon');
 					link.id = 'dynamic-favicon';
 					link.rel = 'shortcut icon';
-					link.href = response.data.setting.nav_logo_url;
+					link.href = response.data.setting.tab_logo_url;
 					if (oldLink) {
 						document.head.removeChild(oldLink);
 					}
@@ -463,10 +463,22 @@ class App extends Component {
 
 							<Route path="/compatibility" component={CompatibilityPageLoadable}/>
 							<Route
-								path="/login" component={EducoderLogin}
+								path="/login"
+								render={
+									(props) => {
+
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
+									}
+								}
 							/>
 							<Route
-								path="/register" component={EducoderLogin}
+								path="/register"
+								render={
+									(props) => {
+
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
+									}
+								}
 							/>
 							<Route path="/users/:username"
 								render={
@@ -484,7 +496,13 @@ class App extends Component {
 							}></Route>
 
 							<Route
-								path="/changepassword" component={EducoderLogin}
+								path="/changepassword"
+								render={
+									(props) => {
+
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
+									}
+								}
 							/>
               <Route
 							  path="/interesse" component={Interestpage}

public/react/src/modules/login/EducoderLogin.js

@@ -19,6 +19,7 @@ import {
     notification
 } from "antd";
 import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import { SnackbarHOC,getImageUrl } from 'educoder';
 import '../courses/css/members.css';
 import "../courses/common/formCommon.css"
 import '../courses/css/Courses.css';
@@ -138,8 +139,9 @@ class EducoderLogin extends Component {
 
     render() {
         let {showbool,loginstatus,logini} = this.state;
-        console.log("EducoderLogingetHelmetapi");
-        console.log(this.props.getHelmetapi);
+        // console.log("EducoderLogingetHelmetapi");
+        // console.log(this.props);
+        // console.log(this.props.mygetHelmetapi);
         return (
             <div style={newContainer} className=" clearfix" >
 
@@ -151,7 +153,16 @@ class EducoderLogin extends Component {
                         "width": "100%"
                     }}>
                         <div style={{cursor:"pointer"}}>
+                            {
+                                this.props.getHelmetapi===undefined?
+                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
+                                  :
+                                  this.props.getHelmetapi.login_logo_url===undefined?
                                   <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
+                                  :
+                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={getImageUrl(this.props.getHelmetapi.login_logo_url)}/>
+                            }
+
                         </div>
 
 

public/react/src/modules/tpm/NewHeader.js

@@ -687,6 +687,8 @@ submittojoinclass=(value)=>{
       activeIndex = true;
     }
 
+	  console.log("NewHeader");
+    console.log(this.props);
     return (
 
       <div className="newHeaders" id="nHeader"  >
@@ -703,7 +705,14 @@ submittojoinclass=(value)=>{
 					{...this.state}
 				/>:""}
 				<Link to="/" className={"fl mr30 ml25 mt10"}>
+          {
+            this.props.getHelmetapi===undefined?
               <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
+              :this.props.getHelmetapi.nav_logo_url===undefined?
+              <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
+              :
+              <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(this.props.getHelmetapi.nav_logo_url)}></img>
+          }
 				</Link>
 
 				<style>

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -287,14 +287,14 @@ export function TPMIndexHOC(WrappedComponent) {
 					if(response){
 						if(response.data){
 							this.setState({
-								getHelmetapi:response.data.setting
+								mygetHelmetapi:response.data.setting
 							});
 							document.title = response.data.setting.name;
 							var link = document.createElement('link'),
 								oldLink = document.getElementById('dynamic-favicon');
 							link.id = 'dynamic-favicon';
 							link.rel = 'shortcut icon';
-							link.href = response.data.setting.nav_logo_url;
+							link.href = response.data.setting.tab_logo_url;
 							if (oldLink) {
 								document.head.removeChild(oldLink);
 							}
@@ -595,7 +595,7 @@ export function TPMIndexHOC(WrappedComponent) {
         this.setState({ globalLoading: false })
       }
 	  	render() {
-          let{Headertop,Footerdown, isRender, AccountProfiletype}=this.state;
+          let{Headertop,Footerdown, isRender, AccountProfiletype,getHelmetapi}=this.state;
           const common = {
             isSuperAdmin:this.isSuperAdmin,
             isAdminOrCreator:this.isAdminOrCreator,