合并

src/pages/staff/list/StaffList.jsx

@@ -104,7 +104,7 @@ const CartBody = (props) => {
 }
 
 const header = (props) => {
-  const [tempData, setTempData] = useState([])
+  const [tempData, setTempData] = useState({ records: [] })
   const [pageTotal, setPageTotal] = useState('')
   const [data,setData] = useState({})
   useEffect(() => {
@@ -114,8 +114,12 @@ const header = (props) => {
   const getList = (params) => {
     request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
       console.log(data, "listData")
+<<<<<<< HEAD
+      setTempData(data)
+=======
       setData(data)
       setTempData(data.records)
+>>>>>>> 07ab51117db15061e9e469cbddcabf3ec412859e
       setPageTotal(data.total)
     })
   }
@@ -196,7 +200,7 @@ const header = (props) => {
       <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
       <Row style={{ padding: ' 0 10px' }}>
         {
-          tempData.map((item, index) => (
+          tempData.records.map((item, index) => (
             <Col span={6}>
               <CartBody data={item} onFresh={() => getList({ pageNum: 1, pageSize: 8 })} />
             </Col>
@@ -206,7 +210,11 @@ const header = (props) => {
 
       {/* 分页  */}
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+<<<<<<< HEAD
+        <Pagination showQuickJumper defaultCurrent={1} total={pageTotal} onChange={onChange} current={tempData.current}/>
+=======
         <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={pageTotal} onChange={onChange} current={data.current}/>
+>>>>>>> 07ab51117db15061e9e469cbddcabf3ec412859e
       </div>
     </>
   )

src/pages/system/document/audit.jsx

@@ -28,8 +28,6 @@ function body (props) {
   }
 
   function onVerify (params) {
-
-    alert(params)
     // 网路请求
     request({ ...apis.system.updateVerify, urlData: { id: documentVerifyId }, data: { verifyStatus: params } }).then(data => {