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

config/config.js

@@ -189,14 +189,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',
                 },
               ],
             },

src/pages/building/list/index.jsx

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination } from 'antd';
-import { connect } from 'dva';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
 import Styles from './style.less';
 
 
@@ -8,71 +9,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' }]
 
 /**
  *卡片
@@ -143,7 +80,43 @@ function CartBody(props) {
  */
 function body(props) {
   const { getFieldDecorator } = props.form
-  connect()
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const { dataSource, setDataSource } = useState(tempDate || [])
+  console.log(dataSource)
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    // 网路请求
+    request({ ...apis.building }).then(res => {
+      setDataSource(res)
+    })
+  })
+
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // eslint-disable-next-line no-console
+        console.log('提交数据: ', values)
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line no-console
+    console.log('Page: ', pageNumber);
+  }
+
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
@@ -214,9 +187,9 @@ function body(props) {
       {/* 卡片内容，显示楼盘项目  */}
       <Row style={{ padding: ' 0 10px' }}>
         {
-          tempData.map((item, index) => (
+          dataSource.map((item, index) => (
               <Col span={8}>
-                <CartBody data={item} />
+                <CartBody data={item} key={item.code}/>
               </Col>
             ))
         }

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,11 @@ export default {
       method: 'POST',
       url: `${prefix}/taUser/signin`,
     },
-  }
-}
+  },
+  building: {
+    getList: {
+      methods: 'GET',
+      url: `${prefix}/buildinglist`,
+    },
+  },
+}