diff --git a/public/react/src/App.js b/public/react/src/App.js index be6f6a5d6..3df7e8112 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..95813c28c 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -706,6 +706,28 @@ 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获取游览器配置失败 重新请求开始读取配置"); + this.geturlsdata(); + } + }; + + geturlsdata=()=>{ let url = "/setting.json"; axios.get(url).then((response) => { // console.log("app.js开始请求/setting.json"); @@ -715,6 +737,8 @@ submittojoinclass=(value)=>{ this.setState({ mygetHelmetapi2: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); @@ -741,7 +765,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 01d617c78..e1080d679 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -315,6 +315,27 @@ 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获取游览器配置失败 重新请求开始读取配置"); + this.getAppdatausr(); + } + + }; + getAppdatausr=()=>{ let url = "/setting.json"; axios.get(url).then((response) => { // console.log("app.js开始请求/setting.json"); @@ -324,6 +345,8 @@ export function TPMIndexHOC(WrappedComponent) { 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); @@ -350,7 +373,8 @@ export function TPMIndexHOC(WrappedComponent) { this.gettablogourlnull(); }); - }; + + } /** 课堂权限相关方法,暂时写这里了 ----------------------------------------END */