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

src/pages/activity/ActivityList.jsx

@@ -294,7 +294,7 @@ const header = props => {
       </AuthButton>
       <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
       </div>
     </>
   )

src/pages/activity/SignList.jsx

@@ -169,7 +169,7 @@ const handleSubmit = (e, props) => {
       <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
       <Table dataSource={data.list.data} columns={columns} pagination={false} rowKey="activity"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/activity/drainage/Detail.jsx

@@ -33,7 +33,7 @@ const header = (props) => {
   function gettaDrainageRecord (params) {
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
       // setDatas(data) 
-      console.log(data.total, '3333333333333')
+      console.log(data, '3333333333333')
       if (data.total != 0) {
         setTotal(data)
         // console.log(data.total, '3333333333333')
@@ -154,7 +154,8 @@ const header = (props) => {
         </AuthButton>
         <Table columns={columns} dataSource={datas} pagination={false} />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} />
+          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} current={total.current}
+/>
         </div>
       </div>
 

src/pages/activity/drainage/DrainageList.jsx

@@ -343,7 +343,7 @@ const header = (props) => {
         </Modal>
         <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-          <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} />
+          <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} current={datas.current} />
         </div>
       </div>
     </>

src/pages/building/list/index.jsx

@@ -321,7 +321,7 @@ function body(props) {
       </Row>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} current={data.current}/>
       </div>
     </>
   );

src/pages/building/type/index.jsx

@@ -106,7 +106,7 @@ function body() {
       <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="buildingType"/>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/advertisingList.jsx

@@ -220,7 +220,7 @@ const handleSubmit = (e, props) => {
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/carouselFigureList.jsx

@@ -219,7 +219,7 @@ const handleSubmit = (e, props) => {
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/integralMall/GoodsList.jsx

@@ -201,7 +201,7 @@ function header(props) {
       </AuthButton>
       <Table rowKey="goodsList" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/integralMall/achieve.jsx

@@ -129,7 +129,7 @@ const columns = [
         <TabPane tab="平台积分" key="platform">
           <Table rowKey="achieve" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
           </div>
         </TabPane>
         <TabPane tab="项目积分" key="project">
@@ -148,7 +148,7 @@ const columns = [
           </Form>
           <Table rowKey="achie" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+            <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
           </div>
         </TabPane>
       </Tabs>,

src/pages/integralMall/exchangeRecords.jsx

@@ -205,7 +205,7 @@ function record(props) {
       </Form>
       <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/integralMall/verifyList.jsx

@@ -113,7 +113,7 @@ const header = (props) => {
       <Button type="primary" className={styles.addBtn} onClick={toBack}>返回</Button>
       <Table rowKey="verifyList" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/news/list/NewsList.jsx

@@ -319,7 +319,7 @@ function body(props) {
       </Row>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} current={data.current}/>
       </div>
     </>
   );

src/pages/news/type/NewsType.jsx

@@ -134,7 +134,7 @@ function header(props) {
       </AuthButton>
       <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/staff/list/StaffList.jsx

@@ -203,7 +203,7 @@ const header = (props) => {
 
       {/* 分页  */}
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={pageTotal} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={pageTotal} onChange={onChange} current={data.current}/>
       </div>
     </>
   )

src/pages/system/housingPolicy.jsx

@@ -186,7 +186,7 @@ const handleSubmit = (e, props) => {
       </AuthButton>
       <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/system/messageList.jsx

@@ -62,7 +62,7 @@ const header = (props) => {
     <>
       <Table rowKey="messageList" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )

src/pages/third/thirdList.jsx

@@ -93,7 +93,7 @@ const header = (props) => {
       </AuthButton>
       <Table rowKey="messageList" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>
     </>
   )