合并

config/config.js

@@ -127,6 +127,11 @@ export default {
                   name: '项目类型',
                   component: './building/type/index',
                 },
+                {
+                  path: '/building/type/edi',
+                  name: '',
+                  component: './building/type/edi',
+                },
               ],
             },
             {
@@ -189,14 +194,14 @@ export default {
               component: '../layouts/BlankLayout',
               routes: [
                 {
-                  path: '/news/NewTypeList',
-                  name: '资讯列表',
-                  component: './news/NewTypeList',
+                  path: '/news/NewsType',
+                  name: '资讯类型',
+                  component: './news/type/NewsType',
                 },
                 {
-                  path: '/activity/editActivity',
-                  name: '',
-                  component: './activity/editActivity',
+                  path: '/news/NewsList',
+                  name: '咨询列表',
+                  component: './news/list/NewsList',
                 },
               ],
             },
@@ -215,6 +220,11 @@ export default {
                   name: '',
                   component: './activity/editActivity',
                 },
+                {
+                  path: '/activity/SignList',
+                  name: '报名列表',
+                  component: './activity/SignList',
+                },
               ],
             },
             {
@@ -276,7 +286,7 @@ export default {
   
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.84:8080/',
+      target: 'http://localhost:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/SelectButton/CitySelect.jsx

@@ -0,0 +1,40 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const CitySelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/buildinglist/select',
+        method: 'GET',
+        params: {pageNum: 1,pageSize: 999},
+    }).then((data) => {
+        setData(data.records)
+    })
+  }
+
+  return (
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择城市" onChange={props.onChange}>
+          {data.map(city => (
+            <Option key={city.buildingId}>{city.buildingName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default CitySelect
+

src/pages/activity/ActivityList.jsx

@@ -3,6 +3,8 @@ import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagina
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../components/SelectButton/CitySelect'
 
 import request from '../../utils/request'
 
@@ -52,84 +54,155 @@ const columns = [
   },
   {
     title: '活动时间',
-    dataIndex: 'name',
-    key: 'name',
+    dataIndex: 'startDate',
+    key: 'startDate',
     align: 'center',
+    render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
   },
   {
     title: '已参加人数',
-    dataIndex: 'integral',
-    key: 'integral',
+    dataIndex: 'count',
+    key: 'count',
     align: 'center',
   },
   {
     title: '阅读量',
-    dataIndex: 'total',
-    key: 'total',
+    dataIndex: 'pvNum',
+    key: 'pvNum',
     align: 'center',
   },
   {
     title: '转发量',
-    dataIndex: 'exchanged',
-    key: 'exchanged',
+    dataIndex: 'shareNum',
+    key: 'shareNum',
     align: 'center',
   },
   {
     title: '收藏数',
-    dataIndex: 'rest',
-    key: 'rest',
+    dataIndex: 'saveNum',
+    key: 'saveNum',
     align: 'center',
   },
   {
     title: '状态',
-    dataIndex: 'state',
-    key: 'state',
+    dataIndex: 'isEnlist',
+    key: 'isEnlist',
     align: 'center',
+    render: (isEnlist)=> <><span>{isEnlist == 0 ?"未开始" : isEnlist==1 ? "进行中" : "已结束"}</span></>
   },
   {
     title: '操作',
     dataIndex: 'handle',
     key: 'handle',
     align: 'center',
-    render: () => <><span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>下架<Icon type="shopping-cart" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }}>编辑<Icon type="form" className={styles.edit} /></span></>,
+    render: (x,row) => <><span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
+                         <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
+                         <span style={{ color: '#1990FF' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+                         <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topDynamic.bind(this,row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                         <span style={{ color: '#FF925C' }}>编辑<Icon type="form" className={styles.edit} /></span>
+                       </>
   },
 ];
-const confirm = () => {
-  Modal.confirm({
-    title: '确认下架该商品？',
-    okText: '确认',
-    cancelText: '取消',
-    onOk() {
-      console.log('OK');
-    },
-    onCancel() {
-      console.log('Cancel');
-    },
-  });
 
+const getSignList = (dynamicId) => {
+    router.push({
+        pathname: '/activity/SignList',
+        query: {
+            dynamicId
+        },
+      });
 }
 
-const header = (props) => {
-  const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+const finishDynamic = (row) => {
+    Modal.confirm({
+        title: '结束以后将无法编辑, 是否继续?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+            request({
+                url: '/api/admin/buildingDynamic/finish',
+                method: 'PUT',
+                data: {dynamicId: row.dynamicId, top: ""},
+            }).then((data) => {
+                console.log(data)
+                message.info('操作成功！')
+                // getList()
+            }).catch((err) => {
+                console.log(err)
+                message.info(err.msg || err.message)
+            })
+        },
+      });
+}
 
-  useEffect(() => {
+const topDynamic = (row) => {
+    const weight = Math.abs(row.weight - 1)
     request({
-        url: '/api/admin/iBuildingDynamicList',
-        method: 'GET',
-        params: {pageNum: 1,pageSize: 10},
+        url: '/api/admin/buildingDynamic/weight',
+        method: 'PUT',
+        params: {dynamicId: row.dynamicId, weight},
     }).then((data) => {
         console.log(data)
-        setData(data)
+        message.info('操作成功！')
+        // getList()
+    }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+    })
+}
+
+const sendOrPublicDynamic = (row) => {
+    if (row.status === 1) {
+        cancelDynamic(row)
+    } else {
+        sendDynamic(row)
+    }
+}
+
+// 取消活动
+const cancelDynamic = (row) => {
+    request({
+        url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
+        method: 'PUT',
+    }).then((data) => {
+        message.info('操作成功！')
+        // getList()
+    }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+    })
+}
+
+//发布活动
+const sendDynamic = (row) => {
+    request({
+        url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
+        method: 'PUT',
+    }).then((data) => {
+        message.info('操作成功！')
+        // getList()
+    }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
     })
+}
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList();
   },[])
 
+  // 查询列表
   const getList = (e) => {
     request({
-        url: '/api/xxx',
+        url: '/api/admin/iBuildingDynamicList',
         method: 'GET',
-        params: {},
+        params: {pageNum: 1,pageSize: 10},
     }).then((data) => {
+        console.log(data)
         setData(data)
     })
   }
@@ -141,10 +214,7 @@ const header = (props) => {
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="请选择城市" onChange={handleSelectChange}>
-              <Option value="1">上架</Option>
-              <Option value="0">下架</Option>
-            </Select>,
+            <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
@@ -164,16 +234,16 @@ const header = (props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="是否报名" onChange={handleSelectChange}>
-              <Option value="1">上架</Option>
-              <Option value="0">下架</Option>
-            </Select>,
+          {getFieldDecorator('min')(
+            <DatePicker />
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('min')(
-            <DatePicker />
+          {getFieldDecorator('goodState')(
+            <Select style={{ width: '180px' }} placeholder="是否报名" onChange={handleSelectChange}>
+              <Option value="1">已报名</Option>
+              <Option value="0">未报名</Option>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
@@ -184,10 +254,6 @@ const header = (props) => {
       </Form>
       <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
       <Table dataSource={data.list} columns={columns} />
-      {/* 分页 */
-      /* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />
-      </div> */}
     </>
   )
 }

src/pages/activity/SignList.jsx

@@ -0,0 +1,80 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+
+// 分页
+function onChange(pageNumber) {
+  console.log('Page: ', pageNumber);
+}
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+const columns = [
+  {
+    title: '活动标题',
+    dataIndex: 'title',
+    key: 'title',
+    align: 'center',
+  },
+  {
+    title: '活动时间',
+    dataIndex: 'startDate',
+    key: 'startDate',
+    align: 'center',
+    render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
+  },
+  {
+    title: '已参加人数',
+    dataIndex: 'count',
+    key: 'count',
+    align: 'center',
+  }
+];
+
+
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+  useEffect(() => {
+    getSignList();
+  },[])
+
+  // 查询列表
+  const getSignList = (e) => {
+    request({
+        url: '/api/admin/SignList',
+        method: 'GET',
+        params: {pageNum: 1,pageSize: 10, dynamicId: props.location.query.dynamicId },
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  return (
+    <>
+      <Button type="primary" className={styles.addBtn}>返回</Button>
+      <Table dataSource={data} columns={columns} />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/building/list/index.jsx

@@ -1,6 +1,8 @@
-import React from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination } from 'antd';
-import { connect } from 'dva';
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
 import Styles from './style.less';
 
 
@@ -8,71 +10,7 @@ const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const { Meta } = Card;
 
-// 假数据
-const tempData = [
-  {
-    code: 'S101',
-    name: '城开花园',
-    price: '111',
-    address: '顾戴路1801弄',
-    status: '1', // 已发布
-    createDate: '2019-08-28 17',
-  },
-  {
-    code: 'S102',
-    name: '星河天街',
-    price: '111',
-    address: '长征路1801弄',
-    status: '1', // 已发布
-    createDate: '2019-08-29 17',
-  },
-  {
-    code: 'S103',
-    name: '喜洋洋别墅',
-    price: '111',
-    address: '阳杨路1801弄',
-    status: '1', // 已发布
-    createDate: '2019-08-29 17',
-  },
-  {
-    code: 'S104',
-    name: '武大郎洋房',
-    price: '111',
-    address: '太郎路1801弄',
-    status: '1', // 已发布
-    createDate: '2019-08-29 17',
-  },
-]
-
-
-// 网路数据请求
-connect(({ getList, loading }) => ({
-  getList,
-  submitting: loading.effects['building/getList'],
-}))
-
-// 提交事件
-function handleSubmit(e, props) {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      // eslint-disable-next-line no-console
-      console.log('提交数据: ', values)
-    }
-  });
-}
-
-// Change 事件
-function handleSelectChange(props) {
-  // eslint-disable-next-line no-console
-  console.log(props)
-}
-
-// 分页
-function onChange(pageNumber) {
-  // eslint-disable-next-line no-console
-  console.log('Page: ', pageNumber);
-}
+const tempDate = [{ code: 's101' }]
 
 /**
  *卡片
@@ -86,7 +24,7 @@ function CartBody(props) {
           <Card
             hoverable
             style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-            cover={<img alt="example" src="https://os.alipayobjects.com/rmsportal/QBnOOoLaAfKPirc.png" style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
+            cover={<img alt="example" src={ data.poster } style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
             bodyStyle={{ padding: '10px 20px' }}
           >
             <p className={Styles.cardText}>
@@ -109,7 +47,7 @@ function CartBody(props) {
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>项目地址</span>
-              <span >：{ data.address }</span>
+              <span className={ Styles.address }>：{ data.address }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>发布状态</span>
@@ -117,7 +55,7 @@ function CartBody(props) {
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>录入时间</span>
-              <span >：2019-08-28 17</span>
+              <span >：{ data.createDate }</span>
             </p>
             <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
               <span style={{ color: '#1990FF' }}>
@@ -143,7 +81,62 @@ function CartBody(props) {
  */
 function body(props) {
   const { getFieldDecorator } = props.form
-  connect()
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 9 })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.building.getList, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // eslint-disable-next-line no-console
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        getList({ pageNum: 1, pageSize: 9, ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+      getList({ pageNum: pageNumber, pageSize: 9 })
+  }
+
+  function getDate(value, dateString) {
+    // moment(value).format('YYYY-MM-DD HH:mm:ss')
+    console.log(value, dateString)
+  }
+
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
@@ -166,7 +159,7 @@ function body(props) {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('startDate')(
-            <DatePicker placeholder="开盘时间" />,
+            <DatePicker placeholder="开盘时间" format="YYYY-MM-DD" onChange={getDate} />,
           )}
         </Form.Item>
         <Form.Item>
@@ -214,16 +207,16 @@ function body(props) {
       {/* 卡片内容，显示楼盘项目  */}
       <Row style={{ padding: ' 0 10px' }}>
         {
-          tempData.map((item, index) => (
+          dataSource.records.map((item, index) => (
               <Col span={8}>
-                <CartBody data={item} />
+                <CartBody data={item} key={item.buildingId}/>
               </Col>
             ))
         }
       </Row>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} />
       </div>
     </>
   );

src/pages/building/list/style.css

@@ -0,0 +1,54 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size: 18px;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+  font-size: 18px;
+  font-weight: 400;
+  color: #666;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+}
+.ediText {
+  font-size: 18px;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width: 84px;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}
+.address {
+  width: 400px;
+  height: 24px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}

src/pages/building/list/style.less

@@ -45,4 +45,13 @@
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify
-}
+}
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+

src/pages/building/list/style.wxss

@@ -0,0 +1,54 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  font-size: 18px;
+  color: #333;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.cardItem {
+  font-size: 18px;
+  font-weight: 400;
+  color: #666;
+  line-height: 24px;
+  display: flex;
+  align-items: center;
+}
+.ediText {
+  font-size: 18px;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title {
+  display: inline-block;
+  width: 84px;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}
+.address {
+  width: 400px;
+  height: 24px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}

src/pages/building/type/edi.jsx

@@ -0,0 +1,78 @@
+import React from 'react';
+import { Input, Button, Row, Col, Form, Alert } from 'antd';
+import router from 'umi/router';
+import Styles from './style.less';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+
+function body(props) {
+  const { getFieldDecorator } = props.form;
+
+  console.log('id: ', props.location.query.id)
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // 提交数据
+        values.status = 1
+        values.createDate = new Date()
+        submitData(values)
+      }
+    });
+  }
+
+  function submitData(data) {
+    request({ ...apis.buildingType.add, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message="操作成功"
+        type="success"
+        showIcon
+      />
+      router.go(-1)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={ err }
+        type="err"
+        showIcon
+      />
+    })
+  }
+
+  return (
+    <>
+        <Form onSubmit={handleSubmit} style={{ width: '500px', margin: 'auto' }}>
+          <Form.Item>
+            {getFieldDecorator('buildingTypeName', {
+              rules: [{ required: true, message: '请输入名称' }],
+            })(
+              <Input
+                placeholder="名称"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item style={{ display: 'flex', justifyContent: 'space-between' }}>
+            <Button type="primary" htmlType="submit" className={ Styles.addButton } style={{ margin: '0' }}>
+              确定
+            </Button>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <Button onClick={() => router.go(-1)}>
+              取消
+            </Button>
+          </Form.Item>
+        </Form>
+    </>
+  )
+}
+
+const WrappedBuidingTypeForm = Form.create({ name: 'body' })(body);
+
+export default WrappedBuidingTypeForm

src/pages/building/type/index.jsx

@@ -1,73 +1,106 @@
-import React, { useState } from 'react';
-import { Button, Table, Pagination } from 'antd'
+import React, { useState, useEffect } from 'react';
+import { Button, Table, Pagination, Alert, Icon, Tag } from 'antd'
+import router from 'umi/router';
+import moment from 'moment';
 import Styles from './style.less'
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
 
-const dataSource = [
-  {
-    key: '1',
-    name: '胡彦斌',
-    age: 32,
-    address: '西湖区湖底公园1号',
-  },
-  {
-    key: '2',
-    name: '胡彦祖',
-    age: 42,
-    address: '西湖区湖底公园1号',
-  },
-];
-
-const columns = [
-  {
-    title: '姓名',
-    dataIndex: 'name',
-    key: 'name',
-  },
-  {
-    title: '年龄',
-    dataIndex: 'age',
-    key: 'age',
-  },
-  {
-    title: '住址',
-    dataIndex: 'address',
-    key: 'address',
-  },
-];
+function body() {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([{ records: [] }])
 
-// 分页
-function onChange(pageNumber, set) {
-  // eslint-disable-next-line no-console
-  console.log('Page: ', pageNumber);
-  const data = [
+  const columns = [
+    {
+      title: '编号',
+      dataIndex: 'buildingTypeId',
+      key: 'buildingTypeId',
+    },
+    {
+      title: '类型名称',
+      dataIndex: 'buildingTypeName',
+      key: 'buildingTypeName',
+      render: (_, record) => <Tag color="blue" onClick={() => toEdi(record.buildingTypeId)}>{ record.buildingTypeName }</Tag>,
+    },
     {
-      key: '1',
-      name: '一号',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => <sapn>{moment(record.createDate).format('YYYY-MM-DD')}</sapn>,
     },
     {
-      key: '2',
-      name: '二号',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      title: '操作',
+      dataIndex: 'row',
+      key: 'row',
+      render: (_, record) => (
+        <span onClick={() => deleteType(record)}>
+          <span style={{
+              color: '#FF4A4A', right: '0',
+          }} >
+              删除
+          <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+          </span>
+        </span>
+      ),
     },
   ];
 
-  set(data)
-}
-
-function body() {
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState(dataSource || [])
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [])
+
+  function getList(params) {
+    request({ ...apis.buildingType.getList, params: { ...params } }).then(res => {
+      setData(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line no-console
+    console.log('Page: ', pageNumber);
+    getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+
+  // 删除
+  function deleteType(row) {
+    const { url, method } = apis.buildingType.update
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
+
+    row.status = -1
+    request({ url: tempUrl, method, data: { ...row } }).then(() => {
+      getList({ pageNum: data.current, pageSize: 10 })
+    })
+  }
+
+  // 跳转修改页
+  function toEdi(id) {
+    router.push({
+      pathname: '/building/type/edi',
+      query: {
+        id,
+      },
+    });
+  }
 
   return (
     <>
-      <Button type="primary" className={Styles.addButton}>新增类型</Button>
-      <Table dataSource={data} columns={columns} pagination={false}/>
+      <Button type="primary" className={Styles.addButton} onClick={toEdi}>新增类型</Button>
+      <Table dataSource={data.records} columns={columns} pagination={false}/>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={e => onChange(e, setData)} />
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />
       </div>
     </>
   )

src/pages/news/NewTypeList.jsx → src/pages/news/type/NewsType.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
+import styles from './style.less';
 import router from 'umi/router';
 
 const { Option } = Select;
@@ -23,10 +23,11 @@ function handleSelectChange(props) {
 function onChange(pageNumber) {
   console.log('Page: ', pageNumber);
 }
+
 // 跳转到编辑商品
 function toEditGoods() {
   router.push({
-    pathname: '/activity/editActivity',
+    pathname: '/integralMall/editGoods',
     query: {
       a: 'b',
     },
@@ -55,7 +56,7 @@ const dataSource = [
 
 const columns = [
   {
-    title: '类型图',
+    title: '类型图片',
     dataIndex: 'img',
     key: 'img',
     align: 'center',
@@ -68,7 +69,6 @@ const columns = [
     align: 'center',
 
   },
-
   {
     title: '操作',
     dataIndex: 'handle',
@@ -76,12 +76,12 @@ const columns = [
     align: 'center',
     render: () => <>
     <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>删除<Icon type="shopping-cart" className={styles.shoppingCart} /></span>
-    <span style={{ color: '#FF925C' }}>编辑<Icon type="form" className={styles.edit} /></span></>,
+    <span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
   },
 ];
-const confirm = () => {
+function confirm() {
   Modal.confirm({
-    title: '确认删除该商品？',
+    title: '确认删除该类型？',
     okText: '确认',
     cancelText: '取消',
     onOk() {
@@ -93,8 +93,7 @@ const confirm = () => {
   });
 
 }
-
-const header = (props) => {
+function header(props) {
   const { getFieldDecorator } = props.form
   return (
 

src/services/apis.js

@@ -10,5 +10,29 @@ export default {
       method: 'POST',
       url: `${prefix}/taUser/signin`,
     },
-  }
-}
+  },
+  building: {
+    getList: {
+      method: 'GET',
+      url: `${prefix}/buildinglist`,
+    },
+  },
+  buildingType: {
+    getList: {
+      method: 'GET',
+      url: `${prefix}/tdBuildingType`,
+    },
+    delete: {
+      method: 'DELETE',
+      url: `${prefix}/tdBuildingType/id`,
+    },
+    update: {
+      method: 'PUT',
+      url: `${prefix}/tdBuildingType/id`,
+    },
+    add: {
+      method: 'POST',
+      url: `${prefix}/tdBuildingType`,
+    },
+  },
+}

src/utils/request.js

@@ -78,7 +78,7 @@ request.interceptors.response.use(async (response, options) => {
         throw new Error(message);
       }
 
-      if (data.token) {
+      if (data && data.token) {
         window.localStorage.setItem('x-token', data.token)
       }