feat:用户列表接口联调

src/data-source/store/request-apis.ts

@@ -2,7 +2,7 @@
  * @Author: wufan
  * @Date: 2020-11-25 18:25:02
  * @LastEditors: wufan
- * @LastEditTime: 2020-12-01 18:14:38
+ * @LastEditTime: 2020-12-01 20:45:54
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -17,9 +17,9 @@ export function getStoreRole(params: object) {
 }
 
 export function getUserList(params: object) {
-  return Service.Apollo("public/businessMicroWebsite/getMicroWebsiteCouponList", params);
+  return Service.Hades("public/store/getStoreCustomerPage", params);
 }
 
 export function getStoreDecorationList(params: object) {
-  return Service.Apollo("public/businessMicroWebsite/getMicroWebsiteCouponList", params);
+  return Service.Apollo("public/store/getStoreBannerList", params);
 }

src/modules/store-manege/UserManagePage.tsx

@@ -2,7 +2,7 @@
  * @Author: wufan
  * @Date: 2020-11-30 10:47:38
  * @LastEditors: wufan
- * @LastEditTime: 2020-11-30 14:37:03
+ * @LastEditTime: 2020-12-01 20:49:40
  * @Description: 员工管理页面
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -21,25 +21,24 @@ import {
   DatePicker,
 } from "antd";
 import StoreService from "@/domains/store-domain/storeService";
+import User from '@/common/js/user';
 
 import "./UserManagePage.less";
 import moment from "moment";
-const { confirm } = Modal;
 const { Search } = Input;
 const { RangePicker } = DatePicker;
-const dateFormat = "YYYY-MM-DD";
 
 declare var window: any;
 
 function UserManagePage() {
   const [userList, setUserList] = useState([
     {
-      name: "赵云",
+      nickName: "赵云",
       phone: "18767118672",
       role: "0",
     },
     {
-      name: "吕布",
+      nickName: "吕布",
       phone: "18767118672",
       role: "0",
     },
@@ -47,12 +46,11 @@ function UserManagePage() {
   const [query, setQuery] = useState({
     current: 0,
     size: 10,
-    name: "",
+    nickName: "",
     phone: "",
-    identity: "ALL",
-    instId: "1837447" || window.currentUserInstInfo.instId,
-    registerStartDate: null,
-    registerEndDate: null,
+    storeId: User.getStoreId(),
+    beginTime: null,
+    endTime: null,
   });
   const [total, setTotal] = useState(0);
   const [model, setModel] = useState(null);
@@ -69,7 +67,6 @@ function UserManagePage() {
     let _query = _.clone(query);
     _query.current = query.current + 1;
     StoreService.getUserList(_query).then((res: any) => {
-      console.log(res.result.records);
       setUserList(res.result.records);
       setTotal(res.result.total);
     });
@@ -79,7 +76,7 @@ function UserManagePage() {
     return [
       {
         title: "用户姓名",
-        dataIndex: "name",
+        dataIndex: "nickName",
         render: (val: string) => {
           return (
             <div className="coupon-info">
@@ -138,7 +135,7 @@ function UserManagePage() {
                   onChange={(event) => {
                     const val = event.target.value;
                     const _query = { ...query };
-                    _query.name = val;
+                    _query.nickName = val;
                     setQuery(_query);
                   }}
                   onSearch={() => getUserList()}
@@ -151,10 +148,10 @@ function UserManagePage() {
                   showTime
                   style={{ flex: 1, width: "auto" }}
                   value={
-                    query.registerStartDate
+                    query.beginTime
                       ? [
-                          moment(query.registerStartDate),
-                          moment(query.registerEndDate),
+                          moment(query.beginTime),
+                          moment(query.endTime),
                         ]
                       : null
                   }
@@ -167,8 +164,8 @@ function UserManagePage() {
                   }}
                   onChange={(dates: any) => {
                     const _query = _.clone(query);
-                    _query.registerStartDate = dates ? dates[0].valueOf(): null;
-                    _query.registerEndDate = dates ? dates[1].valueOf() : null;
+                    _query.beginTime = dates ? dates[0].valueOf(): null;
+                    _query.endTime = dates ? dates[1].valueOf() : null;
                     setQuery({
                       ..._query,
                       current: 1,