caipin 5 năm trước cách đây
mục cha
commit
dcbc60b9aa

+ 2 - 0
config/webpack.prod.config.js

@@ -92,7 +92,9 @@ module.exports = merge(common, {
           from: /^\/company/, to: '/',
           from: /^\/product\/lockStatistics/, to: '/product',
           from: /^\/product/, to: '/product',
+          //客户相关
           from: /^\/contact/, to: '/contact',
+          from: /^\/contact\/company/, to: '/contact',
         },
       ]
     }

+ 1 - 1
dist/js/vendors.bundle.js

@@ -25147,7 +25147,7 @@ jQuery.fn.extend({
  * rgb2hex(hex_value)
  */
 function rgb2hex(rgb) {
-    rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+    rgb = ''; //rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
     function hex(x) {
         return ("0" + parseInt(x).toString(16)).slice(-2);
     }

+ 79 - 0
src/common/staffHeader/index.js

@@ -0,0 +1,79 @@
+import React, { PureComponent } from 'react';
+// import { connect } from 'react-redux';
+// import { BrowserRouter, Route,Link } from 'react-router-dom';
+
+// import { actionCreators } from './store';
+
+class staffHeader extends PureComponent {
+
+    
+    render() {
+        return (
+            
+        <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>
+          <div class="hidden-lg-up">
+            <a href="#" class="header-btn btn press-scale-down waves-effect waves-themed" data-action="toggle" data-class="mobile-nav-on">
+     						<i class="ni ni-menu"></i>
+     					</a>
+          </div>
+          
+          <h1 class="subheader-title">
+     					联系人
+     				</h1>
+         
+          <div class="ml-auto d-flex">
+           
+            <div>
+              <a href="#" data-toggle="dropdown"  class="header-icon d-flex align-items-center justify-content-center ml-2"><img src="img/demo/avatars/avatar-admin.png" class="profile-image rounded-circle" /></a>
+              <div class="dropdown-menu dropdown-menu-animated dropdown-lg">
+                <div class="dropdown-header bg-trans-gradient d-flex flex-row py-4 rounded-top">
+                  <div class="d-flex flex-row align-items-center mt-1 mb-1 color-white">
+                    <span class="mr-2">
+                            				<img src="img/demo/avatars/avatar-admin.png" class="rounded-circle profile-image" alt="Dr. Codex Lantern"/>
+                            			</span>
+                    <div class="info-card-text">
+                      <div class="fs-lg text-truncate text-truncate-lg">张三</div>
+                      <span class="text-truncate text-truncate-md opacity-80">工号:0001</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="dropdown-divider m-0"></div>
+                <a href="#" class="dropdown-item" data-action="app-fullscreen">
+                            		<span>员工信息</span>
+                            	</a>
+                <div class="dropdown-divider m-0"></div>
+                <a href="#" class="dropdown-item" data-action="app-fullscreen">
+                            		<span>全屏</span>
+                            		<i class="float-right text-muted fw-n">F11</i>
+                            	</a>
+                <div class="dropdown-divider m-0"></div>
+                <a class="dropdown-item fw-500 pt-3 pb-3" href="page_login_alt.html">
+                            		<span>退出登录</span>
+                            	</a>
+              </div>
+            </div>
+          </div>
+        </header>
+        
+        );
+    }
+
+}
+
+
+
+
+export default staffHeader;

+ 52 - 0
src/common/staffHeader/store/actionCreators.js

@@ -0,0 +1,52 @@
+import * as constants from './constants';
+import { fromJS } from 'immutable';
+
+import axios from '../../../common/axios_auth.js';
+// import axios from 'axios';
+
+
+
+//actionType
+export const searchFocus = () => ({
+    type: constants.SEARCH_FOCUS
+});
+
+export const getList = () => {
+    return (dispatch) => {
+        axios.get('/api/submenuList.json').then((res) => {
+            const data = res.data;
+            dispatch(changeList(data.data));
+        }).catch(() => {
+            console.log('error');
+        })
+    }
+};
+
+export const changeInputValue = (value) => (  {
+    type: constants.CHANGE_INPUTVALUE,
+    data:fromJS(value),
+});
+
+const changeList = (data) => ({
+    type: constants.CHANGE_LIST,
+    data: fromJS(data),
+    // totalPage: Math.ceil(data.length / 10)
+});
+
+// export const searchBlur = () => ({
+// 	type: constants.SEARCH_BLUR
+// });
+
+// export const mouseEnter = () => ({
+// 	type: constants.MOUSE_ENTER
+// });
+
+// export const mouseLeave = () => ({
+// 	type: constants.MOUSE_LEAVE
+// });
+
+// export const changePage = (page) => ({
+// 	type: constants.CHANGE_PAGE,
+// 	page
+// });
+

+ 5 - 0
src/common/staffHeader/store/constants.js

@@ -0,0 +1,5 @@
+export const SEARCH_FOCUS = 'submenu/SEARCH_FOCUS';
+export const CHANGE_LIST ='submenu/CHANGE_LIST';
+export const CHANGE_INPUTVALUE ='submenu/CHANGE_INPUTVALUE';
+
+

+ 5 - 0
src/common/staffHeader/store/index.js

@@ -0,0 +1,5 @@
+import reducer from './reducer';
+import * as actionCreators from './actionCreators';
+import * as constants from './constants';
+
+export { reducer,actionCreators,constants }

+ 58 - 0
src/common/staffHeader/store/reducer.js

@@ -0,0 +1,58 @@
+import * as constants from './constants';
+//锁定state不可修改,导致错误y
+import { fromJS } from 'immutable';
+
+
+const defaultState = fromJS({
+    menu: 'hello submenu-t!!!',
+    list:[],
+    inputValue:'',
+
+});
+
+
+export default (state = defaultState, action) => {
+
+    // switch(action.type) {
+	// 	case constants.SEARCH_FOCUS:
+	// 		return state.set('focused', true);
+	// 	case constants.SEARCH_BLUR:
+	// 		return state.set('focused', false);
+	// 	case constants.CHANGE_LIST:
+	// 		return state.merge({
+	// 			list: action.data,
+	// 			totalPage: action.totalPage
+	// 		});
+	// 	case constants.MOUSE_ENTER:
+	// 		return state.set('mouseIn', true);
+	// 	case constants.MOUSE_LEAVE:
+	// 		return state.set('mouseIn', false);
+	// 	case constants.CHANGE_PAGE:
+	// 		return state.set('page', action.page);
+	// 	default:
+	// 		return state;
+	// }
+    if(action.type===constants.CHANGE_INPUTVALUE){
+        return state.set('inputValue',action.data);
+
+    }
+
+
+
+    if(action.type===constants.SEARCH_FOCUS){
+        return state.set('menu','clicke me');
+        // return {
+        //     menu:'clicke me'
+        // }
+    }
+    if(action.type===constants.CHANGE_LIST){
+        return state.set('list',action.data);
+        //return state.set('menu','clicke me');
+
+        // return state.merge({
+        //     list: action.data,
+        //     //totalPage: action.totalPage
+        // });
+    }
+    return state;
+}

+ 401 - 4
src/contact/client/index.js

@@ -1,9 +1,11 @@
-import React, { PureComponent } from 'react';
+import React, { PureComponent,Fragment } from 'react';
 import { connect } from 'react-redux';
-import { BrowserRouter, Route,Link } from 'react-router-dom';
+// import { BrowserRouter, Route,Link } from 'react-router-dom';
 
 import { actionCreators } from './store';
 
+import StaffHeader from '../../common/staffHeader'
+
 class client extends PureComponent {
 
     
@@ -41,11 +43,406 @@ class client extends PureComponent {
     render() {
         //const { inputValue, handleInputFocus,handleInputChange, menu, list } = this.props;
         return (
-            <div>client</div>
+            <Fragment>
+            <StaffHeader />
+            <main id="js-page-content" role="main" class="page-content">
+            <div class="row">
+              <div class="col-xl-12">
+                <div id="panel-1" class="panel">
+                  <div class="panel-hdr">
+                    <div class="col-auto pr-0">
+                      <div class="input-group input-group-sm bg-white shadow-inset-2">
+                        <input type="text" class="form-control bg-transparent" placeholder="姓名/公司/手机/QQ"/>
+                        <div class="input-group-append">
+                          <button class="btn btn-default waves-effect waves-themed" type="button" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="搜索"><i class="fal fa-search"></i></button>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="col-auto pr-0">
+                      <button class="btn btn-sm btn-default" type="button" data-toggle="modal" data-target="#filter"><i class="fal fa-filter"></i> 筛选</button>
+                    </div>
+                    <div class="col-auto pr-0">
+                      <span class="btn btn-sm btn-default" ><a href="#filter" class="text-primary" data-toggle="modal" data-target="#filter"><i class="fal fa-filter"></i> 3项</a><a href="#" class="ml-2 text-danger"><i class="fal fa-times"></i></a></span>
+                    </div>
+                    <div class="col-auto ml-auto">
+                        <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">已显示5列</button>
+                        <div class="dropdown-menu">
+                          <ul class="list-unstyled px-3 pt-2 mb-0">
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie1"/>
+                                <label class="custom-control-label" for="lie1">手机</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie2"/>
+                                <label class="custom-control-label" for="lie2">电话</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie3"/>
+                                <label class="custom-control-label" for="lie3">QQ</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie4" checked=""/>
+                                <label class="custom-control-label" for="lie4">部门</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie5"/>
+                                <label class="custom-control-label" for="lie5">职务</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie6"/>
+                                <label class="custom-control-label" for="lie6">办公室</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie7"/>
+                                <label class="custom-control-label" for="lie7">地区</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie8" checked=""/>
+                                <label class="custom-control-label" for="lie8">个人标签</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie8" checked=""/>
+                                <label class="custom-control-label" for="lie8">地址</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie8" checked=""/>
+                                <label class="custom-control-label" for="lie8">乘车</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie8" checked=""/>
+                                <label class="custom-control-label" for="lie8">地标</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie8" checked=""/>
+                                <label class="custom-control-label" for="lie8">住宿</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie10" checked=""/>
+                                <label class="custom-control-label" for="lie10">软件锁</label>
+                              </div>
+                            </li>
+                            <li class="mb-2">
+                              <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="lie11" checked=""/>
+                                <label class="custom-control-label" for="lie11">大司空</label>
+                              </div>
+                            </li>
+                            
+                          </ul>
+                        </div>
+                    </div>
+                    <div class="col-auto pl-0">
+                      <button class="btn btn-sm btn-default" data-toggle="dropdown"><i class="fal fa-sort-amount-down"></i> 排序</button>
+                      <div class="dropdown-menu dropdown-menu-right" id="paixu">
+                        <ul class="list-unstyled px-3 pt-2 mb-0">
+                          <li class="mb-2">
+                            <div class="custom-control custom-radio">
+                              <input type="radio" class="custom-control-input" id="pai1" name="paizhi" checked=""/>
+                              <label class="custom-control-label" for="pai1">添加时间</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-radio">
+                              <input type="radio" class="custom-control-input" id="pai2" name="paizhi"/>
+                              <label class="custom-control-label" for="pai2">编辑时间</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-radio">
+                              <input type="radio" class="custom-control-input" id="pai3" name="paizhi"/>
+                              <label class="custom-control-label" for="pai3">记录时间</label>
+                            </div>
+                          </li>
+                        </ul>
+                        <ul class="list-unstyled px-3 pt-2 mb-0 border-top">
+                          <li class="mb-2">
+                            <div class="custom-control custom-radio">
+                              <input type="radio" class="custom-control-input" id="pdown" name="paixu" checked=""/>
+                              <label class="custom-control-label" for="pdown">降序</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-radio">
+                              <input type="radio" class="custom-control-input" id="pup" name="paixu"/>
+                              <label class="custom-control-label" for="pup">升序</label>
+                            </div>
+                          </li>
+                        </ul>
+                      </div>
+                    </div>
+                    <div class="col-auto pl-0">
+                      <button type="button" class="btn btn-sm btn-primary"><i class="far fa-plus"></i> 联系人</button>
+                    </div>
+                  </div>
+                  <div class="panel-container show">
+                   
+                    <div class="panel-content">
+                      <table class="table table-bordered table-hover table-striped">
+                        <thead>
+                          <tr>
+                            <th>姓名</th>
+                            <th>公司</th>
+                            <th>部门</th>
+                            <th>个人标签</th>
+                            <th>软件锁</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          <tr>
+                            <td><a href="#detail" data-toggle="modal" data-target="#detail">张三8</a></td>
+                            <td><a href="#com-detail" data-toggle="modal" data-target="#com-detail">xxxx公司</a></td>
+                            <td>部门1</td>
+                            <td><span class="badge tagcol-01"><span class="d-inline-block text-truncate text-truncate-xs">这是一条标签名字很长很长的标签</span></span><span class="badge tagcol-02"><span class="d-inline-block text-truncate text-truncate-xs">特别关注</span></span>
+                              <a title="添加标签" class="badge badge-secondary tagcol-08" href="" data-toggle="dropdown"><i class="far fa-plus"></i></a>
+                              <div class="dropdown-menu dropdown-menu-right">
+                                <ul class="list-unstyled px-3 pt-2 mb-0">
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <div class="input-group-prepend">
+                                        <div class="input-group-text bg-transparent border-right-0">
+                                          <i class="fas fa-circle tagcol-01-s"></i>
+                                        </div>
+                                      </div>
+                                      <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="这是一条标签名字很长很长的标签" />
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <div class="input-group-prepend">
+                                        <div class="input-group-text bg-transparent border-right-0">
+                                          <i class="fas fa-circle tagcol-02-s"></i>
+                                        </div>
+                                      </div>
+                                      <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签2"/>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <div class="input-group-prepend">
+                                        <div class="input-group-text bg-transparent border-right-0">
+                                          <i class="fas fa-circle tagcol-03-s"></i>
+                                        </div>
+                                      </div>
+                                      <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签3"/>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <div class="input-group-prepend">
+                                        <div class="input-group-text bg-transparent border-right-0">
+                                          <i class="fas fa-circle tagcol-04-s"></i>
+                                        </div>
+                                      </div>
+                                      <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签4"/>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <div class="input-group-prepend">
+                                        <div class="input-group-text bg-transparent border-right-0">
+                                          <i class="fas fa-circle tagcol-05-s"></i>
+                                        </div>
+                                      </div>
+                                      <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签5"/>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <div class="input-group-prepend">
+                                        <div class="input-group-text bg-transparent border-right-0">
+                                          <i class="fas fa-circle tagcol-06-s"></i>
+                                        </div>
+                                      </div>
+                                      <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签6"/>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <div class="input-group-prepend">
+                                        <div class="input-group-text bg-transparent border-right-0">
+                                          <i class="fas fa-circle tagcol-07-s"></i>
+                                        </div>
+                                      </div>
+                                      <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="请输入标签名" value="标签7"/>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <button type="button" class="btn btn-sm btn-primary">确定</button>
+                                    <button type="button" class="btn btn-sm btn-secondary">取消</button>
+                                  </li>
+                                </ul>
+                              </div>
+                            </td>
+                            <td><a href="#lock-detail" data-toggle="modal" data-target="#lock-detail">HNYH-0654</a></td>
+                          </tr>
+                          <tr>
+                            <td><a href="#detail" data-toggle="modal" data-target="#detail">张三8</a></td>
+                            <td><a href="#com-detail" data-toggle="modal" data-target="#com-detail">xxxx公司</a></td>
+                            <td>部门1</td>
+                            <td>
+                              <a title="添加标签" class="badge badge-secondary tagcol-08" href="" data-toggle="dropdown"><i class="far fa-plus"></i></a>
+                              <div class="dropdown-menu dropdown-menu-right">
+                                <ul class="list-unstyled px-3 pt-2 mb-0">
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-01-s mr-2"></i>这是一条标签名字很长很长的标签</span>
+                                      <div class="input-group-append">
+                                        <div class="input-group-text  border-left-0 bg-transparent">
+                                          <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="tabcheck1"/>
+                                            <label class="custom-control-label" for="tabcheck1"></label>
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-02-s mr-2"></i>标签2</span>
+                                      <div class="input-group-append">
+                                        <div class="input-group-text  border-left-0 bg-transparent">
+                                          <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="tabcheck2"/>
+                                            <label class="custom-control-label" for="tabcheck2"></label>
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-03-s mr-2"></i>标签3</span>
+                                      <div class="input-group-append">
+                                        <div class="input-group-text  border-left-0 bg-transparent">
+                                          <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="tabcheck3"/>
+                                            <label class="custom-control-label" for="tabcheck3"></label>
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-04-s mr-2"></i>标签4</span>
+                                      <div class="input-group-append">
+                                        <div class="input-group-text  border-left-0 bg-transparent">
+                                          <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="tabcheck4"/>
+                                            <label class="custom-control-label" for="tabcheck4"></label>
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-05-s mr-2"></i>标签5</span>
+                                      <div class="input-group-append">
+                                        <div class="input-group-text  border-left-0 bg-transparent">
+                                          <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="tabcheck5"/>
+                                            <label class="custom-control-label" for="tabcheck5"></label>
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-06-s mr-2"></i>标签6</span>
+                                      <div class="input-group-append">
+                                        <div class="input-group-text  border-left-0 bg-transparent">
+                                          <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="tabcheck6"/>
+                                            <label class="custom-control-label" for="tabcheck6"></label>
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <div class="input-group bg-white shadow-inset-2">
+                                      <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-07-s mr-2"></i>标签7</span>
+                                      <div class="input-group-append">
+                                        <div class="input-group-text  border-left-0 bg-transparent">
+                                          <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="tabcheck7"/>
+                                            <label class="custom-control-label" for="tabcheck7"></label>
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </li>
+                                  <li class="mb-1">
+                                    <a href="#">编辑标签</a>
+                                  </li>
+                                </ul>
+                              </div>
+                            </td>
+                            <td></td>
+                          </tr>
+                        </tbody>
+                      </table>
+                     
+                      <div class="d-flex justify-content-center">
+                        <ul class="pagination pagination-sm">
+                          <li class="page-item disabled">
+                            <a class="page-link" href="#" aria-label="Previous">
+                                                              <span aria-hidden="true"><i class="fal fa-chevron-left"></i></span>
+                                                          </a>
+                          </li>
+                          <li class="page-item active" aria-current="page">
+                            <span class="page-link">
+                                                              1
+                                                              <span class="sr-only">(current)</span>
+                            </span>
+                          </li>
+                          <li class="page-item"><a class="page-link" href="#">2</a></li>
+                          <li class="page-item"><a class="page-link" href="#">3</a></li>
+                          <li class="page-item">
+                            <a class="page-link" href="#" aria-label="Next">
+                                                              <span aria-hidden="true"><i class="fal fa-chevron-right"></i></span>
+                                                          </a>
+                          </li>
+                        </ul>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </main>
+          </Fragment>
         );
     }
 
-    //组件即将要被挂在的时候执行的方法--
+    //组件即将要被挂在的时候执行的方法--去掉
     componentDidMount(){
         //逻辑代码可以写在mapDispathToProps里 this.props.方法
 

+ 3 - 3
src/contact/contact.js

@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
 import { Provider,connect } from 'react-redux';
 import { BrowserRouter, Route,Link } from 'react-router-dom';
-import store from './store';
+//import store from './store';
 
-import Client from './client';
+import {Client} from './indexComponents';
 import { actionCreators } from './common/store';
 
 
@@ -41,7 +41,7 @@ class contact extends Component {
                   
                 </li>
                 <li className={menuActive=='company'?'active':''} onClick={()=>handleMenuActive('company')}>
-                  <Link to='/contact'>
+                  <Link to='/contact/company'>
                   <i className="fal fa-building "></i>
                       <span className="nav-link-text">公司</span>
                   </Link>