fixbug

src/pages/member/components/LevelInfo/index.tsx

@@ -51,7 +51,7 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
   const [page, setPage] = useState(1);
   const [size, setSize] = useState(PAGE_SIZE);
   const [total, setTotal] = useState(0);
-  const [list, setList] = useState([]);
+  const [list, setList] = useState<DataProps[]>([]);
   const [listLoading, setListLoading] = useState(false);
 
   const columns: EditableColumns[] = [
@@ -83,12 +83,13 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
     },
   ];
 
-  const getHistoryList = () => {
+  const getHistoryList = (params?) => {
     if (fetchList) {
       setListLoading(true);
       fetchList({
         current: page,
-        pageSize: size,
+        pageSize: size, 
+        ...params, 
       }).then(res => {
         const { data = [], totalCount = 0 } = (res || {});
         setList(data);
@@ -103,10 +104,13 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
     getHistoryList();
   }, []);
 
-  const handlePaginationChange = (page: number, size: number) => {
+  const handlePaginationChange = (current: number, pageSize: number) => {
     setPage(page);
     setSize(size);
-    getHistoryList();
+    getHistoryList({
+      current,
+      pageSize, 
+    });
   };
 
   return (
@@ -129,7 +133,7 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
                       strokeWidth={4}
                       strokeLinecap="square"
                       showInfo={false}
-                      percent={nextScore ? (score / levelInfo.nextScore) * 100 : 100}
+                      percent={nextScore ? (score / nextScore) * 100 : 100}
                     />
                   </div>
 

src/pages/member/memberLevel/addEquity.tsx

@@ -57,12 +57,8 @@ const addEquity: React.FC<[]> = () => {
     PublicApi.postMemberManageRightUpdatestatus({
       id: record.id, 
       status: disabled ? 1 : 0,
-    }, {
-      ctlType: 'none', 
     }).then(res => {
       if (res.code === 1000) {
-        const msg = disabled ? '启用成功' : '禁用成功'
-        message.success(msg);
         getMemberLevelInfo();
       }
     });
@@ -177,6 +173,10 @@ const addEquity: React.FC<[]> = () => {
         message.success('保存成功');
         getMemberLevelInfo();
       }
+      const errorItem = resArr.find((item: any) => item.code !== 1000);
+      if (errorItem) {
+        message.error(errorItem.message);
+      }
     } catch (errInfo) {
       
     }

src/pages/member/memberLevel/index.tsx

@@ -81,7 +81,7 @@ const MemberLevel: React.FC<[]> = () => {
     },
     {
       title: '升级阈值',
-      dataIndex: 'levelUpPoint',
+      dataIndex: 'point',
       align: 'center',
     },
     {

src/pages/member/memberUpgradeRule/index.tsx

@@ -39,7 +39,7 @@ const MemberUpgradeRule: React.FC<[]> = () => {
       current: page, 
       pageSize: size, 
     });
-  }, [page, size]);
+  }, []);
 
   const columns: EditableColumns[] = [
     {
@@ -67,9 +67,13 @@ const MemberUpgradeRule: React.FC<[]> = () => {
     },
   ];
 
-  const handlePaginationChange = (page: number, size: number) => {
-    setPage(page);
-    setSize(size);
+  const handlePaginationChange = (current: number, pageSize: number) => {
+    setPage(current);
+    setSize(pageSize);
+    getRuleList({
+      current,
+      pageSize, 
+    });
   };
 
   // 重新保存 dataSource