#6 Merchants Add UI Part, TODO: API and debug

src/assets/css/duocun.css

@@ -7,4 +7,9 @@
 /** table */
 table.dc-table {
   min-width: 750
+}
+
+/** select */
+.dc-full-select {
+  width: 100%;
 }

src/services/api/ApiAccountService.js

@@ -1,18 +1,16 @@
 import ApiService from "services/api/ApiService";
 import { buildPaginationQuery } from "helper/index";
 export default {
-  getAccountList: (page, pageSize, search = "", sort = []) => {
+  getAccountList: (page, pageSize, {username, type}, sort = []) => {
     let query = {};
-    if (!search) {
-      query.query = buildPaginationQuery(page, pageSize, {}, [], sort);
-    } else {
-      const condition = {
-        username: {
-          $regex: search,
-        },
-      };
-      query.query = buildPaginationQuery(page, pageSize, condition, [], sort);
+    let conditions = {};
+    if (username) {
+      conditions.username = {  $regex: username };
     }
+    if (type) {
+      conditions.type = type; 
+    }
+    query.query = buildPaginationQuery(page, pageSize, conditions, [], sort);
     return ApiService.v2().get("accounts", query);
   },
   getAccountAllKeyword: (keyword = "") => {

src/views/Accounts/AccountsTablePage.js

@@ -45,7 +45,7 @@ export default function AccountsTablePage({ location }) {
   }, [page, rowsPerPage, sort]);
 
   const updateData = () => {
-    ApiAccountService.getAccountList(page, rowsPerPage, query, [sort]).then(
+    ApiAccountService.getAccountList(page, rowsPerPage, {username:query}, [sort]).then(
       ({ data }) => {
         setAccounts(data.data);
         setTotalRows(data.count);

src/views/Common/EditSkeleton.js

@@ -30,5 +30,15 @@ const EditSkeleton = () => (
     </GridItem>
   </React.Fragment>
 );
+export const EditSkeletonShort = () => (
+  <React.Fragment>
+    <GridItem xs={12} lg={12}>
+      <Skeleton height={48} />
+    </GridItem>
+    <GridItem xs={12} lg={12}>
+      <Skeleton height={48} />
+    </GridItem>
+  </React.Fragment>
+);
 
 export default EditSkeleton;