新issues 分支改动

README.md

@@ -1,5 +1,6 @@
 # README
-
+https://www.trustie.net/issues/24719
+[云上实验室] Logo、导航、底部备案信息定制化
 This README would normally document whatever steps are necessary to get the
 application up and running.
 

public/react/package.json

@@ -68,6 +68,7 @@
     "react-content-loader": "^3.1.1",
     "react-dev-utils": "^5.0.0",
     "react-dom": "^16.9.0",
+    "react-helmet": "^5.2.1",
     "react-hot-loader": "^4.0.0",
     "react-infinite-scroller": "^1.2.4",
     "react-loadable": "^5.3.1",

public/react/src/App.js

@@ -9,7 +9,7 @@ import {
 	Route,
 	Switch
 } from 'react-router-dom';
-
+import axios from 'axios';
 import '@icedesign/base/dist/ICEDesignBase.css';
 
 import '@icedesign/base/index.scss';
@@ -275,6 +275,7 @@ class App extends Component {
 			Addcoursestypes:false,
 			mydisplay:false,
 			occupation:0,
+			getapi:undefined,
 		}
 
 	}
@@ -315,7 +316,6 @@ class App extends Component {
 	}
 	componentDidMount() {
 		this.disableVideoContextMenu();
-
 		// force an update if the URL changes
 		history.listen(() => {
 			this.forceUpdate()
@@ -324,7 +324,8 @@ class App extends Component {
 			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
 		});
 
-		initAxiosInterceptors(this.props)
+		initAxiosInterceptors(this.props);
+		this.getAppdata();
 		//
 		// axios.interceptors.response.use((response) => {
 		// 	// console.log("response"+response);
@@ -350,6 +351,20 @@ class App extends Component {
 		this.setState({
 			isRender:false,
 		})
+	};
+  //获取当前定制信息
+	getAppdata=()=>{
+		let url = "/setting.json";
+		axios.get(url).then((response) => {
+			if(response){
+				this.setState({
+					getapi:response.data.setting
+				})
+			}
+
+		}).catch((error) => {
+
+		});
 	}
 
 	render() {
@@ -450,7 +465,7 @@ class App extends Component {
 							></Route>
 
 							{/*课堂*/}
-							<Route path="/courses" component={CoursesIndex} {...this.props}></Route>
+							<Route path="/courses" component={CoursesIndex} {...this.props}  {...this.state}></Route>
 
 							{/* <Route path="/forums" component={ForumsIndexComponent}>
 							</Route> */}
@@ -484,7 +499,12 @@ class App extends Component {
 										 render={
 											 (props)=>(<Ecs {...this.props} {...props} {...this.state}></Ecs>)
 										 }/>
-							<Route exact path="/" component={ShixunsHome}/>
+							<Route exact path="/"
+										 // component={ShixunsHome}
+										 render={
+											 (props)=>(<ShixunsHome {...this.props} {...props} {...this.state}></ShixunsHome>)
+										 }
+							/>
 							<Route component={Shixunnopage}/>
 
 

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

@@ -67,11 +67,14 @@ class NewHeader extends Component {
       occupation:0,
       mydisplay:false
     }
-    // console.log("176")
+     console.log("176")
     // console.log(props);
+    console.log("NewHeader1234567890");
+    console.log(this.props);
   }
 
   componentDidMount() {
+
     window._header_componentHandler = this;
 
     //下拉框的显示隐藏

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

@@ -644,6 +644,7 @@ export function TPMIndexHOC(WrappedComponent) {
             </Spin>
 
 						<NewFooter
+							{...this.state} {...this.props}
 								Footerdown={Footerdown}
 						/>