fixbug

src/pages/member/constant.tsx

@@ -54,17 +54,17 @@ export const MEMBER_OUTER_STATUS_TYPE = {
 // 会员内部状态 Tag badge map
 export const MEMBER_INNER_STATUS_BADGE_COLOR = {
   [MEMBER_INNER_STATUS_REGISTERED]: '#42526E', 
-  [MEMBER_INNER_STATUS_UNCOMMITTED]: '#3F7ED2', 
-  [MEMBER_INNER_STATUS_UNREVIEWED_1]: '#FF991F', 
-  [MEMBER_INNER_STATUS_UNREVIEWED_2]: '#FF991F', 
-  [MEMBER_INNER_STATUS_FAILED]: '#E63F3B', 
-  [MEMBER_INNER_STATUS_SUCCESS]: '#00B37A', 
+  [MEMBER_INNER_STATUS_UNCOMMITTED]: '#669EDE', 
+  [MEMBER_INNER_STATUS_UNREVIEWED_1]: '#FFC400', 
+  [MEMBER_INNER_STATUS_UNREVIEWED_2]: '#FFC400', 
+  [MEMBER_INNER_STATUS_FAILED]: '#EF6260', 
+  [MEMBER_INNER_STATUS_SUCCESS]: '#41CC9E', 
 };
 
 // 会员外部状态 Tag badge map
 export const MEMBER_OUTER_STATUS_BADGE_COLOR = {
-  [MEMBER_OUTER_STATUS_UNCOMMITTED]: '#3F7ED2', 
-  [MEMBER_OUTER_STATUS_UNREVIEWED]: '#FF991F', 
-  [MEMBER_OUTER_STATUS_FAILED]: '#E63F3B', 
-  [MEMBER_OUTER_STATUS_SUCCESS]: '#00B37A', 
+  [MEMBER_OUTER_STATUS_UNCOMMITTED]: '#669EDE', 
+  [MEMBER_OUTER_STATUS_UNREVIEWED]: '#FFC400', 
+  [MEMBER_OUTER_STATUS_FAILED]: '#EF6260', 
+  [MEMBER_OUTER_STATUS_SUCCESS]: '#41CC9E', 
 };
\ No newline at end of file

src/pages/member/memberMaintain/index.tsx

@@ -28,6 +28,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { PublicApi } from '@/services/api';
+import moment from 'moment';
 import { 
   MEMBER_STATUS_NORMAL, 
   MEMBER_INNER_STATUS_SUCCESS, 
@@ -52,8 +53,18 @@ const memberMaintain: React.FC<[]> = () => {
   const [visibleModal, setVisibleModal] = useState(false);
 
   const fetchData = async (params: any) => {
-    let res = await PublicApi.getMemberMaintenancePage(params);
-    return res.data;
+    console.log('params', params)
+    const { startDate, endDate } = params;
+    const payload = params;
+    const res = await PublicApi.getMemberMaintenancePage({
+      ...params, 
+      startDate: startDate ? +startDate : null, 
+      endDate: endDate ? +endDate : null, 
+    });
+    if (res.code === 1000) {
+      return res.data;
+    }
+    return [];
   };
   
   const handleDelete = (memberId: number, validateId: number) => {
@@ -233,7 +244,7 @@ const memberMaintain: React.FC<[]> = () => {
         memberTypes = [], 
         memberRoles = [], 
         memberLevels = [], 
-        sources = [], 
+        source = [], 
       } = data;
 
       const newColumns = columns.slice();
@@ -261,7 +272,7 @@ const memberMaintain: React.FC<[]> = () => {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })),
         level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })),
-        source: sources.map(item => ({ label: item.text, value: item.id })), 
+        source: source.map(item => ({ label: item.text, value: item.id })), 
         innerStatus: innerStatus.map(item => ({ label: item.text, value: item.id })), 
         outerStatus: outerStatus.map(item => ({ label: item.text, value: item.id })), 
         status: status.map(item => ({ label: item.text, value: item.id })),