diff --git a/src/glcc/home/contact/index.jsx b/src/glcc/home/contact/index.jsx index 0f0841ec..0e7d8a39 100644 --- a/src/glcc/home/contact/index.jsx +++ b/src/glcc/home/contact/index.jsx @@ -15,15 +15,15 @@ function Contact() {

期待你的加入,和我们一起推动开源繁荣发展!

-

问题资讯: 243275429@qq.com

+

交流QQ群: 210174286

合作推广: gitlink@ccf.org.cn

gitlink1
-

加入GitLink

-

社区QQ群

+

加入编程夏令营

+

交流QQ群

gitlink2
diff --git a/src/glcc/home/lightspot/index.jsx b/src/glcc/home/lightspot/index.jsx index 7b259963..6c46306e 100644 --- a/src/glcc/home/lightspot/index.jsx +++ b/src/glcc/home/lightspot/index.jsx @@ -62,7 +62,7 @@ function Lightspot(props) {

汇聚行业顶尖开源项目

-
平台汇聚商汤、腾讯、百度、阿里巴巴、亚马逊云科技、滴滴等行业尖端开源项目,把握开源生态发展脉搏
+
平台汇聚腾讯、百度、阿里巴巴、亚马逊云科技、滴滴等行业尖端开源项目,把握开源生态发展脉搏
diff --git a/src/glcc/img/gitlink1.png b/src/glcc/img/gitlink1.png index 51826cb9..bc9bfe09 100644 Binary files a/src/glcc/img/gitlink1.png and b/src/glcc/img/gitlink1.png differ diff --git a/src/glcc/img/logo.png b/src/glcc/img/logo.png new file mode 100644 index 00000000..15f800cb Binary files /dev/null and b/src/glcc/img/logo.png differ diff --git a/src/glcc/img/qqChat.png b/src/glcc/img/qqChat.png index 4e2d7d66..58e9088b 100644 Binary files a/src/glcc/img/qqChat.png and b/src/glcc/img/qqChat.png differ diff --git a/src/glcc/project/component/projectDetail.jsx b/src/glcc/project/component/projectDetail.jsx index 96313e47..cebd9b09 100644 --- a/src/glcc/project/component/projectDetail.jsx +++ b/src/glcc/project/component/projectDetail.jsx @@ -42,12 +42,12 @@ export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog,

GitLink项目地址:  {info.gitlinkUrl}

项目简介:  {info.projectIntro}
- {info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map(item=>{ - return
+ {info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map((item, index)=>{ + return
{window.location.href=`/glcc/student/detail/${item.id}`}}>{item.taskName}
导师姓名:   {item.tutorName}
-
邮箱地址:   {item.tutorMail}
+ {item.tutorMail &&
邮箱地址:   {item.tutorMail}
}
{item.taskDesc}
diff --git a/src/glcc/project/projectList/index.jsx b/src/glcc/project/projectList/index.jsx index d4215430..d5786b1e 100644 --- a/src/glcc/project/projectList/index.jsx +++ b/src/glcc/project/projectList/index.jsx @@ -5,6 +5,7 @@ import './index.scss'; import { projectList } from '../../api'; import ProjectDetail from '../component/projectDetail'; import bgPng from "../../img/bgPng.png"; +import logo from "../../img/logo.png"; const {Search} = Input; // 项目列表 @@ -36,10 +37,10 @@ function ProjectList({applyTaskId, current_user, showLoginDialog, isStudentApply
{data && data.map((item, index)=>{ - return } trigger='click' overlayClassName='projectItemPopover' autoAdjustOverflow={false}> + return } trigger='click' overlayClassName='projectItemPopover' autoAdjustOverflow={false}>
-
+
{item.projectName}
{item.projectIntro}
diff --git a/src/glcc/project/projectList/index.scss b/src/glcc/project/projectList/index.scss index 581af5ff..c0d24c0c 100644 --- a/src/glcc/project/projectList/index.scss +++ b/src/glcc/project/projectList/index.scss @@ -32,6 +32,7 @@ width: 100px; height: 100px; border: 1px solid #fff; + background-color: #F5F7FF; border-radius: 50%; text-align: center; overflow: hidden; diff --git a/src/glcc/project/taskDetail/index.jsx b/src/glcc/project/taskDetail/index.jsx index 5f306345..9049e951 100644 --- a/src/glcc/project/taskDetail/index.jsx +++ b/src/glcc/project/taskDetail/index.jsx @@ -62,7 +62,7 @@ function TaskDetail(props) {
导师信息{detail.tutorName} | {detail.tutorMail}
课题简介
-
{detail.taskDesc}
+
{detail.taskDesc}
{(isStudentApplyDate || studentApplyEnd) && (applyTaskId && taskId && Object.keys(applyTaskId).includes(taskId.toString()) ? : isStudentApplyDate && )}
diff --git a/src/glcc/project/taskDetail/index.scss b/src/glcc/project/taskDetail/index.scss index ac8837a6..e71ffac4 100644 --- a/src/glcc/project/taskDetail/index.scss +++ b/src/glcc/project/taskDetail/index.scss @@ -92,6 +92,9 @@ div{ margin-bottom: 15px; } + .desc{ + white-space: pre-wrap; + } } .link{ color:#466aff;