issue

src/glcc/home/contact/index.jsx

@@ -15,15 +15,15 @@ function Contact() {
           <div className="contact-info">
             <h4 className="contact-invite">期待你的加入，和我们一起推动开源繁荣发展！</h4>
             <div className="contact-way">
-              <p>问题资讯: 243275429@qq.com</p>
+              <p>交流QQ群: 210174286</p>
               <p>合作推广: gitlink@ccf.org.cn</p>
             </div>
           </div>
           <div className='attention'>
             <div className='one'>
               <div className='attentionDiv'><img src={gitlink1} alt="gitlink1"/></div>
-              <p>加入GitLink</p>
-              <p>社区QQ群</p>
+              <p>加入编程夏令营</p>
+              <p>交流QQ群</p>
             </div>
             <div>
               <div className='attentionDiv'><img src={gitlink2} alt="gitlink2"/></div>

src/glcc/home/lightspot/index.jsx

@@ -62,7 +62,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">平台汇聚商汤、腾讯、百度、阿里巴巴、亚马逊云科技、滴滴等行业尖端开源项目，把握开源生态发展脉搏</div>
+              <div className="info-item-content">平台汇聚腾讯、百度、阿里巴巴、亚马逊云科技、滴滴等行业尖端开源项目，把握开源生态发展脉搏</div>
             </div>
 
             <div className="info-item">

src/glcc/project/component/projectDetail.jsx

@@ -42,12 +42,12 @@ export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog,
         <p>GitLink项目地址:&nbsp;&nbsp;<a href={info.gitlinkUrl} className='linkUrl' target={"_blank"}>{info.gitlinkUrl}</a></p>
         <div>项目简介:&nbsp;&nbsp;{info.projectIntro}</div>
       </div>
-      {info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map(item=>{
-        return <div className='taskItem mt20'>
+      {info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map((item, index)=>{
+        return <div className='taskItem mt20' key={index}>
           <div className="left">
             <div className="taskTitle" onClick={()=>{window.location.href=`/glcc/student/detail/${item.id}`}}><Tooltip title={item.taskName}>{item.taskName}</Tooltip></div>
             <div className='mt20 oneLine leftWidth'>导师姓名: &nbsp;&nbsp;{item.tutorName}</div>
-            <div className='mb20 email oneLine leftWidth'>邮箱地址: &nbsp;&nbsp;<span><Tooltip title={item.tutorMail}>{item.tutorMail}</Tooltip></span></div>
+            {item.tutorMail && <div className='mb20 email oneLine leftWidth'>邮箱地址: &nbsp;&nbsp;<span><Tooltip title={item.tutorMail}>{item.tutorMail}</Tooltip></span></div>}
           </div>
           <div className="center">
             <div className="taskDesc">{item.taskDesc}</div>

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
         <Spin spinning={loading}>
           <div className='projectListBox'>
             {data && data.map((item, index)=>{
-              return <Popover placement= {(index+1)%3 === 0 ? 'bottomRight' : (index+1)%3%2 === 0 ? 'bottom' : 'bottomLeft'} content={<ProjectDetail detail={item} applyTaskId={applyTaskId} current_user={current_user} showLoginDialog={showLoginDialog} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd}/>} trigger='click' overlayClassName='projectItemPopover' autoAdjustOverflow={false}>
+              return <Popover key={index} placement= {(index+1)%3 === 0 ? 'bottomRight' : (index+1)%3%2 === 0 ? 'bottom' : 'bottomLeft'} content={<ProjectDetail detail={item} applyTaskId={applyTaskId} current_user={current_user} showLoginDialog={showLoginDialog} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd}/>} trigger='click' overlayClassName='projectItemPopover' autoAdjustOverflow={false}>
                 <div className={`projectItem ${(index+1)%3 === 0 || (index+1)%3%2 === 0 ? '' : 'firstBox'}`}>
                   <div className="border"></div>
-                  <div className="projectLogo"><img src={`${main_site_url}/api/attachments/${item.projectLogoId}`} alt=''/></div>
+                  <div className="projectLogo"><img src={item.projectLogoId ? `${main_site_url}/api/attachments/${item.projectLogoId}` : logo} alt=''/></div>
                   <div className="title">{item.projectName}</div>
                   <div className="intro">{item.projectIntro}</div>
                 </div>

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;

src/glcc/project/taskDetail/index.jsx

@@ -62,7 +62,7 @@ function TaskDetail(props) {
               <div><span className='smallTil'>导师信息</span>{detail.tutorName}  |  {detail.tutorMail}</div>
               <div className="bor"></div>
               <div><span className='smallTil'>课题简介</span></div>
-              <div>{detail.taskDesc}</div>
+              <div className='desc'>{detail.taskDesc}</div>
             </div>
             {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && taskId && Object.keys(applyTaskId).includes(taskId.toString()) ? <Button onClick={()=>{window.location.href=`/glcc/student/apply/${taskId}`}} className='lookDetail detailBut'>报名详情</Button> : isStudentApplyDate && <Button type='primary' className='applyBut detailBut' onClick={()=>{applyTask(taskId)}}>申请课题</Button>)}
           </div>

src/glcc/project/taskDetail/index.scss

@@ -92,6 +92,9 @@
     div{
       margin-bottom: 15px;
     }
+    .desc{
+      white-space: pre-wrap;
+    }
   }
   .link{
     color:#466aff;