diff --git a/src/App.js b/src/App.js index aae03b9de..8926349c9 100644 --- a/src/App.js +++ b/src/App.js @@ -105,7 +105,7 @@ class App extends Component { occupation: 0, mygetHelmetapi: null, pathType: null, - pathName: '', + pathName: null, } } @@ -175,7 +175,6 @@ class App extends Component { const msg = `${event.type}: ${event.message}`; }); - } componentWillUnmount() { @@ -317,7 +316,7 @@ class App extends Component { } /> - {/*项目*/} + {/*新建项目等*/} { }) function locationurl(list) { - if (window.location.port !== "3007") { + // if (window.location.port !== "3007") { window.location.href = list - } + // } } // TODO 开发期多个身份切换 let debugType = "" diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js index 978498b22..baa5a2cb0 100644 --- a/src/forge/Activity/ActivityItem.js +++ b/src/forge/Activity/ActivityItem.js @@ -14,7 +14,7 @@ class ActivityItem extends Component { {/* 如果是版本发布 */} {item.trend_type === "VersionRelease" ?

- {item.name} + {item.name} {item.trend_type}

: diff --git a/src/forge/Index.js b/src/forge/Index.js index 2423f0007..4ccbfe2ed 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -12,8 +12,13 @@ import Loadable from "react-loadable"; import Loading from "../Loading"; import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC"; +//404页面 +const Shixunnopage = Loadable({ + loader: () => import('./modules/404/Shixunnopage'), + loading: Loading, +}) const ProjectNew = Loadable({ - loader: () => import("./New/Index"), + loader: () => import("./New/Index"), loading: Loading, }); const ProjectIndex = Loadable({ @@ -29,8 +34,8 @@ const ProjectIndex = Loadable({ class Index extends Component { - componentDidUpdate=()=>{ - this.props.history.listen(()=>{ + componentDidUpdate = () => { + this.props.history.listen(() => { if (document.body.scrollTop || document.documentElement.scrollTop > 0) { window.scrollTo(0, 0) } @@ -70,6 +75,13 @@ class Index extends Component { )} >
+ + ( + + )} + > ); diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index ec985ecc2..2265ac20d 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -28,7 +28,7 @@ class IndexItem extends Component { : - + } diff --git a/src/forge/Notice/Notify.jsx b/src/forge/Notice/Notify.jsx index 96b9e6876..313739089 100644 --- a/src/forge/Notice/Notify.jsx +++ b/src/forge/Notice/Notify.jsx @@ -80,9 +80,10 @@ function Notify(props){