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

config/config.js

               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/news/NewTypeList.jsx → src/pages/news/type/NewsType.jsx

 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;
 function onChange(pageNumber) {
   console.log('Page: ', pageNumber);
 }
+
 // 跳转到编辑商品
 function toEditGoods() {
   router.push({
-    pathname: '/activity/editActivity',
+    pathname: '/integralMall/editGoods',
     query: {
       a: 'b',
     },
 
 const columns = [
   {
-    title: '类型图',
+    title: '类型图片',
     dataIndex: 'img',
     key: 'img',
     align: 'center',
     align: 'center',
 
   },
-
   {
     title: '操作',
     dataIndex: '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></>,
+    <span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
   },
 ];
-const confirm = () => {
+function confirm() {
   Modal.confirm({
-    title: '确认删除该商品？',
+    title: '确认删除该类型？',
     okText: '确认',
     cancelText: '取消',
     onOk() {
   });
 
 }
-
-const header = (props) => {
+function header(props) {
   const { getFieldDecorator } = props.form
   return (