diff --git a/src/App.js b/src/App.js index 7c9d0a96..a79aa7eb 100644 --- a/src/App.js +++ b/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 () } - }> + }> ( - + // ) } diff --git a/src/home/FifthSection/index.jsx b/src/home/FifthSection/index.jsx index 830a4d80..49b49891 100644 --- a/src/home/FifthSection/index.jsx +++ b/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); } diff --git a/src/home/FifthSection/index.scss b/src/home/FifthSection/index.scss index 54cbfee3..256adc71 100644 --- a/src/home/FifthSection/index.scss +++ b/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; } } diff --git a/src/home/FirstSection/index.jsx b/src/home/FirstSection/index.jsx index 9aca6cf0..8fabd64a 100644 --- a/src/home/FirstSection/index.jsx +++ b/src/home/FirstSection/index.jsx @@ -62,7 +62,7 @@ function FirstSection({ first }) {
红山开源是一个依托互联网群体智慧实现世界范围内资源深度融合、开放共享和协同创新的开源社区，是集开源项目演化发展、科研任务众包、竞赛组织选拔和社区开放交流为一体的创新科研服务平台。红山开源致力于打造一个“开放、汇聚、协同、众创”的生态空间。
- + {/* */}
diff --git a/src/home/FirstSection/index.scss b/src/home/FirstSection/index.scss index 5138c469..6839ddb0 100644 --- a/src/home/FirstSection/index.scss +++ b/src/home/FirstSection/index.scss @@ -17,7 +17,7 @@ position: absolute; left: 0; right: 0; - bottom: 0; + bottom: -2px; height: 10vh; } } diff --git a/src/home/SecondSection/index.jsx b/src/home/SecondSection/index.jsx index 6fbe335c..d8d3cc76 100644 --- a/src/home/SecondSection/index.jsx +++ b/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, diff --git a/src/home/SecondSection/index.scss b/src/home/SecondSection/index.scss index 85880cdb..9a9e7dbc 100644 --- a/src/home/SecondSection/index.scss +++ b/src/home/SecondSection/index.scss @@ -165,4 +165,5 @@ .slick-center { margin-left: 100px; } + } diff --git a/src/home/SeventhSection/index.jsx b/src/home/SeventhSection/index.jsx index 67ec94f5..ca25af8a 100644 --- a/src/home/SeventhSection/index.jsx +++ b/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, diff --git a/src/home/SeventhSection/index.scss b/src/home/SeventhSection/index.scss index 224e5108..712758d5 100644 --- a/src/home/SeventhSection/index.scss +++ b/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; } diff --git a/src/home/SixthSection/index.scss b/src/home/SixthSection/index.scss index a9668365..f7d6ea69 100644 --- a/src/home/SixthSection/index.scss +++ b/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 { diff --git a/src/home/ThirdSection/index.scss b/src/home/ThirdSection/index.scss index 70d68771..db2a5ceb 100644 --- a/src/home/ThirdSection/index.scss +++ b/src/home/ThirdSection/index.scss @@ -153,7 +153,7 @@ .waves{ position: relative; - bottom: -10px; + bottom: -1.5vh; } @keyframes dashCircle { diff --git a/src/home/img/4-task.png b/src/home/img/4-task.png old mode 100755 new mode 100644 index bb520621..45792b5a Binary files a/src/home/img/4-task.png and b/src/home/img/4-task.png differ diff --git a/src/home/img/7-head1.png b/src/home/img/7-head1.png new file mode 100644 index 00000000..3860c458 Binary files /dev/null and b/src/home/img/7-head1.png differ diff --git a/src/home/img/7-head2.png b/src/home/img/7-head2.png new file mode 100644 index 00000000..769b9835 Binary files /dev/null and b/src/home/img/7-head2.png differ diff --git a/src/home/img/7-head3.png b/src/home/img/7-head3.png new file mode 100644 index 00000000..aaaf1357 Binary files /dev/null and b/src/home/img/7-head3.png differ diff --git a/src/home/img/7-head4.png b/src/home/img/7-head4.png new file mode 100644 index 00000000..ecbd4070 Binary files /dev/null and b/src/home/img/7-head4.png differ diff --git a/src/home/img/7-head5.png b/src/home/img/7-head5.png new file mode 100644 index 00000000..8d8804f5 Binary files /dev/null and b/src/home/img/7-head5.png differ diff --git a/src/home/img/7-head6.png b/src/home/img/7-head6.png new file mode 100644 index 00000000..2e2068fe Binary files /dev/null and b/src/home/img/7-head6.png differ diff --git a/src/home/img/7-head7.png b/src/home/img/7-head7.png new file mode 100644 index 00000000..24f8c591 Binary files /dev/null and b/src/home/img/7-head7.png differ diff --git a/src/home/index.scss b/src/home/index.scss index 4be2e4f3..67a78287 100644 --- a/src/home/index.scss +++ b/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; diff --git a/src/military/components/sortBox/index.jsx b/src/military/components/sortBox/index.jsx index 4cb0f4f3..f3f3004f 100644 --- a/src/military/components/sortBox/index.jsx +++ b/src/military/components/sortBox/index.jsx @@ -32,7 +32,6 @@ export default memo((props) => { setMyOptions(myOptions); } - console.log('-----options----') return (
diff --git a/src/military/javaFetch.js b/src/military/javaFetch.js index 829a50d4..90e7e925 100644 --- a/src/military/javaFetch.js +++ b/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") { diff --git a/src/modules/404/Shixunnopage.js b/src/modules/404/Shixunnopage.js index 41893240..5b59b472 100644 --- a/src/modules/404/Shixunnopage.js +++ b/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 (
-
- {/*mt100 mb100*/} - -

- 您可以稍后尝试 返回首页 - ，或者  - QQ反馈>> -

-
+ { + this.state.isAdmins? :
+ {/*mt100 mb100*/} + +

+ 您可以稍后尝试 返回首页 + ，或者  + QQ反馈>> +

+
+ } + {/*
*/} {/**/} {/**/} diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 11369734..bc81e037 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/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)