glcc优化

This commit is contained in:
谢思 2022-05-09 14:36:41 +08:00 committed by caishi
parent 934157349d
commit e9439cf965
7 changed files with 12 additions and 12 deletions

View File

@ -293,7 +293,7 @@ class App extends Component {
<ConfigProvider locale={zhCN}>
<MuiThemeProvider theme={theme}>
<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
{pathName && pathName.indexOf("glcc") === -1 ? <SiderBar /> : <SiderBarHelp/>}
{!pathName || (pathName && pathName.indexOf("glcc") === -1) ? <SiderBar /> : <SiderBarHelp/>}
{/* <Router> */}
<Switch>
{/* wiki预览 */}

View File

@ -66,8 +66,8 @@ export default Form.create()(
if(!value){
callback();
}
if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
callback("只能使用以字母开头包含字母、数字、下划线、横杠等长度4到20个字符");
if(value && !value.match(/^[a-zA-Z0-9][a-zA-Z0-9_-]{3,19}$/)){
callback("只能使用以字母、数字开头包含字母、数字、下划线、横杠等长度4到20个字符");
}
callback();
}

View File

@ -103,7 +103,7 @@ export default Form.create()(
if(!value){
callback();
}
if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
if(value && !value.match(/^[a-zA-Z0-9][a-zA-Z0-9_-]{3,19}$/)){
callback("只能使用以字母开头包含字母、数字、下划线、横杠等长度4到20个字符");
}
callback();

View File

@ -16,9 +16,9 @@ export default (props) => {
return (
<div className="glcc">
{/* <Banner /> */}
<img className="glcc-banner" src={banner}></img>
<img className="glcc-banner" src={banner} alt=""></img>
{/* <div > */}
<Link className="apply-btn" to={isGlccApplyDate ? current_user && current_user.login ? '/glcc/apply' : '/login?go_page=/glcc/apply' : '/glcc'} onClick={()=>{!isGlccApplyDate && showNotification("不在报名时间报名时间为4月15日~5月8日")}}>
<Link className="apply-btn" to={isGlccApplyDate ? current_user && current_user.login ? '/glcc/apply' : '/login?go_page=/glcc/apply' : '/glcc'} onClick={()=>{!isGlccApplyDate && showNotification("不在报名时间报名时间为4月15日~5月20日")}}>
<div className="apply-text">立即报名</div>
<div className="apply-icon"><i className="font-14 iconfont icon-xiangyoujiantou "></i></div>
</Link>

View File

@ -23,14 +23,14 @@ function Lightspot(props) {
<div className="teacher-text">
<h3 className="teacher-invite">有兴趣成为GLCC的导师吗</h3>
<div className="teacher-content">想要扩大项目知名度和影响力为开源项目吸引新鲜血液培养长期开发者通过GitLink平台与高校建立连接指导开源新人传授他们的开源文化享受开源的乐趣</div>
<Link className='applyBut' to={isGlccApplyDate ? current_user && current_user.login ? '/glcc/apply' : '/login?go_page=/glcc/apply' : '/glcc'} onClick={()=>{!isGlccApplyDate && showNotification("不在报名时间报名时间为4月15日~5月8日")}}>立即报名</Link>
<Link className='applyBut' to={isGlccApplyDate ? current_user && current_user.login ? '/glcc/apply' : '/login?go_page=/glcc/apply' : '/glcc'} onClick={()=>{!isGlccApplyDate && showNotification("不在报名时间报名时间为4月15日~5月20日")}}>立即报名</Link>
</div>
<img className="teacher-img" src={teacherImg}></img>
<img className="teacher-img" src={teacherImg} alt=''></img>
</div>
<div className="info-student">
<div className="info-item">
<img className="info-item-img" src={lightspot1}></img>
<img className="info-item-img" src={lightspot1} alt=''></img>
<h3 className="info-item-tit">汇聚行业顶尖开源项目</h3>
<div className="info-item-content">平台汇聚华为xiuos鲲鹏开源基金会飞腾浪潮等行业尖端开源项目把握开源生态发展脉搏</div>
</div>

View File

@ -9,7 +9,7 @@ const stepArr = [{
},
{
title: "Step2",
date: "4.15-5.8",
date: "4.15-5.20",
content: "社区启动报名"
},
{

View File

@ -31,8 +31,8 @@ const Help = Loadable({
const Glcc = (propsF) => {
// 415~58
const isGlccApplyDate = Date.parse(new Date()) < 1652025600000;
// 415~520
const isGlccApplyDate = Date.parse(new Date()) < 1653062400000;
return (
<div className="newMain clearfix">