diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx
index 5d5508a87..06eb97ea1 100644
--- a/src/forge/Information/Pages/newsDetail.jsx
+++ b/src/forge/Information/Pages/newsDetail.jsx
@@ -25,9 +25,9 @@ function NewsDetail(props){
let initialContent = undefined;
// 设置网页标题
if(detail){
- const { name, cmsDir, summary} = detail;
+ const { name, cmsDir} = detail;
document.title = `${ name }/${ cmsDir.name }`;
- addMeta('Keywords', `${ name },${ cmsDir.name },${ summary }`);
+ setMeta()
setTimeout(() => {
configShareForCustom(detail.name, detail.summary, detail.headImg)
}, 1000);
@@ -46,8 +46,7 @@ function NewsDetail(props){
document.querySelector('meta[name="viewport"]').setAttribute('content', initialContent);
}
if (zonedetail) {
- document.title= zonedetail.mainTitle;
- setSeoMeta(`${zonedetail.name},`, zonedetail.name, zonedetail.subTitle, `/zone/${deptId}`)
+ setMeta(true)
}
}
},[zonedetail,detail])
@@ -59,6 +58,19 @@ function NewsDetail(props){
}
},[id])
+ function setMeta(unmount = false) {
+ if (unmount) {
+ document.title= zonedetail.name;
+ setSeoMeta(`${zonedetail.name}`, zonedetail.name, zonedetail.subTitle, `/zone/${deptId}`)
+ } else {
+ const { name, cmsDir, summary, id} = detail;
+ const title = `${ name }/${ cmsDir.name }`;
+ const keywords = `${ name },${ cmsDir.name },${ zonedetail.name }`;
+ document.title = title;
+ setSeoMeta(keywords, title, summary, `/zone/${deptId}/newdetail/${ id }`)
+ }
+ }
+
function getDetails(){
setIsSpin(true)
getNewsDetail(id).then(result=>{
diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss
index c6c7478f5..cf7128b2b 100644
--- a/src/forge/Information/indexZonebyCCF.scss
+++ b/src/forge/Information/indexZonebyCCF.scss
@@ -1,6 +1,6 @@
@import './theme.scss';
-.zone_news {
+.zone_news_ccf {
margin-top: -10px !important;
.zone_new_first {
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 9981cd2d0..4d3f49439 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -161,7 +161,7 @@ class Infos extends Component {
const { pathname } = this.props.location;
this.renderPath(pathname,result.data);
document.title = result.data.username ? result.data.username : username;
- let keyWords=`${result.data.username},${username},`;
+ let keyWords=`${result.data.username},${username}`;
let title= result.data.username+'('+ username +')';
setSeoMeta(keyWords,title,title,`/${username}`,username);
})
diff --git a/src/glcc/apply/editInfo.jsx b/src/glcc/apply/editInfo.jsx
index 86ecbf46f..528f78fc4 100644
--- a/src/glcc/apply/editInfo.jsx
+++ b/src/glcc/apply/editInfo.jsx
@@ -1,5 +1,5 @@
import React , { useCallback, useEffect , useState } from 'react';
-import { Button, Form, Input, Select, Upload, message, Popconfirm, Checkbox } from 'antd';
+import { Button, Form, Input, Select, Upload, message, Popconfirm, Checkbox, Icon, Tooltip } from 'antd';
import {getUploadActionUrl} from 'educoder';
import {applyGlcc, findStudentTaskByTaskId, updateApplyGlcc} from '../api';
import TextArea from 'antd/lib/input/TextArea';
@@ -231,13 +231,22 @@ function EditRepoApplyInfo(props) {
{cateList && cateList.map(item=> {return
})}
)}
- {helper('GitLink地址',
- '',
- 'gitlinkUrl',
- [{ required: true, message: "请输入GitLink项目地址" },
- { max: 252, message: '超出限制长度252位字符，请重新编辑' }],
-
{verify("gitlink")}}/>
- )}
+
+
}
+ >
+
+
+
申请说明
1、项目报名时间为{formatParsedResult(applyTime, "rangeDay")}，请在报名截止时间（北京时间{formatParsedResult(applyTime, "end")}）前提交报名信息。
2、本次GLCC夏令营建议使用GitLink为代码托管平台，学生基于GitLink上项目完成编程任务。同时也欢迎使用其他代码托管平台的项目参与活动。目前GLCC只对夏令营期间使用GitLink托管的项目提供部分奖励支持。
- 3、如果您的项目还未迁移到GitLink上，迁移事项请查看
迁移说明文档。如在迁移过程中遇到问题，请加qq群: 1071514693 联系qq群管理员。
3、如果您的项目还未迁移到GitLink上，迁移事项请查看
迁移说明文档。如在迁移过程中遇到问题，请加qq群: 1071514693 联系qq群管理员。
4、提交社区和题目信息后，欢迎与组委会联系沟通宣传推广和后续合作工作。联系人微信: _TigerWang（备注GitLink编程夏令营）
5、在项目报名期间（{formatParsedResult(applyTime, "rangeDay")}），您可以随时进入当前页调整项目或课题报名信息
6、课题奖励默认由项目方支持，可提供现金或者实习机会等其他形式的奖励，请根据课题难度设定奖励内容。若您可能无法支撑本课题奖励，GLCC组委会将进行资助评审，择优资助。如未获得资助，将下线该课题
diff --git a/src/glcc/apply/index.scss b/src/glcc/apply/index.scss
index 6a52017c5..1a7810d62 100644
--- a/src/glcc/apply/index.scss
+++ b/src/glcc/apply/index.scss
@@ -57,6 +57,17 @@
max-height: 100px;
}
}
+
+ .hasQuestionBox{
+ width: 50%;
+ display: inline-flex;
+ .question{
+ color: $primary-color;
+ }
+ .ant-row.ant-form-item{
+ width: 100%;
+ }
+ }
}
.introArea{
width: 100%;
diff --git a/src/glcc/apply/taskApply.jsx b/src/glcc/apply/taskApply.jsx
index 8fe90d38a..e828b09cf 100644
--- a/src/glcc/apply/taskApply.jsx
+++ b/src/glcc/apply/taskApply.jsx
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
-import {Form, Input, Radio, Select } from 'antd';
+import {Form, Icon, Input, Radio, Select, Tooltip } from 'antd';
import TextArea from 'antd/lib/input/TextArea';
import { rewardMoney } from '../api';
const Option = Select.Option;
@@ -36,13 +36,22 @@ function TaskApply(props) {
{ max: 32, message: '超出限制长度32位字符，请重新编辑' }],
)}
- {helper('课题链接',
- '',
- `taskUrl${taskKey}`,
- [{ required: true, message: "请输入课题链接" },
- { max: 252, message: '超出限制长度252位字符，请重新编辑' }],
-
- )}
+ }
+ >
+
+
+