diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 069d07a8..64ad93fc 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -404,14 +404,41 @@ class NewHeader extends Component { }) } + getAppdata = () => { + try { + var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); + var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse')); + this.setState({ + settings: chromesettingArray + }); + if (chromesettingArray.tab_logo_url) { + this.gettablogourldata(chromesettingresponseArray); + } else { + this.gettablogourlnull(); + } + } catch (e) { + this.geturlsdata(); + } + }; + geturlsdata = () => { let url = "/setting.json"; axios.get(url).then((response) => { if (response && response.data) { this.setState({ settings: response.data.setting }); - if (response.data.setting.tab_logo_url) { - this.gettablogourldata(response); + // 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); + } else { + this.gettablogourlnull(); + } + } catch (e) { + this.gettablogourlnull(); } + } else { + this.gettablogourlnull(); } }).catch((error) => { this.gettablogourlnull(); @@ -552,7 +579,6 @@ class NewHeader extends Component { let search_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="搜索"); let notice_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="通知"); - return (
diff --git a/src/images/login/logo.png b/src/images/login/logo.png new file mode 100644 index 00000000..961f3052 Binary files /dev/null and b/src/images/login/logo.png differ diff --git a/src/modules/login/EducoderLogin.js b/src/modules/login/EducoderLogin.js index 59e6cc62..853dd34f 100644 --- a/src/modules/login/EducoderLogin.js +++ b/src/modules/login/EducoderLogin.js @@ -5,7 +5,7 @@ import '../courses/css/members.css'; import "../courses/common/formCommon.css" import '../courses/css/Courses.css'; import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png'; -import educodernet from '../../../src/images/login/educodernet.png'; +import educodernet from '../../../src/images/login/logo.png'; import LoginRegisterComponent from '../user/LoginRegisterComponent'; import FindPasswordComponent from '../user/FindPasswordComponent'; import passopen from "../../images/login/passopen.png"; @@ -119,87 +119,39 @@ class EducoderLogin extends Component { render() { - let {showbool,loginstatus,logini} = this.state; - // console.log("EducoderLogingetHelmetapi"); - // console.log(this.props); - // console.log(this.props.mygetHelmetapi); + let { showbool } = this.state; + const { settings } = this.props; return (
- -
-
-
- {this.props.mygetHelmetapi === null ? "" - : - this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined? - this.gohome()} src={educodernet} width="80px"/> - : - this.gohome()} width="80px" src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/> - } - -
- - +
+
+ { + settings && settings.login_logo_url ? + this.gohome()} width="80px" src={getImageUrl(settings.login_logo_url)}/> + : + this.gohome()} src={educodernet} width="80px"/> + }
{ showbool === 1 ? -
-
- - this.Setshowbool(e)} > - -
- +
+
+ this.Setshowbool(e)} >
+
: -
-
- this.Setshowbool(e)}> - -
-
+
+
+ this.Setshowbool(e)}> +
+
} - {this.props.mygetHelmetapi === null ?
-
© {moment().year()} EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.
-
: - this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?
-
© {moment().year()} EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.
-
:this.props.mygetHelmetapi.main_site===true? -
-
© {moment().year()} EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.
-
- :"" - } - +
© {moment().year()} EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.
)