Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server

src/forge/Component/Component.scss

@@ -276,36 +276,36 @@ li.ant-menu-item{
 .-task-sidebar {
   position: fixed;
   width: 40px;
-  right: 10px;
+  right: 30px;
   bottom: 80px;
   z-index: 10;
 }
 
-@media screen and (max-width: 1920px){
-  .-task-sidebar{
-    right:220px;
-  }
-}
-@media screen and (max-width: 1750px){
-  .-task-sidebar{
-    right:160px;
-  }
-}
-@media screen and (max-width: 1650px){
-  .-task-sidebar{
-    right:115px;
-  }
-}
-@media screen and (max-width: 1550px){
-  .-task-sidebar{
-    right:90px;
-  }
-}
-@media screen and (max-width: 1450px){
-  .-task-sidebar{
-    right:45px;
-  }
-}
+// @media screen and (max-width: 1920px){
+//   .-task-sidebar{
+//     right:220px;
+//   }
+// }
+// @media screen and (max-width: 1750px){
+//   .-task-sidebar{
+//     right:160px;
+//   }
+// }
+// @media screen and (max-width: 1650px){
+//   .-task-sidebar{
+//     right:115px;
+//   }
+// }
+// @media screen and (max-width: 1550px){
+//   .-task-sidebar{
+//     right:90px;
+//   }
+// }
+// @media screen and (max-width: 1450px){
+//   .-task-sidebar{
+//     right:45px;
+//   }
+// }
 @media screen and (max-width: 1200px){
   .-task-sidebar{
     right:0px;

src/glcc/home/index.jsx

@@ -14,7 +14,7 @@ import apply2 from "../img/apply2.png";
 import './index.scss';
 
 export default (props) => {
-  const { current_user, isGlccApplyDate, showNotification, studentApplyStart } = props;
+  const { current_user, isGlccApplyDate, showNotification, studentApplyStart,history } = props;
   function goToApply() {
     if (isGlccApplyDate) {
       if (current_user && current_user.login) {
@@ -33,7 +33,7 @@ export default (props) => {
     if(!studentApplyStart){
       showNotification("不在报名时间，报名开始时间为5月26日");
     }else{
-      window.location.href="/glcc/subjects";
+      history.push("/glcc/subjects");
     }
   }
 
@@ -50,14 +50,14 @@ export default (props) => {
       {/* 报名入口 */}
       <div className="applyBox">
         {/* 项目报名 */}
-        <div className="apply project">
+        <Link to="/glcc/projects" className="apply project" >
           <div>
             <img src={apply1} alt="" className="applyIcon"/>
-            <span className="hover-none"><span className="til">项目报名</span> </span>
-            <span className="hover-show">项目报名已截止</span>
+            <span className="hover-none"><span className="til">查看项目</span> </span>
+            {/* <span className="hover-show">项目报名已截止</span> */}
           </div>
-          <div className="pt6">项目报名开启，导师席位虚位以待</div>
-        </div>
+          <div className="pt6">查看夏令营各项目，掌握项目课题详细信息</div>
+        </Link>
         {/* 学生报名 */}
         <div className="apply" onClick={goToStudent}>
           <div>

src/glcc/home/index.scss

@@ -52,16 +52,16 @@
       &:hover, &:hover .til{
         color:#466aff;
       }
-      .hover-show{
-        display: none;
-      }
-      &:hover .hover-none, &:hover .pt6{
+      // .hover-show{
+      //   display: none;
+      // }
+       &:hover .pt6{
         display: none;
       }
       &:hover.project{
-        background-image:linear-gradient(45deg,#EBEFFF 0%, #E0E4F9 50.63%,#F1F1F1 100%);
-        box-shadow:0px 0px 6px #466aff;
-        cursor: default;
+        // background-image:linear-gradient(45deg,#EBEFFF 0%, #E0E4F9 50.63%,#F1F1F1 100%);
+        // box-shadow:0px 0px 6px #466aff;
+        // cursor: default;
         .hover-show{
           display: inline-block;
           margin-left: 10px;

src/glcc/home/partner/index.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import './index.scss';
 import ccf from '../../img/ccf_logo.png';
+import ccf1 from '../../img/ccf_logo1.png';
 import gitlink from '../../img/gitlink.png';
 import xjy from '../../img/xjy.png';
 import sponsor11 from '../../img/sponsor11.png';
@@ -9,6 +10,7 @@ import sponsor22 from '../../img/sponsor22.png';
 import sponsor23 from '../../img/sponsor23.png';
 import sponsor31 from '../../img/sponsor31.png';
 import sponsor32 from '../../img/sponsor32.png';
+import sponsor33 from '../../img/sponsor33.png';
 import sponsor41 from '../../img/sponsor41.png';
 
 
@@ -45,7 +47,7 @@ function Partner() {
         <div className='cont1 cont mb10'>
           <div>
             主办方
-            <div onClick={()=>{window.open("https://www.ccf.org.cn/")}} className='div8b9'><img src={ccf}/></div>
+            <div onClick={()=>{window.open("https://www.ccf.org.cn/")}} className='div8b9'><img src={ccf1}/></div>
           </div>
           <div>
             承办方
@@ -71,8 +73,8 @@ function Partner() {
           白金赞助商
           <div className='pt10'>
             <div className="sponsor" onClick={()=>{window.open("http://www.baidu.com/")}}><img src={sponsor21} className='gitlink' alt='百度'/></div>
-            <div className="sponsor" onClick={()=>{window.open("https://www.alibaba.com/")}}><img src={sponsor22} className='gitlink' alt='蚂蚁集团'/></div>
-            <div className="sponsor" onClick={()=>{window.open("https://www.antgroup.com/")}}><img src={sponsor23} className='gitlink' alt='阿里巴巴'/></div>
+            <div className="sponsor" onClick={()=>{window.open("https://www.antgroup.com/")}}><img src={sponsor22} className='gitlink' alt='蚂蚁集团'/></div>
+            <div className="sponsor" onClick={()=>{window.open("https://www.alibaba.com/")}}><img src={sponsor23} className='gitlink' alt='阿里巴巴'/></div>
           </div>
         </div>
 
@@ -81,13 +83,14 @@ function Partner() {
           <div className='pt10'>
             <div className="sponsor" onClick={()=>{window.open("https://aws.amazon.com/cn/")}}><img src={sponsor31} className='gitlink' alt='亚马逊云科技'/></div>
             <div className="sponsor" onClick={()=>{window.open("https://www.didiglobal.com/")}}><img src={sponsor32} className='gitlink' alt='滴滴出行'/></div>
+            <div className="sponsor" onClick={()=>{window.open("https://www.99cloud.net/")}}><img src={sponsor33} className='gitlink' alt='九州云'/></div>
           </div>
         </div>
 
         <div className='cont cont3 mt15'>
           白银赞助商
           <div className='pt10'>
-            <div className="sponsor" onClick={()=>{window.open("https://www.bytedance.com/")}}><img src={sponsor41} className='gitlink' alt='字节跳动'/></div>
+            <div className="sponsor" onClick={()=>{window.open(" https://www.cloudwego.io/")}}><img src={sponsor41} className='gitlink' alt='cloudwego'/></div>
           </div>
         </div>
 

src/glcc/project/projectList/index.scss

@@ -37,7 +37,7 @@
       text-align: center;
       overflow: hidden;
       margin: 25px auto 10px;
-      line-height: 100px;
+      line-height: 95px;
       img{
         width: 100%;
         // height: 100%;