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

src/pages/property/bill/list/index.jsx

@@ -168,7 +168,7 @@ export default props => {
     setLoading(true)
     deleteBillBeach({ data: [row.id] }).then(res => {
       setLoading(false)
-      getListData()
+      handleQuery()
     })
   }
 

src/pages/property/notice/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Modal } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetch, apis } from '@/utils/request'
 import Search from '../components/Search'
@@ -78,8 +78,9 @@ export default props => {
   useEffect(() => {
     setLoading(true)
     listAnnouncement({ data: queryParams }).then(res => {
-      const { records, ...pageInfo } = res || {}
-      setListData(records)
+      console.log(res,"222")
+      const { list, ...pageInfo } = res || {}
+      setListData(list)
       setPagination(pageInfo)
       setLoading(false)
     }).catch(() => setLoading(false))

src/pages/property/proprietor/Audit.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react'
-import { Spin, Button, Form, Input, Popconfirm, Table, Modal, notification } from 'antd'
+import { Spin, Button, Form, Input, Popconfirm, Table, Modal, notification, Divider } from 'antd'
 import { fetch, fetchList, apis } from '@/utils/request'
 import Search from '../components/Search'
 import List from '../components/List'