微调各种配置

src/App.js

@@ -136,6 +136,8 @@ class App extends Component {
 			}
 		});
 	}
+
+
 	componentDidMount() {
 		document.title = "loading...";
 		this.disableVideoContextMenu();
@@ -286,11 +288,11 @@ class App extends Component {
 										(props) => {
 											return (<InfosIndex {...this.props} {...this.state} />)
 										}
-								}></Route>
+									}></Route>
 								<Route exact path="/"
 									render={
 										(props) => (
-											<HomePage {...props} {...this.props} {...this.state}/>
+											<HomePage {...props} {...this.props} {...this.state} />
 											// <Projects {...this.props} {...props} {...this.state}></Projects>
 										)
 									}

src/home/FifthSection/index.jsx

@@ -2,7 +2,7 @@ import React, { memo, useState, useEffect } from 'react';
 import { Collapse, Button } from 'antd';
 import moment from 'moment';
 import Line from '../Line';
-import { getTaskCategory, getTaskAdminList } from '../../military/task/api';
+import { getTaskCategory, getTaskList } from '../../military/task/api';
 import { taskModeIdArr } from '../../military/task/static';
 
 import './index.scss';
@@ -64,7 +64,7 @@ function FifthSection({ fifth, history }) {
       isDelete: '0',
       recommend: '1',
     };
-    getTaskAdminList(params).then(data => {
+    getTaskList(params).then(data => {
       if (data) {
         serTaskArr(data.rows);
       }

src/home/FifthSection/index.scss

@@ -18,7 +18,7 @@ $bgcolorlist:#254dea #e33230 #0766fb #f02c66 #6038ff #f85e55 #c13cff #2cb840 #57
   .circle-wave {
     position: relative;
     width: 600px;
-    height: 650px;
+    height: 700px;
     flex: none;
 
     &:hover .icon-circle {
@@ -219,7 +219,7 @@ $bgcolorlist:#254dea #e33230 #0766fb #f02c66 #6038ff #f85e55 #c13cff #2cb840 #57
   }
 
   .task-main {
-    margin-left: 40px;
+    margin:-40px 0  0 40px;
     .home-line {
       text-align: left;
       margin-bottom: 25px !important;
@@ -336,6 +336,6 @@ $bgcolorlist:#254dea #e33230 #0766fb #f02c66 #6038ff #f85e55 #c13cff #2cb840 #57
   }
   .waves {
     position: relative;
-    bottom: -10px;
+    bottom: -1.5vh;
   }
 }

src/home/FirstSection/index.jsx

@@ -62,7 +62,7 @@ function FirstSection({ first }) {
           </div>
           <div className="website-des">红山开源是一个依托互联网群体智慧实现世界范围内资源深度融合、开放共享和协同创新的开源社区，是集开源项目演化发展、科研任务众包、竞赛组织选拔和社区开放交流为一体的创新科研服务平台。红山开源致力于打造一个“开放、汇聚、协同、众创”的生态空间。
           </div>
-          <Button className="website-more homepage-btn" type="primary" onClick={goNext}>了解详情</Button>
+          {/* <Button className="website-more homepage-btn" type="primary" onClick={goNext}>了解详情</Button> */}
         </div>
 
         <div className={`play-img ${circulation}`}>

src/home/FirstSection/index.scss

@@ -17,7 +17,7 @@
       position: absolute;
       left: 0;
       right: 0;
-      bottom: 0;
+      bottom: -2px;
       height: 10vh;
     }
   }

src/home/SecondSection/index.jsx

@@ -15,7 +15,7 @@ let setting = {
   slidesToShow: 3,
   slidesToScroll: 1,
   pauseOnDotsHover: true,
-  autoplaySpeed: 2000,
+  autoplaySpeed: 4000,
   centerMode: true,
   centerPadding: "10px",
   // pauseOnFocus: true,

src/home/SecondSection/index.scss

@@ -165,4 +165,5 @@
   .slick-center {
     margin-left: 100px;
   }
+  
 }

src/home/SeventhSection/index.jsx

@@ -17,7 +17,7 @@ let setting = {
   slidesToShow: 1,
   slidesToScroll: 1,
   pauseOnDotsHover: true,
-  autoplaySpeed: 2000,
+  autoplaySpeed: 5000,
   centerMode: true,
   centerPadding: "0px",
   autoplay: true,

src/home/SeventhSection/index.scss

@@ -2,7 +2,10 @@
   background: linear-gradient(#fff 0%, #cbdcff 100%);
   text-align: center;
   padding-top: 40px;
-
+  padding-bottom: 10px;
+  z-index: 100000;
+  margin-bottom: -10px;
+  border-bottom: 1px solid #cbdcff;
   .seventh-main {
     position: relative;
   }

src/home/SixthSection/index.scss

@@ -3,6 +3,8 @@
   color: #fff;
   background: linear-gradient(#041670 0%, #2951da 100%);
   text-align: center;
+  margin-bottom: -2px;
+  z-index: 10;
   .grid-picture {
     background: url(../img/grid.png) no-repeat;
     background-size: 100% 100%;
@@ -172,7 +174,7 @@
     position: absolute;
     left: 0;
     right: 0;
-    bottom: 0;
+    bottom: -2px;
   }
 
   .complete-des.active {

src/home/ThirdSection/index.scss

@@ -153,7 +153,7 @@
 
   .waves{
     position: relative;
-    bottom: -10px;
+    bottom: -1.5vh;
   }
   
   @keyframes dashCircle {

src/home/index.scss

@@ -1,6 +1,6 @@
 .homePage {
   background: #fff;
-
+  min-width: 800px;
   // 首页多个部分公共样式
 
   // 1行省略号
@@ -146,6 +146,7 @@
   position: relative;
   width: 100%;
   height: 8vh;
+  bottom: -.5vh;
 }
 // .waves-low {
 //   height: 6vh;

src/military/components/sortBox/index.jsx

@@ -32,7 +32,6 @@ export default memo((props) => {
     setMyOptions(myOptions);
   }
 
-  console.log('-----options----')
   return (
 
     <div className="sort-box">

src/military/javaFetch.js

@@ -17,7 +17,6 @@ export default function javaFetch(actionUrl){
   // request拦截器
 service.interceptors.request.use(config => {
   if (cookie.load(TokenKey)) {
-    console.log(cookie.load(TokenKey));
     config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   if (window.location.port === "3007") {

src/modules/404/Shixunnopage.js

@@ -11,21 +11,44 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
 import { SnackbarHOC,getImageUrl } from 'educoder';
 
 class http500 extends Component {
+    constructor(props) {
+		super(props);
+		this.state = {
+			isAdmins:true,
+		}
+	}
+
+    UNSAFE_componentWillMount() {
+		if (this.props.history.location.pathname.indexOf('/admins/') > -1) {
+			let nowTime = new Date().getTime();
+			if ((nowTime - (localStorage.reloadTime || 0)) > 2000) {
+				localStorage.setItem('reloadTime', nowTime);
+				window.location.reload();
+                return;
+			}
+		}
+        this.setState({isAdmins:false});
+	}
+
+
     render() {
         return (
             <div className="newMain clearfix">
-                    <div className=" edu-txt-center mt60 mb60">
-                        {/*mt100 mb100*/}
-                        <img src={getImageUrl("images/warn/pic_404.jpg")} />
-                            <p className="font-18 mt40">
-                                您可以稍后尝试&nbsp;<a href="/"
-                                                className="color-blue">返回首页</a>
-                                ，或者&nbsp;
-                                <a target="_blank"
-                                   href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd"
-                                   className="color-blue">QQ反馈&gt;&gt;</a>
-                            </p>
-                    </div>
+                {
+                   this.state.isAdmins? <Loading />:<div className=" edu-txt-center mt60 mb60">
+                   {/*mt100 mb100*/}
+                   <img src={getImageUrl("images/warn/pic_404.jpg")} />
+                       <p className="font-18 mt40">
+                           您可以稍后尝试&nbsp;<a href="/"
+                                           className="color-blue">返回首页</a>
+                           ，或者&nbsp;
+                           <a target="_blank"
+                              href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd"
+                              className="color-blue">QQ反馈&gt;&gt;</a>
+                       </p>
+               </div>
+                }
+                    
                     {/*<div style="clear:both;"></div>*/}
                     {/*<div id="ajax-indicator" style="display:none;"><span>载入中...</span></div>*/}
                     {/*<div id="ajax-modal" style="display:none;"></div>*/}

src/modules/tpm/TPMIndexHOC.js

@@ -162,9 +162,9 @@ export function TPMIndexHOC(WrappedComponent, headFoot) {
 					this.setState({
 						tpmLoading: false
 					})
-					if (this.props.match.path === "/" && response.data.login) {
-						this.props.history.push(`/users/${response.data.login}`);
-					}
+					// if (this.props.match.path === "/" && response.data.login) {
+					// 	this.props.history.push(`/users/${response.data.login}`);
+					// }
 				}
 			}).catch((error) => {
 				console.log(error)