产品-路由和页面结构修改

config/webpack.prod.config.js

@@ -90,7 +90,8 @@ module.exports = merge(common, {
       rewrites: [
         { 
           from: /^\/company/, to: '/',
-          
+          from: /^\/product\/lockStatistics/, to: '/product',
+          from: /^\/product/, to: '/product',
         },
       ]
     }

package.json

@@ -41,6 +41,7 @@
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-redux": "^7.2.0",
+    "react-router": "^5.1.2",
     "react-router-dom": "^5.1.2",
     "redux": "^4.0.5",
     "redux-immutable": "^4.0.0",

src/product/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import Lockclient from './lock-client';
+import Product from './product';
 
-ReactDOM.render(<Lockclient />, document.getElementById('root'));
+ReactDOM.render(<Product />, document.getElementById('root'));

src/product/lock-ccount.js

@@ -1,25 +0,0 @@
-import React, { Component } from 'react';
-import { Provider } from 'react-redux';
-import store from './store';
-import Submenu from './submenu';
-// import Content from './content';
-
-//import './product.css';
-
-class Hr extends Component {
-  render() {
-    //console.log(this.props.store);
-    return (
-      <Provider store={store}>
-        <Submenu />
-        {/* <Content /> */}
-      </Provider>
-        
-     
-    );
-  }
-}
-
-export default Hr;
-
-

src/product/lock-client.js

@@ -1,41 +0,0 @@
-import React, { Component } from 'react';
-import { Provider } from 'react-redux';
-import store from './store';
-import Submenu from './submenu';
-// import Content from './content';
-
-//import './product.css';
-
-class Hr extends Component {
-  render() {
-    //console.log(this.props.store);
-    return (
-      <Provider store={store}>
-        <Submenu />
-        <div className="page-content-wrapper">
-        	<header class="page-header" role="banner">
-        		<div class="hidden-md-down dropdown-icon-menu position-relative">
-        			<a href="#" class="header-btn btn js-waves-off" data-action="toggle" data-class="nav-function-hidden" title="隐藏侧栏">
-     						<i class="ni ni-menu"></i>
-     					</a>
-     					<ul>
-	              <li>
-	                <a href="#" class="btn js-waves-off" data-action="toggle" data-class="nav-function-minify" title="迷你侧栏">
-	     								<i class="ni ni-minify-nav"></i>
-	     							</a>
-	              </li>
-	            </ul>
-        		</div>
-        	</header>
-        </div>
-        {/* <Content /> */}
-      </Provider>
-        
-     
-    );
-  }
-}
-
-export default Hr;
-
-

src/product/product.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { Provider } from 'react-redux';
 import store from './store';
 import Submenu from './submenu';
-// import Content from './content';
+
 
 //import './product.css';
 
@@ -12,8 +12,6 @@ class submenu extends Component {
     return (
       <Provider store={store}>
         <Submenu />
-        <div className="page-content-wrapper">Hello workbench2323 react!!!!</div>
-        {/* <Content /> */}
       </Provider>
         
      

src/product/submenu/index.js

@@ -3,15 +3,19 @@ import { connect } from 'react-redux';
 import { actionCreators } from './store';
 import { BrowserRouter, Route,Link } from 'react-router-dom';
 
+import  Lockstore  from '../content/lock_store.js';
+
+
 class Submenu extends PureComponent {
 
     render() {
        // const { inputValue, handleInputFocus,handleInputChange, menu, list } = this.props;
         return (
-          <aside class="page-sidebar">
-            <div class="page-logo">
-              <a href="#modal-shortcut" class="page-logo-link press-scale-down d-flex align-items-center position-relative" data-toggle="modal">
-                <div class="icon-stack fa-2x">
+          <BrowserRouter>
+          <aside className="page-sidebar">
+            <div className="page-logo">
+              <a href="#modal-shortcut" className="page-logo-link press-scale-down d-flex align-items-center position-relative" data-toggle="modal">
+                <div className="icon-stack fa-2x">
                   <i class="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
                   <i class="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
                   <i class="fal fa-box icon-stack-1x opacity-100 color-white"></i>
@@ -22,6 +26,7 @@ class Submenu extends PureComponent {
               </a>
             </div>
             <nav id="js-primary-nav" class="primary-nav" role="navigation">
+            
               <ul id="js-nav-menu" class="nav-menu">
                 <li class="active open">
                   <a href="#" title="软件锁" data-filter-tags="软件锁" class="waves-effect waves-themed">
@@ -30,18 +35,15 @@ class Submenu extends PureComponent {
                   </a>
                   <ul>
                     <li class="active">
-                      <a href="lock-client.html" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
-                          <span class="nav-link-text">公共锁库</span>
-                      </a>
+                      <Link to='/product'>公共锁库</Link>
                     </li>
                     <li>
-                      <a href="lock-ccount.html" title="Marketing Dashboard" data-filter-tags="application intel marketing dashboard">
-                          <span class="nav-link-text">使用统计</span>
-                      </a>
+                      <Link to='/product/lockStatistics'>使用统计</Link>
                     </li>
                   </ul>
+                
                 </li>
-                <li class="">
+                {/* <li class="">
                   <a href="#" title="Application Intel" data-filter-tags="application intel">
                     <i class="fal fa-cloud "></i>
                     <span class="nav-link-text">云版管理</span>
@@ -58,34 +60,20 @@ class Submenu extends PureComponent {
                       </a>
                     </li>
                   </ul>
-                </li>
+                </li> */}
               </ul>
-              <div class="filter-message js-filter-message bg-success-600"></div>
+              
             </nav>
-            <div class="nav-footer shadow-top">
-              <a href="#" onclick="return false;" data-action="toggle" data-class="nav-function-minify" class="hidden-md-down">
-                <i class="ni ni-chevron-right"></i>
-                <i class="ni ni-chevron-right"></i>
-              </a>
-              <ul class="list-table m-auto nav-footer-buttons">
-                <li>
-                  <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Chat logs">
-                    <i class="fal fa-comments"></i>
-                    </a>
-                </li>
-                <li>
-                  <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Support Chat">
-                    <i class="fal fa-life-ring"></i>
-                  </a>
-                </li>
-                <li>
-                  <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Make a call">
-                    <i class="fal fa-phone"></i>
-                  </a>
-                </li>
-              </ul>
-            </div>
+            
           </aside>
+          <div className="page-content-wrapper">
+               
+                <Route path='/product' exact render={()=><div>公共锁库</div>} ></Route>
+                <Route path='/product/lockStatistics' exact render={()=><div>使用统计</div>} ></Route>
+               
+          </div>
+            </BrowserRouter>
+
             // <div>
             //     <BrowserRouter>
             //     <div>