瀏覽代碼

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

张延森 4 年之前
父節點
當前提交
099d32b61b
共有 2 個檔案被更改,包括 14 行新增6 行删除
  1. 4
    4
      src/pages/carouselFigure/editCarousel.jsx
  2. 10
    2
      src/pages/property/proprietor/Audit.jsx

+ 4
- 4
src/pages/carouselFigure/editCarousel.jsx 查看文件

179
             label: '首页',
179
             label: '首页',
180
             value: 'index',
180
             value: 'index',
181
           },
181
           },
182
-          // {
183
-          //   label: '积分商城',
184
-          //   value: 'mall',
185
-          // },
182
+          {
183
+            label: '积分商城',
184
+            value: 'mall',
185
+          },
186
           {
186
           {
187
             label: '物业',
187
             label: '物业',
188
             value: 'property',
188
             value: 'property',

+ 10
- 2
src/pages/property/proprietor/Audit.jsx 查看文件

105
     setNoPassShow(false)
105
     setNoPassShow(false)
106
   }
106
   }
107
 
107
 
108
+  const handlePageChange = (pageNum, pageSize) => {
109
+    setQueryParams({
110
+      ...queryParams,      
111
+      pageNum,
112
+      pageSize,
113
+    })
114
+  }
115
+
108
   useEffect(() => {
116
   useEffect(() => {
109
     setLoading(true)
117
     setLoading(true)
110
     userVerifyAll(queryParams).then(res => {
118
     userVerifyAll(queryParams).then(res => {
111
       const [records, pagi] = res || []
119
       const [records, pagi] = res || []
112
       setListData(records)
120
       setListData(records)
113
-      setPagination(pagi)
121
+      setPagination({total: pagi.total, pageSize: pagi.size, pageNum: pagi.current})
114
       setLoading(false)
122
       setLoading(false)
115
     }).catch(() => setLoading(false))
123
     }).catch(() => setLoading(false))
116
   }, [queryParams])
124
   }, [queryParams])
121
       <div style={{ marginTop: '24px' }}>
129
       <div style={{ marginTop: '24px' }}>
122
         <p style={{color: '#888', fontSize: '0.8em'}}>注意,审核后无法修改审核结果,请仔细确认</p>
130
         <p style={{color: '#888', fontSize: '0.8em'}}>注意,审核后无法修改审核结果,请仔细确认</p>
123
       </div>
131
       </div>
124
-      <List dataSource={listData} pagination={pagination} loading={loading} rowKey="id">
132
+      <List dataSource={listData} onPageChange={handlePageChange} pagination={pagination} loading={loading} rowKey="id">
125
         <Table.Column title="姓名" dataIndex="ownerName" key="ownerName" />
133
         <Table.Column title="姓名" dataIndex="ownerName" key="ownerName" />
126
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
134
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
127
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />
135
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />