Zgna
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gitlink_server' into pre_gitlink_server

This commit is contained in:
xiaoxiaoqiong 2022-05-27 18:12:34 +08:00
parent 04fbddc58d 461442f275
commit 96cca430b9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/glcc/home/lightspot/index.jsx
View File

@ -61,7 +61,7 @@ function Lightspot(props) {
<div className="info-item">
<img className="info-item-img" src={lightspot1} alt=''></img>
<h3 className="info-item-tit">汇聚行业顶尖开源项目</h3>
<div className="info-item-content">平台汇聚华为、xiuos、鲲鹏、开源基金会、飞腾、浪潮等行业尖端开源项目，把握开源生态发展脉搏</div>
<div className="info-item-content">平台汇聚商汤、腾讯、百度、阿里巴巴、亚马逊云科技、滴滴等行业尖端开源项目，把握开源生态发展脉搏</div>
</div>
<div className="info-item">

6
src/glcc/student/index.jsx
View File

@ -21,7 +21,7 @@ const gradeList = [
{ id: '研二', name: '研二' },
{ id: '研三', name: '研三' }];
function Apply(props) {
const { form, current_user, showNotification, match, setStudentInfoReset } = props;
const { form, current_user, showNotification, match,history, setStudentInfoReset } = props;
const taskId = Number(match.params.taskId);
// 可用于开发时不同账号报名
// current_user && (current_user.user_id = 6)
@ -53,7 +53,7 @@ function Apply(props) {
let clientWidth = document.body.clientWidth;
let scrollHeight = 500 * clientWidth / 1920;
window.scrollTo(0, scrollHeight);
});
},200);
// window.scrollTo(0, 50);
if (new Date().getTime() < new Date('2022-05-26').getTime()) {
@ -193,6 +193,7 @@ function Apply(props) {
// setStudentInfoReset(Math.random());
setReload(Math.random());
setLoading(false);
history.push(`/glcc/student/2`)
}
});
} else {
@ -202,6 +203,7 @@ function Apply(props) {
// setStudentInfoReset(Math.random());
setReload(Math.random());
setLoading(false);
history.push(`/glcc/student/2`)
}
});
}