合并头部代码

src/military/qz2022.js

@@ -12,6 +12,7 @@ import { Menu, Popover, Spin } from "antd";
 import banner from './qz2022/image/banner.png'
 import { getQz2022, userCompetitionStatus } from "./qz2022/api";
 import { paths } from "./qz2022/static";
+import Login from './components/login';
 
 const Introduce = Loadable({
   loader: () => import('./qz2022/introduce'),
@@ -147,9 +148,11 @@ const Qz2022 = (props) => {
 
   return (
     <React.Fragment>
+      <Login {...props} />
       {/* banner图+选项 */}
       <img src={banner} className="qz_banner"/>
       <div className="qz2022">
+        <div className={`qz2022-top ${fixedTop}`}>
         {paths.indexOf(active) !== -1 && <ul className="qz2022Menu mt20 qz_main">
           <li className={ active==='qz2022' ||active === "introduce"? "active" : ""}>
             <Link to={{ pathname: `/competition/qz2022/introduce` }}>大赛介绍</Link>
@@ -189,7 +192,7 @@ const Qz2022 = (props) => {
             </li>}
           </ul>}
           {paths.indexOf(active) !== -1 && <div className="menu_border mt20 qz_main"></div>}
-        {/* </div> */}
+        </div>
         <Spin spinning={false} wrapperClassName="spinstyle qzCont" tip="正在同步镜像" size="large">
           <Switch {...props}>
             {/* 通知公告详情页 */}

src/modules/tpm/TPMIndexHOC.js

@@ -280,6 +280,7 @@ export function TPMIndexHOC(WrappedComponent, headFoot) {
 				resetUserInfo:this.fetchUsers,
 				showCompeleteDialog:this.showCompeleteDialog
 			};
+			let qz2022 = this.props.match.path.includes('/competition/qz2022');
 			return (
 				<div className="indexHOC">
 					<SystemNotice 
@@ -301,12 +302,13 @@ export function TPMIndexHOC(WrappedComponent, headFoot) {
 						{...this.state}
 					/> : ""}
 					{/* <Header {...this.state} {...this.props} {...common} publicNav={publicNav}></Header> */}
-					<NewHeader {...this.state} {...this.props} {...common}></NewHeader>
+					{/* <NewHeader {...this.state} {...this.props} {...common}></NewHeader> */}
+					{!qz2022&&<NewHeader {...this.state} {...this.props} {...common}></NewHeader>}
 					<Spin spinning={this.state.globalLoading} delay={0} className="globalSpin"
 						size="large" tip={this._gLoadingTip || "加载中..."}
 					>
 						<div className="newContainer newContainers">
-							{!publicNav && <div style={{height:"70px"}}></div> }
+							{!publicNav && !qz2022&&<div style={{height:"70px"}}></div> }
 							{
 								current_user &&
 								<WrappedComponent initCommonState={(user) => this.initCommonState(user)}