diff --git a/public/react/src/App.js b/public/react/src/App.js index bf9e98c79..8a1986cc8 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -357,15 +357,40 @@ class App extends Component { let url = "/setting.json"; axios.get(url).then((response) => { if(response){ - this.setState({ - getHelmetapi:response.data.setting - }); - document.title = response.data.setting.name; + if(response.data){ + this.setState({ + getHelmetapi: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; + if (oldLink) { + document.head.removeChild(oldLink); + } + document.head.appendChild(link); + }else { + document.title = "EduCoder"; + var link = document.createElement('link'), + oldLink = document.getElementById('dynamic-favicon'); + link.id = 'dynamic-favicon'; + link.rel = 'shortcut icon'; + link.href = "/react/build/./favicon.ico"; + if (oldLink) { + document.head.removeChild(oldLink); + } + document.head.appendChild(link); + } + + }else{ + document.title = "EduCoder"; 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 = "/react/build/./favicon.ico"; if (oldLink) { document.head.removeChild(oldLink); } @@ -373,7 +398,16 @@ class App extends Component { } }).catch((error) => { - + document.title = "EduCoder"; + var link = document.createElement('link'), + oldLink = document.getElementById('dynamic-favicon'); + link.id = 'dynamic-favicon'; + link.rel = 'shortcut icon'; + link.href = "/react/build/./favicon.ico"; + if (oldLink) { + document.head.removeChild(oldLink); + } + document.head.appendChild(link); }); }; diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 1646e2b87..f0dacf2be 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -285,17 +285,40 @@ export function TPMIndexHOC(WrappedComponent) { let url = "/setting.json"; axios.get(url).then((response) => { if(response){ - this.setState({ - mygetHelmetapi:response.data.setting, - }); - // console.log("获取当前定制信息"); - // console.log(response.data.setting); - document.title = response.data.setting.name; + if(response.data){ + this.setState({ + getHelmetapi: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; + if (oldLink) { + document.head.removeChild(oldLink); + } + document.head.appendChild(link); + }else { + document.title = "EduCoder"; + var link = document.createElement('link'), + oldLink = document.getElementById('dynamic-favicon'); + link.id = 'dynamic-favicon'; + link.rel = 'shortcut icon'; + link.href = "/react/build/./favicon.ico"; + if (oldLink) { + document.head.removeChild(oldLink); + } + document.head.appendChild(link); + } + + }else{ + document.title = "EduCoder"; 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 = "/react/build/./favicon.ico"; if (oldLink) { document.head.removeChild(oldLink); } @@ -303,7 +326,16 @@ export function TPMIndexHOC(WrappedComponent) { } }).catch((error) => { - + document.title = "EduCoder"; + var link = document.createElement('link'), + oldLink = document.getElementById('dynamic-favicon'); + link.id = 'dynamic-favicon'; + link.rel = 'shortcut icon'; + link.href = "/react/build/./favicon.ico"; + if (oldLink) { + document.head.removeChild(oldLink); + } + document.head.appendChild(link); }); }; /**