Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/pages/activity/ActivityList.jsx

@@ -43,33 +43,18 @@ function toEditGoods() {
  * @returns
  */
 
-const dataSource = [
-  {
-    key: '1',
-    img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
-    name: '华为P30 Pro',
-  },
-  {
-    key: '2',
-    img: '',
-    name: '大米',
-  },
-];
-
 const columns = [
   {
     title: '活动标题',
-    dataIndex: 'img',
-    key: 'img',
+    dataIndex: 'title',
+    key: 'title',
     align: 'center',
-    render: (text, record) => <img src={record.img} className={styles.touxiang} />,
   },
   {
     title: '活动时间',
     dataIndex: 'name',
     key: 'name',
     align: 'center',
-
   },
   {
     title: '已参加人数',
@@ -137,7 +122,7 @@ const header = (props) => {
         console.log(data)
         setData(data)
     })
-  })
+  },[])
 
   const getList = (e) => {
     request({
@@ -198,7 +183,7 @@ const header = (props) => {
         </Form.Item>
       </Form>
       <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
-      <Table dataSource={data.records} columns={columns} />
+      <Table dataSource={data.list} columns={columns} />
       {/* 分页 */
       /* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />