forgetest4
/
forgeplus
forked from jasder/forgeplus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX 项目列表页面下拉无效的bug

This commit is contained in:
Jasder 2020-03-14 16:25:11 +08:00
parent d75882030e
commit 879b5eb5fe
2 changed files with 22 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/react/src/forge/Main/Index.js
View File

@ -201,7 +201,7 @@ class Index extends Component{
</div>:"" </div>:""
) )
return( return(
<div style={{background:"#fafafa",height:"100vh"}}> <div style={{background:"#fafafa"}}>
<p className="t_project_banner"></p> <p className="t_project_banner"></p>
<div className="main ProjectListIndex"> <div className="main ProjectListIndex">
<div className="list-left"> <div className="list-left">

71
public/react/src/modules/tpm/NewFooter.js
View File

@ -4,20 +4,9 @@ import { Link } from 'react-router-dom';
class NewFooter extends Component { class NewFooter extends Component {
constructor(props) {
super(props)
}
componentWillReceiveProps(newProps, newContext) {
}
render() { render() {
return ( return (
<div className="newFooter edu-txt-center "> <div className="newFooter edu-txt-center ">
<style> <style>
{ {
` `
@ -33,47 +22,29 @@ class NewFooter extends Component {
} }
</style> </style>
{/*newContainers*/}
<div className="inner-footer_con"> <div className="inner-footer_con">
{this.props.user&&this.props.user.main_site===true?<div className="footercon"> <ul className="clearfix inner-footernav">
{/* <div className="inline mt40 mb5"> <li><a href="/" className="fl" target="_blank">网站首页</a></li>
<a href="/" className="fl" style={{height:'70px'}}> <li><Link to="/help/about_us" className="fl" target="_blank">关于我们</Link></li>
<img alt="高校智能化教学与实训平台" src={getImageUrl(`images/educoder/headNavLogo.png?1526520218`)} width="70px"> <li><Link to="/help/contact_us" className="fl" target="_blank">联系我们</Link></li>
</img> <li><Link to="/help/cooperatives" className="fl" target="_blank">合作伙伴</Link></li>
</a> <li><Link to="/help/agreement" className="fl" target="_blank">服务协议</Link></li>
<span className="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span> <li><Link to="/help/help_center" className="fl" target="_blank">帮助中心</Link></li>
</div> */} <li><Link to="/help/feedback" className="fl" target="_blank">意见反馈</Link></li>
<ul className="clearfix inner-footernav"> </ul>
<li><a href="/" className="fl" target="_blank">网站首页</a></li>
<li><Link to="/help/about_us" className="fl" target="_blank">关于我们</Link></li>
<li><Link to="/help/contact_us" className="fl" target="_blank">联系我们</Link></li>
<li><Link to="/help/cooperatives" className="fl" target="_blank">合作伙伴</Link></li>
<li><Link to="/help/agreement" className="fl" target="_blank">服务协议</Link></li>
<li><Link to="/help/help_center" className="fl" target="_blank">帮助中心</Link></li>
<li><Link to="/help/feedback" className="fl" target="_blank">意见反馈</Link></li>
</ul>
</div>:""}
<div>
{this.props.mygetHelmetapi === null ? "" :
this.props.mygetHelmetapi===undefined|| this.props.mygetHelmetapi.footer===null||this.props.mygetHelmetapi.footer===undefined?
<p className="footer_con-p inline lineh-30 font-14">
<span className="font-18 fl">©</span>&nbsp;{moment().year()}&nbsp;EduCoder
<a style={{"color":"#888"}} target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
<a style={{"color":"#888"}} target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962" className="mr15">
<img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号
</a>
<a href="https://team.trustie.net" style={{"color":"#888"}}
target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span
className="mr15">版权所有 湖南智擎科技有限公司</span>
</p>
:
<div dangerouslySetInnerHTML={{__html: this.props.mygetHelmetapi.footer}}></div>
}
</div>
<div className="cl"></div>
</div> </div>
<div>
<p className="footer_con-p inline lineh-30 font-14">
<span className="font-18 fl">©</span>&nbsp;{moment().year()}&nbsp;EduCoder
<a style={{"color":"#888"}} target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
<a style={{"color":"#888"}} target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962" className="mr15">
<img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号
</a>
<a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span
className="mr15">版权所有 湖南智擎科技有限公司</span>
</p>
</div>
<div className="cl"></div>
</div> </div>
); );
} }