Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-manage

src/pages/carouselFigure/editCarousel.jsx

@@ -179,10 +179,10 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             label: '首页',
             value: 'index',
           },
-          // {
-          //   label: '积分商城',
-          //   value: 'mall',
-          // },
+          {
+            label: '积分商城',
+            value: 'mall',
+          },
           {
             label: '物业',
             value: 'property',

src/pages/property/proprietor/Audit.jsx

@@ -105,12 +105,20 @@ export default props => {
     setNoPassShow(false)
   }
 
+  const handlePageChange = (pageNum, pageSize) => {
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
+  }
+
   useEffect(() => {
     setLoading(true)
     userVerifyAll(queryParams).then(res => {
       const [records, pagi] = res || []
       setListData(records)
-      setPagination(pagi)
+      setPagination({total: pagi.total, pageSize: pagi.size, pageNum: pagi.current})
       setLoading(false)
     }).catch(() => setLoading(false))
   }, [queryParams])
@@ -121,7 +129,7 @@ export default props => {
       <div style={{ marginTop: '24px' }}>
         <p style={{color: '#888', fontSize: '0.8em'}}>注意，审核后无法修改审核结果，请仔细确认</p>
       </div>
-      <List dataSource={listData} pagination={pagination} loading={loading} rowKey="id">
+      <List dataSource={listData} onPageChange={handlePageChange} pagination={pagination} loading={loading} rowKey="id">
         <Table.Column title="姓名" dataIndex="ownerName" key="ownerName" />
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />