Merge pull request '修改文字描述等' (#325) from tongChong/forgeplus-react:feature_jk_homepage into pre_dev_military

src/home/FifthSection/index.jsx

@@ -155,7 +155,7 @@ function FifthSection({ fifth, history }) {
 
         <div className="task-main">
           <h2 className="homePage-blue-tit">创客空间</h2>
-          <h4 className="homePage-subhead">开源项目版块集项目托管、版本管理等功能于一体，为开源协作和群智汇聚提供创作环境</h4>
+          <h4 className="homePage-subhead">创客空间版块面向大众智慧群体征集技术成果、创意概念和解决方案，实现供需高效对接</h4>
           <Line />
           <Collapse
             accordion

src/home/FifthSection/index.scss

@@ -9,18 +9,18 @@ $bgcolorlist:#254dea #e33230 #0766fb #f02c66 #6038ff #f85e55 #c13cff #2cb840 #57
 
   .fifth-main {
     display: flex;
-    margin: 5vh auto 3vh;
+    margin: 5vh auto 0;
     justify-content: space-between;
   }
 
   .homepage-btn {
-    margin-bottom: 10vh;
+    margin-bottom: 8vh;
   }
 
   .circle-wave {
     position: relative;
     width: 37.5em;
-    height: 43.75em;
+    height: 42.75em;
     flex: none;
 
     &:hover .icon-circle {

src/home/SecondSection/index.jsx

@@ -25,7 +25,7 @@ let setting = {
 }
 
 
-function SecondSection({ second ,main_web_site_url}) {
+function SecondSection({ second ,main_web_site_url ,btnUrl}) {
 
   const [leftItem, setLeftItem] = useState({});
   const [list, setList] = useState([]);
@@ -56,7 +56,7 @@ function SecondSection({ second ,main_web_site_url}) {
   return (
     <React.Fragment>
       <h2 className="homePage-blue-tit">社区动态</h2>
-      <h4 className="homePage-subhead">为社区用户提供自主交流空间，实现思维碰撞和智慧融合</h4>
+      <h4 className="homePage-subhead">关注开源热点资讯与技术，分享红山观点与活动</h4>
       <Line />
       <div className="homepage-main community-main">
 
@@ -77,7 +77,7 @@ function SecondSection({ second ,main_web_site_url}) {
           </div>
 
           <div className="text-center">
-            <Button className="homepage-btn" type="primary" onClick={() => {  window.open(`${main_web_site_url}/forums`)}}>更多动态 <i className="iconfont icon-gengduoicon"></i></Button>
+            <Button className="homepage-btn" type="primary" onClick={() => {  window.open(btnUrl)}}>更多动态 <i className="iconfont icon-gengduoicon"></i></Button>
           </div>
         </div>
 

src/home/SeventhSection/index.jsx

@@ -27,7 +27,7 @@ let setting = {
 }
 
 
-function SeventhSection({ main_web_site_url }) {
+function SeventhSection({ main_web_site_url,btnUrl }) {
 
   const [list, setList] = useState([]);
 
@@ -79,7 +79,7 @@ function SeventhSection({ main_web_site_url }) {
 
       </Slider>
 
-      <Button className="homepage-btn" type="primary" onClick={() => { window.open(`${main_web_site_url}/forums`) }}>参与交流 <i className="iconfont icon-gengduoicon"></i></Button>
+      <Button className="homepage-btn" type="primary" onClick={() => { window.open(btnUrl) }}>参与交流 <i className="iconfont icon-gengduoicon"></i></Button>
 
     </div>
 

src/home/SeventhSection/index.scss

@@ -159,21 +159,21 @@
     .issue-content {
       text-align: left;
       text-indent: 2em;
-      font-size: 15px;
+      font-size: 0.95em;
       font-weight: 400;
       color: #3c476e;
-      line-height: 28px;
+      line-height: 1.75em;
     }
     .issue-time {
-      height: 28px;
-      font-size: 15px;
+      height: 1.75em;
+      font-size: 0.95em;
       color: #3c476e;
-      line-height: 28px;
+      line-height: 1.75em;
     }
   }
 
   .homepage-btn {
-    margin-top: 50px;
+    margin-top: 3.125em;
   }
 
   @keyframes zoomin {

src/home/SixthSection/index.jsx

@@ -17,7 +17,7 @@ import './index.scss';
 let iconArr = [completeIcon1, completeIcon2, completeIcon3];
 
 
-function SixthSection({ sixth, main_web_site_url }) {
+function SixthSection({ sixth, main_web_site_url,btnUrl }) {
 
   const [list, setList] = useState();
 
@@ -78,7 +78,7 @@ function SixthSection({ sixth, main_web_site_url }) {
 
       </div>
 
-      <Button className="homepage-btn" type="primary" onClick={() => { window.open(`${main_web_site_url}/competitions`) }}>我要参赛 <i className="iconfont icon-gengduoicon"></i></Button>
+      <Button className="homepage-btn" type="primary" onClick={() => { window.open(btnUrl) }}>我要参赛 <i className="iconfont icon-gengduoicon"></i></Button>
       <svg className="waves"
         viewBox="0 24 150 28" preserveAspectRatio="none" shapeRendering="auto">
         <defs>

src/home/index.jsx

@@ -33,6 +33,18 @@ function HomePage({ history }) {
 
   let settings = JSON.parse(localStorage.chromesetting);
   let main_web_site_url = settings.main_web_site_url;
+  let forumUrl ="";
+  let competitionUrl ="";
+  if(settings.navbar){
+    for (const item of  settings.navbar){
+      if(item.name.indexOf("论坛")>-1){
+        forumUrl=item.link;
+      }
+      if(item.name.indexOf("竞赛")>-1){
+        competitionUrl=item.link;
+      }
+    }
+  }
 
 
   function scrollListener() {
@@ -120,7 +132,7 @@ function HomePage({ history }) {
 
 
       <div id="home-second-section" className="home-second-section">
-        <SecondSection second={second} main_web_site_url={main_web_site_url} />
+        <SecondSection second={second} main_web_site_url={main_web_site_url} btnUrl={forumUrl}/>
       </div>
 
 
@@ -137,11 +149,11 @@ function HomePage({ history }) {
       </div>
 
       <div id="home-sixth-section" className="home-sixth-section">
-        <SixthSection sixth={sixth} main_web_site_url={main_web_site_url} />
+        <SixthSection sixth={sixth} main_web_site_url={main_web_site_url} btnUrl={competitionUrl}/>
       </div>
 
       <div id="home-seventh-section" className="home-seventh-section">
-        <SeventhSection main_web_site_url={main_web_site_url} />
+        <SeventhSection main_web_site_url={main_web_site_url} btnUrl={forumUrl}/>
       </div>
 
       <Footer />