Merge branch 'gitlink_server' of http://106.75.45.236:3000/Gitlink/forgeplus-react into feature_invite

src/glcc/home/contact/index.jsx

@@ -16,7 +16,7 @@ function Contact() {
             <h4 className="contact-invite">期待你的加入，和我们一起推动开源繁荣发展！</h4>
             <div className="contact-way">
               <p>交流QQ群: 210174286</p>
-              <p>合作推广: gitlink@ccf.org.cn</p>
+              <p>合作推广: glcc@ccf.org.cn</p>
             </div>
           </div>
           <div className='attention'>

src/glcc/home/index.jsx

@@ -107,7 +107,7 @@ export default (props) => {
           <div className="openMMlabBox">
             <div className="logoTitle">
               <img src={logo} alt="" className="logo"/>
-              <span className="title">活动特邀合作单位 OpenMMlab</span>
+              <span className="title">活动特邀合作单位 OpenMMLab</span>
               <div></div>
               <div></div>
             </div>

src/glcc/project/index.scss

@@ -194,8 +194,9 @@
     }
   }
 }
-.projectItemPopover{
+.ant-popover.projectItemPopover{
   width: 1200px;
+  z-index: 1000;
   .ant-popover-content .ant-popover-arrow{
     border-width: 12px;
   }

src/glcc/project/projectList/index.jsx

@@ -6,6 +6,7 @@ import { projectList } from '../../api';
 import ProjectDetail from '../component/projectDetail';
 import bgPng from "../../img/bgPng.png";
 import logo from "../../img/logo.png";
+import star from "../../img/star.png";
 const { Search } = Input;
 
 // 项目列表
@@ -51,7 +52,7 @@ function ProjectList({ applyTaskId, current_user, showLoginDialog, isStudentAppl
         }
         openmmlab && setTimeout(() => {
           let openProject = document.querySelector(`.${openmmlab}`);
-          if(openProject){
+          if (openProject) {
             openProject.click();
             let height = document.documentElement.clientWidth / 1920 * 500 + 71 + 70 + 100 + openProject.offsetTop;
             window.scrollTo(0, height);
@@ -64,9 +65,9 @@ function ProjectList({ applyTaskId, current_user, showLoginDialog, isStudentAppl
 
   function changeVisible(visible, item) {
     if (visible) {
-      let height = document.documentElement.clientWidth / 1920 * 500 +  70  + document.querySelector(`.${item.gitlinkLastUrl}`).offsetTop + item.registrationTaskList.length*320;
+      let height = document.documentElement.clientWidth / 1920 * 500 + 70 + document.querySelector(`.${item.gitlinkLastUrl}`).offsetTop + item.registrationTaskList.length * 320;
       document.querySelector('#taskList').style.height = height + 'px';
-    }else{
+    } else {
       document.querySelector('#taskList').style.height = 'auto';
     }
   }
@@ -93,7 +94,10 @@ function ProjectList({ applyTaskId, current_user, showLoginDialog, isStudentAppl
               >
                 <div className={`projectItem ${(index + 1) % 3 === 0 || (index + 1) % 3 % 2 === 0 ? '' : 'firstBox'} ${item.projectName.replace(/ /g, '')} ${item.gitlinkLastUrl.replace(/\./g, '')}`}>
                   <div className="border"></div>
-                  <div className="projectLogo"><img src={item.projectLogoId ? `${main_site_url}/api/attachments/${item.projectLogoId}` : logo} alt='' /></div>
+                  <div className="projectLogo">
+                    {!gitlinkLastUrl && !openmmlab && item.recommendFlag ? <img className="projectLogoStar" src={star} /> : ''}
+                    <img className="projectLogoImg" 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

@@ -29,6 +29,7 @@
       border-radius:2px 2px 0px 0px;
     }
     .projectLogo{
+      position: relative;
       width: 100px;
       height: 100px;
       border: 1px solid #fff;
@@ -38,11 +39,19 @@
       overflow: hidden;
       margin: 25px auto 10px;
       line-height: 95px;
-      img{
+      overflow: visible;
+      .projectLogoImg{
         width: 100%;
         // height: 100%;
         // display: block;
       }
+      .projectLogoStar{
+        position: absolute;
+        top:0;
+        right: 0;
+        width: 28px;
+        transform: rotate(46deg);
+      }
     }
     .title{
       color:#2a51bf;

src/modules/tpm/TPMIndex.css

@@ -27,7 +27,7 @@ body>.-task-title {
   width: 100%;
   height:58px;
   min-width: 1200px;
-  z-index: 1031;
+  z-index: 1001;
   position: fixed;
   background: #1B2440;
   color: #fff;