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

config/config.js

                   name: '项目类型',
                   component: './building/type/index',
                 },
+                {
+                  path: '/building/type/edi',
+                  name: '',
+                  component: './building/type/edi',
+                },
               ],
             },
             {
   
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.84:8080/',
+      target: 'http://localhost:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/pages/building/list/index.jsx

 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination } from 'antd';
+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';
           <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}>
             </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>
             </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' }}>
   const { getFieldDecorator } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const { dataSource, setDataSource } = useState(tempDate || [])
-  console.log(dataSource)
+  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 }).then(res => {
+    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) {
       if (!err) {
         // eslint-disable-next-line no-console
         console.log('提交数据: ', values)
+        const { startDate } = values
+        getList({ pageNum: 1, pageSize: 9, ...values })
       }
     });
   }
 
   // 分页
   function onChange(pageNumber) {
-    // eslint-disable-next-line no-console
-    console.log('Page: ', 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.Item>
         <Form.Item>
           {getFieldDecorator('startDate')(
-            <DatePicker placeholder="开盘时间" />,
+            <DatePicker placeholder="开盘时间" format="YYYY-MM-DD" onChange={getDate} />,
           )}
         </Form.Item>
         <Form.Item>
       {/* 卡片内容，显示楼盘项目  */}
       <Row style={{ padding: ' 0 10px' }}>
         {
-          dataSource.map((item, index) => (
+          dataSource.records.map((item, index) => (
               <Col span={8}>
-                <CartBody data={item} key={item.code}/>
+                <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

+.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

   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

+.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

+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

-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/services/apis.js

   },
   building: {
     getList: {
-      methods: 'GET',
+      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`,
+    },
+  },
 }