Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

src/App.js

@@ -7,6 +7,7 @@ import {Redirect} from "react-router-dom";
 import { Avatar, Badge } from 'zent';
 import login from './pages/login/login';
 import home from './pages/home/home';
+import errpage from "./pages/errpage/errpage"
 export default class App extends Component {
   state = {
    pathname:'',
@@ -26,7 +27,7 @@ export default class App extends Component {
       ()=> (
       <Redirect to="/login"/>)}>
     </Route>
-
+      <Route    component={errpage} /> 
       </Router>
     );
   }

src/pages/errpage/errpage.js

@@ -1,7 +1,7 @@
 import ReactDOM from 'react-dom';
 import React, { Component } from 'react';
 import  "./errpage.less"
-
+import {Button} from "zent"
 export default class errpage extends React.Component{
   constructor(props){
     super(props)
@@ -9,11 +9,21 @@ export default class errpage extends React.Component{
   
     }
   }
+  tick(){
+      window.history.go(-1);
+  }
 
+
+
+  componentWillUnmount(){
+ 
+  }
   render(){
+    console.log(this.state);
     return(
-      <div id="systemMenu" className="maincenter">
-        错误也main
+      <div id="errpage" className="maincenter">
+        <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/404.png" alt=""/>
+        <Button onClick={this.tick.bind(this)}>返回上一页</Button>
       </div>
     )
   }

src/pages/errpage/errpage.less

@@ -0,0 +1,12 @@
+#errpage{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  img{
+    width:30%;
+    margin-bottom: 15px;
+  }
+}