Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

merge

This commit is contained in:
caishi 2023-06-02 14:02:05 +08:00
parent f410df6e57 f95bc0ab24
commit 58f939416a
4 changed files with 4367 additions and 5358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9706
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
src/glcc/home/partner/index.jsx
View File

@ -62,12 +62,12 @@ function Partner({round}) {
</div>
</div>}
{round === 2 && <div className='cont cont3 mt15'>
{/* {round === 2 && <div className='cont cont3 mt15'>
钻石赞助商
<div className='pt10'>
<div className="sponsor" onClick={() => { window.open("https://www.bytedance.com/") }}><img src={sponsor43} className='gitlink' alt='字节跳动' /></div>
</div>
</div>}
</div>} */}
{round === 1 && <div className='cont1 cont mb10'>
<div>

10
src/glcc/index.jsx
View File

@ -172,9 +172,9 @@ const Glcc = (propsF) => {
// 判断该学生是否已经被某位导师选中
if(lockedTaskName){
message.error(`由于你已入选 ${lockedTaskName} 课题，无法申请其他课题`);
}else if(applyTaskId && Object.keys(applyTaskId).length >= 3){
// 判断用户是否已经报名三个课题
message.error('最多只能同时报名三个课题');
}else if(applyTaskId && Object.keys(applyTaskId).length >= 2){
// 判断用户是否已经报名两个课题
message.error('最多只能同时报名两个课题');
}else{
// 跳转到学生报名页
window.location.href=`/glcc/student/apply/${id}`;
@ -225,7 +225,7 @@ const Glcc = (propsF) => {
<Route
path="/glcc/:id/projects"
render={(props) => (
<Project period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} applyTask={applyTask}/>
<Project repoPublic={repoPublic} period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} applyTask={applyTask}/>
)}
></Route>
@ -233,7 +233,7 @@ const Glcc = (propsF) => {
<Route
path="/glcc/:id/subjects"
render={(props) => (
<Project period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} cancelCount={cancelCount} applyTask={applyTask}/>
<Project repoPublic={repoPublic} period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} cancelCount={cancelCount} applyTask={applyTask}/>
)}
></Route>

5
src/glcc/project/index.jsx
View File

@ -20,8 +20,11 @@ const TaskList = Loadable({
});
function Project(propsF) {
const {location, match:{params:{id}}} = propsF;
const {location, match:{params:{id}}, repoPublic, history} = propsF;
const {pathname} = location;
if(id==="2023" && !repoPublic){
history.push('/glcc')
}
useEffect(()=>{
window.scrollTo(0, 0);
},[])