Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

src/components/TableLayout/index.tsx

-import React, { useRef, useState, useImperativeHandle } from 'react';
+import React, { useRef, useState, useImperativeHandle, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { Card } from 'antd';
 import { StandardTable } from 'god';
@@ -52,13 +52,7 @@ const Table: React.FC<Iprops> = (props: any) => {
     useStateEffects
   } = props;
   const tableRef = useRef<any>({});
-  const [selectRow, selectRowFns] = useRowSelectionTable({
-    extendsSelection: {
-      onChange: () => {
-        fetchRowkeys(selectRowFns.selectedRowKeys)
-      },
-    }
-  });
+  const [selectRow, selectRowFns] = useRowSelectionTable();
 
   /** 列表数据 */
   const fetchData = (params?: any) => {
@@ -102,6 +96,10 @@ const Table: React.FC<Iprops> = (props: any) => {
 
   }
 
+  useEffect(() => {
+    fetchRowkeys && fetchRowkeys(selectRowFns.selectedRowKeys)
+  }, [selectRowFns])
+
   return (
     <PageHeaderWrapper>
       <Card>

src/pages/marketingManage/marketing/waitAddedMarketing/index.tsx

@@ -24,7 +24,7 @@ const WaitAddedMarketing = () => {
     if (id) {
       res = await PublicApi.postMarketingPlatformActivitySubmit({ id: Number(id) })
     } else {
-      // res = await PublicApi.postPurchasePurchaseInquirySubmitBatch({ ids: rowkeys });
+      res = await PublicApi.postMarketingPlatformActivitySubmitBatch({ ids: rowkeys });
     }
     if (res.code === 1000) {
       ref.current.reload();
@@ -263,14 +263,14 @@ const WaitAddedMarketing = () => {
                 icon={<DeleteOutlined />}
                 loading={loading}
                 onClick={() => fetchDeleteBatch()}
-                disabled={rowkeys.length !== 0}
+                disabled={rowkeys.length === 0}
               >
                 批量删除
               </Button>
               <Button
                 loading={loading}
                 onClick={() => fetchSubmitBatch()}
-                disabled={rowkeys.length !== 0}
+                disabled={rowkeys.length === 0}
               >
                 批量提交审核
               </Button>

src/pages/marketingManage/merchantMarketing/merchantMarketingSearch/index.tsx

@@ -162,6 +162,15 @@ const MerchantMarketingSearch = () => {
                       },
                       enum: [],
                     },
+                    memberName: {
+                      type: 'string',
+                      'x-component-props': {
+                        placeholder: '会员名称',
+                        style: {
+                          width: 160,
+                        },
+                      },
+                    },
                   }
                 },
                 sumbit: {

src/pages/marketingManage/merchantMarketing/waitAuditMerchantMarketing/index.tsx

@@ -175,6 +175,15 @@ const WaitAuditMerchantMarketing = () => {
                     },
                     enum: [],
                   },
+                  memberName: {
+                    type: 'string',
+                    'x-component-props': {
+                      placeholder: '会员名称',
+                      style: {
+                        width: 160,
+                      },
+                    },
+                  },
                 }
               },
               sumbit: {