Merge branch 'newVersion_forge' into dev_devOps

This commit is contained in:
caishi 2020-09-24 10:34:22 +08:00
commit 8397daec22
1 changed files with 5 additions and 5 deletions

View File

@ -730,9 +730,9 @@ class NewHeader extends Component {
<img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={logo}></img>
}
</a>
{
mygetHelmetapi2 && mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length > 0 ?
<div className="head-nav pr" id={"head-navpre1"}>
<div className="head-nav pr" id={"head-navpre1"}>
{
mygetHelmetapi2 && mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length > 0 ?
<ul id="header-nav">
{
mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item, key) => {
@ -761,9 +761,9 @@ class NewHeader extends Component {
})
}
</ul>
</div>
: ""
}
}
</div>
<div className="head-right">
{this.props.user && this.props.user.login ?
<div className="edu-menu-panel">