diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index f01f1cee9..71e7244c6 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3977,8 +3977,10 @@ html>body #ajax-indicator { overflow-y: auto; /* overflow-y: auto; */ display: flex; - padding-bottom: 250px; - margin-bottom: -250px; + padding-left: 50px; + margin-left: -50px; + padding-right: 50px; + margin-right: -50px; } .head-nav ul#header-nav li{ diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index c2a71b5e8..1e5c134e4 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -45,7 +45,8 @@ class NewHeader extends Component { visiblemyss: false, openSearch:false, visible:false, //浮动消息框展示控制 - showSubMenu: -1 + showSubMenu: false, + zoneList: [], // 专区列表 } } componentDidMount() { @@ -58,6 +59,8 @@ class NewHeader extends Component { } window._header_componentHandler = this; + this.getZoneList(settings && settings.common.zone +'/api') + try { window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href)) } catch (e) {} @@ -192,6 +195,24 @@ class NewHeader extends Component { }); } + getZoneList = (httpUrl) =>{ + const url = `${httpUrl}/zone/open/list` + axios.get(url).then((response) => { + if (response && response.data && response.data.data && response.data.data.length > 0) { + let newArray = []; + response.data.data.forEach((e, i) => { + newArray[i] = { + name: e.name, + link: `/zone/${e.key}` + } + }); + this.setState({ zoneList: newArray }) + } else { + } + }).catch((error) => { + }); + } + matchpaths = (url) => { const { match } = this.props; const isDev = window.location.port == 3007; @@ -208,6 +229,10 @@ class NewHeader extends Component { return false } } + + matchZone = () => { + return window.location.href.includes('/zone/') + } checkProfile=(url)=>{ const { showCompeleteDialog , completeProfile } = this.props; @@ -274,7 +299,8 @@ class NewHeader extends Component { user, isRender, visible, - showSubMenu + showSubMenu, + zoneList } = this.state; let search_url = settings && settings.common && settings.common.search; return ( @@ -312,7 +338,7 @@ class NewHeader extends Component {
{ settings && settings.navbar && settings.navbar.length > 0 ? -