feat:完成用户管理页面联调

src/modules/root/App.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2019-07-10 10:30:49
  * @LastEditors: wufan
- * @LastEditTime: 2020-12-02 17:31:41
+ * @LastEditTime: 2020-12-02 18:02:14
  * @Description:
  */
 import React, { useContext, useEffect } from 'react';
@@ -31,11 +31,11 @@ const App: React.FC = (props: any) => {
   },[userId])
 
   async function getStoreAndUserInfo(){
-    await getUserStore();
+    await getStoreGroupAndStoreList();
     await getUserPermission();
   }
 
-  function getUserStore() {
+  function getStoreGroupAndStoreList() {
     BaseService.getUserStore({ userId }).then((res) => {
       
       const { storeGroupVOS = [], storeVOS } = res.result;

src/modules/store-manege/UserManagePage.tsx

@@ -2,8 +2,8 @@
  * @Author: wufan
  * @Date: 2020-11-30 10:47:38
  * @LastEditors: wufan
- * @LastEditTime: 2020-12-01 20:49:40
- * @Description: 员工管理页面
+ * @LastEditTime: 2020-12-03 10:35:53
+ * @Description: 用户管理页面
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -11,17 +11,9 @@ import React, { useEffect, useState } from "react";
 import { withRouter } from "react-router-dom";
 import _ from "underscore";
 import PageControl from "@/components/PageControl";
-import {
-  Table,
-  Modal,
-  message,
-  Row,
-  Col,
-  Input,
-  DatePicker,
-} from "antd";
+import { Table, Modal, message, Row, Col, Input, DatePicker } from "antd";
 import StoreService from "@/domains/store-domain/storeService";
-import User from '@/common/js/user';
+import User from "@/common/js/user";
 
 import "./UserManagePage.less";
 import moment from "moment";
@@ -31,26 +23,15 @@ const { RangePicker } = DatePicker;
 declare var window: any;
 
 function UserManagePage() {
-  const [userList, setUserList] = useState([
-    {
-      nickName: "赵云",
-      phone: "18767118672",
-      role: "0",
-    },
-    {
-      nickName: "吕布",
-      phone: "18767118672",
-      role: "0",
-    },
-  ]);
+  const [userList, setUserList] = useState([]);
   const [query, setQuery] = useState({
     current: 0,
     size: 10,
     nickName: "",
     phone: "",
     storeId: User.getStoreId(),
-    beginTime: null,
-    endTime: null,
+    registerBegin: null,
+    registerEnd: null,
   });
   const [total, setTotal] = useState(0);
   const [model, setModel] = useState(null);
@@ -58,14 +39,16 @@ function UserManagePage() {
   const [isManager, setIsManager] = useState(true);
   const [isNormal, setIsNormal] = useState(true);
   const [choosedItem, setChooseItem] = useState({});
+  const [nickName, setNickName] = useState("");
+  const [phone, setPhone] = useState("");
 
   useEffect(() => {
-    // getUserList();
+    getUserList();
   }, [query]);
 
-  function getUserList() {
+  function getUserList(current = 0) {
     let _query = _.clone(query);
-    _query.current = query.current + 1;
+    _query.current = current + 1;
     StoreService.getUserList(_query).then((res: any) => {
       setUserList(res.result.records);
       setTotal(res.result.total);
@@ -95,10 +78,10 @@ function UserManagePage() {
       },
       {
         title: "注册时间",
-        dataIndex: "registerDate",
-        key: "registerDate",
+        dataIndex: "created",
+        key: "created",
         render: (val: string) => {
-        return <div>{moment(val).format('YYYY-MM-DD HH:mm:ss')}</div>;
+          return <div>{moment(val).format("YYYY-MM-DD HH:mm:ss")}</div>;
         },
       },
     ];
@@ -113,7 +96,7 @@ function UserManagePage() {
   return (
     <div className=" page user-manage-page">
       <div className="page-content">
-        <div className="content-header">员工管理</div>
+        <div className="content-header">用户管理</div>
         <div className="box">
           <div className="box-header">
             <div
@@ -132,13 +115,23 @@ function UserManagePage() {
                     marginRight: 40,
                   }}
                   placeholder="搜索用户姓名/手机号"
-                  onChange={(event) => {
-                    const val = event.target.value;
+                  // onChange={(event) => {
+                  //   const val = event.target.value;
+
+                  // }}
+                  onSearch={(value) => {
                     const _query = { ...query };
-                    _query.nickName = val;
+                    if (value) {
+                      console.log("value", value);
+                      const isPhone = (value || "").match(/^\d+$/);
+                      const name = isPhone ? "phone" : "nickName";
+                      _query[name] = value;
+                    } else {
+                      _query.nickName = "";
+                      _query.phone = "";
+                    }
                     setQuery(_query);
                   }}
-                  onSearch={() => getUserList()}
                 />
               </div>
 
@@ -148,11 +141,8 @@ function UserManagePage() {
                   showTime
                   style={{ flex: 1, width: "auto" }}
                   value={
-                    query.beginTime
-                      ? [
-                          moment(query.beginTime),
-                          moment(query.endTime),
-                        ]
+                    query.registerBegin
+                      ? [moment(query.registerBegin), moment(query.registerEnd)]
                       : null
                   }
                   format={"YYYY-MM-DD"}
@@ -164,8 +154,8 @@ function UserManagePage() {
                   }}
                   onChange={(dates: any) => {
                     const _query = _.clone(query);
-                    _query.beginTime = dates ? dates[0].valueOf(): null;
-                    _query.endTime = dates ? dates[1].valueOf() : null;
+                    _query.registerBegin = dates ? dates[0].valueOf() : null;
+                    _query.registerEnd = dates ? dates[1].valueOf() : null;
                     setQuery({
                       ..._query,
                       current: 1,