From c54433728b32402d1d3dccce843db03a9d2a0857 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 14 May 2021 11:30:08 +0800 Subject: [PATCH] merge d029840874568f2d4d5439d0203b3d5c2b87b999 --- public/css/edu-all.css | 27 ++++----------------------- src/forge/Head/Header.js | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/public/css/edu-all.css b/public/css/edu-all.css index 22dd9995b..6485f2316 100644 --- a/public/css/edu-all.css +++ b/public/css/edu-all.css @@ -38,29 +38,6 @@ box-sizing: border-box; } -.head-nav ul#header-nav li { - float: left; - height: 60px; - line-height: 60px; - margin-right: 30px; - cursor: pointer; - position: relative; - font-size: 16px -} - - -.head-nav ul#header-nav li.active:after { - content: ''; - position: absolute; - left: 0px; - top: auto; - bottom: 10px; - right: auto; - height: 2px; - width: 14px; - background-color: #459be5; -} - .nav-img { position: absolute; top: 2px; @@ -292,6 +269,10 @@ em.vertical-line { overflow: hidden; } +/*底部*/ +.newFooter { + max-height: 110px; +} .newFooter { position: absolute; diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 1d946e6ca..a2fd1052e 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -127,6 +127,26 @@ class NewHeader extends Component { } } + submitsubmitapplications = () => { + let { + submitapplicationssum, + submitapplicationsvaluedata + } = this.state; + this.setState({ + submitapplications: false, + RadioGroupvalue: undefined + }) + if (submitapplicationssum === 0) { + if (submitapplicationsvaluedata !== undefined) { + window.location.href = "/courses/" + submitapplicationsvaluedata; + } + } else if (submitapplicationssum === 1) { + if (submitapplicationsvaluedata !== undefined) { + window.location.href = "/projects/" + submitapplicationsvaluedata; + } + } + } + educoderlogin = () => { //登录账号 this.setState({