From 6e2e70810d2f10ad0e6c699710bf9291f3b03bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 27 Dec 2019 19:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B43=E6=AC=A1=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/App.js                     |  3 +++
 public/react/src/modules/tpm/NewHeader.js   | 25 ++++++++++++++++++++-
 public/react/src/modules/tpm/TPMIndexHOC.js | 25 ++++++++++++++++++++-
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index 07fd13e49..c5c5a869a 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -460,6 +460,9 @@ class App extends Component {
 					this.setState({
 						mygetHelmetapi:response.data.setting
 					});
+					//存储配置到游览器
+					localStorage.setItem('chromesetting',JSON.stringify(response.data.setting));
+					localStorage.setItem('chromesettingresponse',JSON.stringify(response));
 					try {
 						if (response.data.setting.tab_logo_url) {
 							this.gettablogourldata(response);
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index ac5213ec1..c633b35ed 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -706,6 +706,29 @@ submittojoinclass=(value)=>{
 	}
 
 	getAppdata=()=>{
+		try {
+			var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+			var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
+			console.log("NewHeaderNewHeaderNewHeader");
+			console.log(chromesettingArray);
+			console.log(chromesettingresponseArray);
+
+				this.setState({
+					mygetHelmetapi2:chromesettingArray
+				});
+					if (chromesettingArray.tab_logo_url) {
+						this.gettablogourldata(chromesettingresponseArray);
+					} else {
+						this.gettablogourlnull();
+					}
+		}catch (e) {
+			console.log("head获取游览器配置失败 重新请求开始读取配置");
+			console.log(e);
+         this.geturlsdata();
+		}
+	};
+
+	geturlsdata=()=>{
 		let url = "/setting.json";
 		axios.get(url).then((response) => {
 			// console.log("app.js开始请求/setting.json");
@@ -741,7 +764,7 @@ submittojoinclass=(value)=>{
 			this.gettablogourlnull();
 
 		});
-	};
+	}
 
 
     matchpaths=(url)=>{
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index fe760f372..e86c85bb2 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -315,6 +315,28 @@ export function TPMIndexHOC(WrappedComponent) {
 			}
 			//获取当前定制信息
 			getAppdata = () => {
+				try {
+					var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+					var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
+					console.log("TPMLNdexHOC");
+					console.log(chromesettingArray);
+					console.log(chromesettingresponseArray);
+						this.setState({
+							mygetHelmetapi:chromesettingArray
+						});
+							if (chromesettingArray.tab_logo_url) {
+								this.gettablogourldata(chromesettingresponseArray);
+							} else {
+								this.gettablogourlnull();
+							}
+				}catch (e) {
+					console.log("hoc获取游览器配置失败 重新请求开始读取配置");
+					console.log(e);
+          this.getAppdatausr();
+				}
+
+			};
+			getAppdatausr=()=>{
 				let url = "/setting.json";
 				axios.get(url).then((response) => {
 					// console.log("app.js开始请求/setting.json");
@@ -350,7 +372,8 @@ export function TPMIndexHOC(WrappedComponent) {
 					this.gettablogourlnull();
 
 				});
-			};
+
+			}
       /**
         课堂权限相关方法，暂时写这里了 ----------------------------------------END
       */