Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/pages/activity/helpActivity/helpRecord.jsx

@@ -27,13 +27,13 @@ class InviteTable extends React.Component {
   // 挂载之后
   componentDidMount () {
     const { helpId } = this.state.visibleData
-    this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
+    this.getList({ helpRecordInitiateId: helpId, pageNum: 1, pageSize: 5 })
   }
 
   componentDidUpdate (preProps, preState) {
     const { helpId } = this.state.visibleData
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
-      this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
+      this.getList({ helpRecordInitiateId: helpId, pageNum: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -93,7 +93,8 @@ class InviteTable extends React.Component {
   // 分页
   // eslint-disable-next-line react/sort-comp
   onChange (pageNum) {
-    this.getList({ helpRecordInitiateId: helpId, pageNumber: pageNum, pageSize: 5 })
+    const { helpId } = this.state.visibleData
+    this.getList({ helpRecordInitiateId: helpId, pageNum: pageNum, pageSize: 5 })
   }
 
   render () {
@@ -134,7 +135,7 @@ class InviteTable extends React.Component {
       <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
-          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
         </Modal>
       </>
     );
@@ -266,7 +267,7 @@ function body(props) {
   const { helpActivityId } = props.location.query
   useEffect(() => {
     console.log('customerType', customerType)
-    getList({ pageNumber: 1, pageSize: 10, status: customerType, helpActivityId })
+    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
   }, [])
 
   function getList(params) {
@@ -312,7 +313,7 @@ function body(props) {
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNumber: pageNum, pageSize: 10, customerType, helpActivityId })
+    getList({ pageNum: pageNum, pageSize: 10, status: customerType, helpActivityId })
   }
 
   // 助力成功/进行中/助力失败
@@ -324,7 +325,7 @@ function body(props) {
     const { value } = e.target
     setCustomerType(value)
     // setColumns(value === 'helpSucceed' ? privateColumns : publicColumns)
-    getList({ pageNumber: 1, pageSize: 10, status: value, helpActivityId })
+    getList({ pageNum: 1, pageSize: 10, status: value, helpActivityId })
   }
 
   function handleReset() {