111

src/models/contact.js

@@ -4,7 +4,7 @@ import { queryContact } from '@/services/contact'
 export default {
   namespace: 'contact',
   state: {
-    list: [],
+    data: [],
     total: 0
   },
   // 用于处理异步操作和业务逻辑，由action触发，但不能修改state
@@ -27,7 +27,8 @@ export default {
     show(state, action) {
       return {
         ...state,
-        ...action.payload
+        data: action.payload.client,
+        total: action.payload.total
       }
     }
   }

src/pages/Customer/Contact/index.jsx

@@ -231,12 +231,11 @@ const Contact = props => {
       width: 100
     }
   ]
-  const {
-    contactName: { list }
-  } = props // 将contact中的pros.list命名为list
+  const { data = [], total = 0 } = props
+  // const { contactName: { list } } = props // 将contact中的pros.list命名为list
   // const contanctlist = [...list]
   // console.log(props)
-  console.log(list.data)
+  console.log(props)
   // console.log(contanctlist)
   const [columnsStateMap, setColumnsStateMap] = useState({
     telephone: {
@@ -282,10 +281,10 @@ const Contact = props => {
       <ProTable
         size="middle"
         columns={columns}
-        dataSource={list.data}
+        dataSource={data}
         pagination={{
           pageSize: consts.PAGE_SIZE,
-          total: list.total,
+          total,
           onChange: (page, size) => initData(page, size)
         }}
         search={false}
@@ -309,7 +308,9 @@ const Contact = props => {
 }
 
 export default connect(({ contact, global, loading }) => ({
-  contactName: contact,
+  // contactName: contact,
+  data: contact.data,
+  total: contact.total,
   collapsed: global.collapsed,
   getlist: loading.effects['contact/fetch']
 }))(Contact)