现在基本上OK了

Author: xiaotuni

.vscode/settings.json

@@ -0,0 +1 @@
+{}

src/containers/Counter/Counter.js

@@ -21,7 +21,7 @@ export default class Counter extends Component {
   render() {
     const { increment, decrement, reset } = this.props;
     return (
-      <div>
+      <div className={comStyles.navbar}>
         <div className={comStyles.btns}>
           <button onClick={() => Utility.toPage('userinfo')}>go to userinfo</button>
           <button onClick={() => Utility.$goBack()}>go back</button>
@@ -49,22 +49,3 @@ export default class Counter extends Component {
     );
   }
 }
-
-// const mapStateToProps = (state) => {
-//   return { counter: state.counter };
-// };
-// const mapDispatchToProps = (dispatch) => {
-//   return {
-//     increment: () => {
-//       dispatch(increment);
-//     },
-//     decrement: () => {
-//       dispatch(decrement);
-//     },
-//     reset: () => {
-//       dispatch(reset);
-//     },
-//   };
-// };
-
-// export default connect(mapStateToProps, mapDispatchToProps)(Counter);

src/containers/Default/Default.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
-// import PropTypes from 'prop-types';
-import {  DefHref } from 'components';
+import { DefHref } from 'components';
+const comStyles = require('styles/Common.scss');
 
 const styles = require('./scss/Default.scss');
 
@@ -15,7 +15,7 @@ export default class Default extends Component {
   }
   render() {
     return (
-      <div className={styles.defaultCss}>
+      <div className={comStyles.navbar + ' ' + styles.defaultCss}>
         <DefHref />
       </div>
     );

src/containers/Home/Home.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Utility, Navbar } from 'components';
+import { Utility } from 'components';
 
 const styles = require('./scss/Home.scss');
 
@@ -27,14 +27,13 @@ export default class Home extends Component {
       const UrlTitle = Utility.constItem.UrlTitle;
       const __IsGoBackKey = Utility.constItem.KeyGoBack;
       this.context.router.history.listen((location, action) => {
-        console.log(action === 'POP');
         Utility.setContent(__IsGoBackKey, action === 'POP');
         console.log('location is', location, 'action is', action);
-        console.log('-----------home end---------------');
         const { pathname } = location;
         if (UrlTitle && UrlTitle[pathname]) {
           self.state.UrlTitle = UrlTitle[pathname];
-          self.__UpdateRender();
+          Utility.setContent('__URL_TITLE_INFO_', UrlTitle[pathname]);
+          // self.__UpdateRender();
         }
       });
     }
@@ -59,13 +58,17 @@ export default class Home extends Component {
     Utility.toPage('userinfo');
   }
   render() {
-    const { UrlTitle } = this.state;
-    const { Title } = UrlTitle || {};
+    // const { UrlTitle } = this.state;
+    // const { Title } = UrlTitle || {};
+    // const __Flag = 0;
 
     return (
       <div className={styles.homeCss}>
-        <Navbar Title={Title} />
+        {}
       </div>
     );
   }
 }
+// {
+//   __Flag === 2 && <Navbar Title={Title} />
+// }

src/containers/UserInfo/UserInfo.js

@@ -32,7 +32,7 @@ export default class UserInfo extends Component {
     const styles = require('./ui.scss');
     const { userInfo, isLoading, errorMsg } = this.props.userInfo;
     return (
-      <div className="userInfoCss">
+      <div className={comStyles.navbar}>
         <div className={comStyles.btns}>
           <button onClick={() => Utility.toPage('page1')}>go to page1</button>
           <button onClick={() => Utility.$goBack()}>go back</button>

src/containers/page1.js

@@ -12,7 +12,7 @@ export default class Page1 extends Component {
 
   render() {
     return (
-      <div className={styles.page1Css}>
+      <div className={comStyles.navbar + ' ' + styles.page1Css}>
         <div className={comStyles.btns}>
           <button onClick={() => Utility.toPage('page2')}>go to page2</button>
           <button onClick={() => Utility.$goBack()}>go back</button>

src/containers/page2.js

@@ -10,7 +10,7 @@ export default class Page2 extends Component {
 
   render() {
     return (
-      <div>
+      <div className={comStyles.navbar}>
         <div className={comStyles.btns}>
           <button onClick={() => Utility.toPage('page3')}>go to page3</button>
           <button onClick={() => Utility.$goBack()}>go back</button>

src/containers/page3.js

@@ -7,11 +7,13 @@ export default class Page3 extends Component {
     super(props);
 
     this.state = {};
+    console.log('----page3---', new Date().getTime());
   }
 
   render() {
+    console.log('----page3--111-', new Date().getTime());
     return (
-      <div>
+      <div className={comStyles.navbar}>
         <div className={comStyles.btns}>
           <button onClick={() => Utility.toPage('page4')}>go to page4</button>
           <button onClick={() => Utility.$goBack()}>go back</button>

src/containers/page4.js

@@ -10,7 +10,7 @@ export default class Page4 extends Component {
 
   render() {
     return (
-      <div>
+      <div className={comStyles.navbar}>
         <div className={comStyles.btns}>
           <button onClick={() => Utility.toPage('counter')}>go to counter</button>
           <button onClick={() => Utility.$goBack()}>go back</button>

src/index.js

@@ -5,7 +5,7 @@ import { Provider } from 'react-redux';
 import BuildStore from './redux/store';
 import ApiClient from './helpers/ApiClient';
 import createHistory from 'history/createBrowserHistory';
-const history = createHistory({ basename: '/react' });
+const history = createHistory();
 const ApiClientStore = BuildStore(new ApiClient(), history);
 import getRouter from './router/router';
 import { Router } from 'react-router';