Merge branch 'v3-5-30' of http://git.ycjcjy.com/estateagents/pc-channel into v3-5-30

config/routes.js

@@ -210,16 +210,49 @@ export default [
               },
             ],
           },
-
           {
             path: '/officenews',
             name: '资讯管理',
             component: '../layouts/BlankLayout',
             routes: [
               {
-                path: '/officenews',
+                path: '/officenews/index',
                 name: '资讯管理',
-                component: './resource/openScreen',
+                component: './officenews/index',
+              },
+              {
+                path: '/officenews/edit',
+                name: '资讯编辑',
+                hideInMenu: true,
+                component: './officenews/edit',
+              },
+              {
+                path: '/officenews/detail',
+                name: '资讯查看',
+                hideInMenu: true,
+                component: './officenews/detail',
+              },
+            ],
+          },
+          {
+            path: '/promote',
+            name: '推广表单',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/promote/index',
+                name: '推广表单',
+                component: './promote/index',
+              },
+              {
+                path: '/promote/contact',
+                name: '联系人列表',
+                component: './promote/contact',
+              },
+              {
+                path: '/promote/detail',
+                name: '查看详情',
+                component: './promote/detail',
               },
             ],
           },

src/components/Navigate/index.jsx

@@ -0,0 +1,34 @@
+import React from 'react';
+import Link from 'umi/link';
+
+import styles from './style.less';
+
+const Navigate = ({ children, to, onClick }) => {
+    // to 包含协议 用 a
+    const useA = (to || '').indexOf('://') > -1 ? 'a' : '';
+    // 否则用 Link
+    const useLink = to && to.indexOf('://') === -1 ? Link : '';
+    // 没有 to 则使用 span
+    const element = useA || useLink || 'span';
+
+    const events = onClick ? { onClick } : {};
+    const style = { color: '#1D74D9', cursor: 'pointer' };
+
+    let redirect = {};
+    if (useA) {
+        redirect = { href: to }
+    } else if (useLink) {
+        redirect = { to }
+    }
+
+    const props = {
+        className: 'cust-navi',
+        style,
+        ...redirect,
+        ...events,
+    }
+
+    return React.createElement(element, props, children);
+};
+
+export default Navigate;

src/components/Navigate/style.less

@@ -0,0 +1,11 @@
+
+:global {
+  .cust-navi {
+    color: #1D74D9;
+    cursor: pointer;
+  
+    * {
+      color: #1D74D9 !important;
+    }
+  }
+}

src/pages/officenews/detail.jsx

@@ -0,0 +1,97 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../components/XForm';
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import moment from 'moment';
+
+
+const header = props => {
+    const newsId = props.location.query.id
+  
+    const [ data, setData ] = useState({})
+    if(newsId){
+      useEffect(() => {
+        getNewData(newsId);
+      },[])
+  
+    // 查询列表
+    const getNewData = (newsId) => {
+      request({
+          ...apis.officenews.get,
+          urlData: { id: newsId }
+      }).then((data) => {
+        setData(data)
+      }).catch((err) => {
+        message.error(err.msg || err.message)
+      })
+    }
+    }
+  
+    const fields = [
+      {
+        label: '资讯封面',
+        name: 'thumb',
+        type: FieldTypes.ImageUploader,
+        value: data.thumb,
+        rules: [
+            { required: true, message: '请选择资讯封面' },
+        ],
+        help: '建议尺寸：500px*400px，比例5:4，格式：jpg，用于：橙蕉官网新闻资讯列表',
+      },    
+      {
+        label: '资讯标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title
+      },
+      {
+        label: '资讯详情',
+        name: 'content',
+        value: data.content,
+        render: <Wangedit />
+      },
+      {
+        label: '状态',
+        name: 'status',
+        value: data.status,
+        render: <Select style={{ width: '180px' }} placeholder="发布状态">
+                    <Option value={0}>已发布</Option>
+                    <Option value={1}>未发布</Option>
+                </Select>,
+      },
+    ]
+  
+     
+    const handleSubmit = (values) => {
+      if(newsId){
+          request({ ...apis.officenews.update, urlData: { id: newsId }, data: { ...values }}).then((data) => {
+            cancelPage();
+          }).catch((err) => {
+            message.error(err.msg || err.message)
+          })
+        }else{
+          request({ ...apis.officenews.save, data: { ...values }}).then((data) => {
+            cancelPage();
+          }).catch((err) => {
+            message.error(err.msg || err.message)
+          })
+        }
+    }
+  
+    const cancelPage = () => {
+      router.push({
+        pathname: '/officenews/index',
+      });
+    }
+  
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    )
+  }
+  
+  const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+  export default WrappedNormalLoginForm

src/pages/officenews/edit.jsx

@@ -0,0 +1,97 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../components/XForm';
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import moment from 'moment';
+
+
+const header = props => {
+    const newsId = props.location.query.id
+  
+    const [ data, setData ] = useState({})
+    if(newsId){
+      useEffect(() => {
+        getNewData(newsId);
+      },[])
+  
+    // 查询列表
+    const getNewData = (newsId) => {
+      request({
+          ...apis.officenews.get,
+          urlData: { id: newsId }
+      }).then((data) => {
+        setData(data)
+      }).catch((err) => {
+        message.error(err.msg || err.message)
+      })
+    }
+    }
+  
+    const fields = [
+      {
+        label: '资讯封面',
+        name: 'thumb',
+        type: FieldTypes.ImageUploader,
+        value: data.thumb,
+        rules: [
+            { required: true, message: '请选择资讯封面' },
+        ],
+        help: '建议尺寸：500px*400px，比例5:4，格式：jpg，用于：橙蕉官网新闻资讯列表',
+      },    
+      {
+        label: '资讯标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title
+      },
+      {
+        label: '资讯详情',
+        name: 'content',
+        value: data.content,
+        render: <Wangedit />
+      },
+      {
+        label: '状态',
+        name: 'status',
+        value: data.status,
+        render: <Select style={{ width: '180px' }} placeholder="发布状态">
+                    <Option value={0}>已发布</Option>
+                    <Option value={1}>未发布</Option>
+                </Select>,
+      },
+    ]
+  
+     
+    const handleSubmit = (values) => {
+      if(newsId){
+          request({ ...apis.officenews.update, urlData: { id: newsId }, data: { ...values }}).then((data) => {
+            cancelPage();
+          }).catch((err) => {
+            message.error(err.msg || err.message)
+          })
+        }else{
+          request({ ...apis.officenews.save, data: { ...values }}).then((data) => {
+            cancelPage();
+          }).catch((err) => {
+            message.error(err.msg || err.message)
+          })
+        }
+    }
+  
+    const cancelPage = () => {
+      router.push({
+        pathname: '/officenews/index',
+      });
+    }
+  
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    )
+  }
+  
+  const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+  export default WrappedNormalLoginForm

src/pages/officenews/index.jsx

@@ -0,0 +1,211 @@
+import React, { useState, useEffect } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from './style.less';
+import { fetch, apis } from '../../utils/request';
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Navigate from '@/components/Navigate';
+
+function header(props) {
+    
+    const [taNoticeList, setTaNoticeList] = useState([])
+    const [ data, setData ] = useState({})
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.officenews.list, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+
+    const toEditResource = (id) => () => {
+        router.push({
+            pathname: '/officenews/edit',
+              query: {
+                id
+              },
+        });
+    }
+
+    const publishNew = (row) => () => {
+        row.status = row.status === 1 ? 0 : 1
+        editNewsById(row)
+    }
+
+    const topNew = (row) => () => {
+        row.weight = row.weight === 1 ? 0 : 1
+        editNewsById(row)
+    }
+
+    const deleteRow = (row) => () =>{
+        row.status = -1
+        editNewsById(row)
+    }
+
+    //编辑资讯
+    const editNewsById = values => {
+        request({ ...apis.officenews.update, urlData: { id: values.newsId }, data: { ...values }}).then((data) => {
+            getList({ pageNum: 1, pageSize: 10 });
+          }).catch((err) => {
+            message.error(err.msg || err.message)
+          })
+    }
+
+    const handleSubmit = (e, props) => {
+        e.preventDefault();
+        getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+        getList({ pageNum: 1, pageSize: 10 });
+    }
+
+    const toDelBatch = rowData => () => {
+        console.log(taNoticeList, 'taNoticeList')
+        if (taNoticeList.length < 1) {
+            message.error('请至少选择一条数据')
+            return
+        }
+
+        Modal.confirm({
+            title: '确认将所选数据删除？',
+            okText: '确定',
+            cancelText: '取消',
+            onOk() {
+                request({ ...apis.openScreen.delete, data: taNoticeList, }).then((data) => {
+                  message.info("操作成功")
+                  getList({ pageNum: 1, pageSize: 10 });
+                  setTaNoticeList([])
+                }).catch((err) => {
+                })
+            },
+        });
+    }
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+
+    const columns = [
+        {
+            title: '资讯主图',
+            dataIndex: 'thumb',
+            key: 'thumb',
+            align: 'center',
+            render: (text, record) => <img style={{width:'140px',height:'92px'}} src={record.thumb} className={styles.touxiang} />,
+        },
+        {
+            title: '资讯标题',
+            dataIndex: 'title',
+            key: 'title',
+            align: 'center',
+            render:  (x, row) => <Navigate to={`/officenews/detail?id=${row.newsId}`}>{row.title}</Navigate>,
+        },
+        {
+            title: '发布状态',
+            dataIndex: 'status',
+            key: 'status',
+            align: 'center',
+            render: (x, row) => <><span>{row.status === 1 ? '是' :'否'}</span></>
+        },
+        {
+            title: '创建时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+            render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
+        },
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={publishNew(row)}>
+                        {row.status === 1 ? '取消发布' :'发布'}<Icon type="form" className={styles.edit} />
+                    </span>
+                    <span style={{ color: '#FF925C', cursor: 'pointer', marginLeft: '20px' }} onClick={toEditResource(row.newsId)}>
+                        编辑<Icon type="form" className={styles.edit} />
+                    </span>
+                    <span style={{ color: '#FF925C', cursor: 'pointer', marginLeft: '20px' }} onClick={deleteRow(row)}>
+                        删除<Icon type="form" className={styles.edit} />
+                    </span>
+                    <span style={{ color: '#FF925C', cursor: 'pointer', marginLeft: '20px' }} onClick={topNew(row)}>
+                        {row.weight === 1 ? '取消置顶' :'置顶'}<Icon type="form" className={styles.edit} />
+                    </span>
+                </>
+            ),
+        },
+    ];
+
+    const { getFieldDecorator } = props.form
+
+    const rowSelection = {
+        onChange: (selectedRowKeys, selectedRows) => {
+          console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+          setTaNoticeList(selectedRows)
+        },
+      };
+ 
+    return (
+
+        <>
+            <div>
+                <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                    <Form.Item>
+                        {getFieldDecorator('title')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="标题名称"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('status')(
+
+                            <Select style={{ width: '180px' }} placeholder="发布状态">
+                                 <Option value="">全部</Option>
+                                <Option value="0">已发布</Option>
+                                <Option value="1">未发布</Option>
+
+                            </Select>,
+
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+
+                        <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                            搜索
+              </Button> 
+                        {/*  */}
+                        <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                            重置
+            </Button>
+                    </Form.Item>
+                </Form>
+
+                <Button type="danger" className={styles.addBtn} onClick={toEditResource()}>新增</Button>
+
+                <Table id='noticeTable' rowKey={r => r.newsId} dataSource={data.records} columns={columns} pagination={false} />
+
+                <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                    <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+                </div>
+            </div>
+        </>
+    )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/officenews/style.less

@@ -0,0 +1,48 @@
+.addBtn {
+    padding: 0 40px;
+    height: 36px;
+    margin: 30px 0;
+  }
+  
+  .touxiang {
+    width: 93px;
+    height: 93px;
+  }
+  
+  .imgPerfect {
+    width: 120px;
+    height: 40px;
+  }
+  
+  .imgIndex {
+    width: 150px;
+    height: 92.7px;
+  }
+  
+  .imgSmall {
+    width: 128px;
+    height: 192px;
+  }
+  
+  .propaganda {
+    width: 240px;
+    height: 60px;
+  }
+  
+  .ant-table-column-title {
+    font-weight: 600;
+  }
+  
+  .shoppingCart {
+    // color: #dcdcdc;
+    color: #bebebe;
+    margin-left: 6px;
+    font-size: 16px;
+  }
+  
+  .edit {
+    // color: #dcdcdc;
+    color: #bebebe;
+    margin-left: 6px;
+    font-size: 15px;
+  }

src/pages/promote/contact.jsx

@@ -0,0 +1,218 @@
+import React, { useState, useEffect } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from './style.less';
+import { fetch, apis } from '../../utils/request';
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+function header(props) {
+
+    const [data, setData] = useState([])
+    const [contactList, setContactList] = useState([])
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+    const getList = params => {
+        request({ ...apis.contact.list, params: { ...params } }).then(data => {
+            console.log(data)
+            setData(data)
+        })
+    }
+
+    const toAdd = (id) => () => {
+        router.push({
+            pathname: '/contact/contact/add',
+            //   query: {
+            //     id
+            //   },
+        });
+    }
+
+    const toEdit = (id) => () => {
+        router.push({
+            pathname: '/contact/contact/detail',
+            query: {
+                id
+            },
+        });
+    }
+
+    const handleSubmit = (e, props) => {
+        console.log(e)
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ pageNum: 1, pageSize: 10, ...values })
+            }
+        });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+        getList({ pageNum: 1, pageSize: 10 });
+    }
+
+    const toDel = rowData => () => {
+        if (contactList.length < 1) {
+            message.info('请至少选择一条数据')
+            return
+        }
+
+        Modal.confirm({
+            title: '确定删除联系人信息吗',
+            okText: '确定',
+            cancelText: '取消',
+            onOk() {
+                request({ ...apis.contact.batchDeleteContact, data: contactList, }).then((data) => {
+                    message.info("操作成功")
+                    getList({ pageNum: 1, pageSize: 10 });
+                }).catch((err) => {
+
+                })
+            },
+            onCancel() { },
+        });
+    }
+
+    const rowSelection = {
+        onChange: (selectedRowKeys, selectedRows) => {
+            console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+            setContactList(selectedRows)
+        },
+    };
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'contactName',
+            key: 'contactName',
+            align: 'center',
+
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex',
+            key: 'sex',
+            align: 'center',
+            render: (sex) => <span>{sex != null ? (sex === 1 ? '男' : '女') : ""}</span>,
+        },
+        {
+            title: '头像',
+            dataIndex: 'avatar',
+            key: 'avatar',
+            align: 'center',
+            render: (text, record) => <img src={record.avatar} className={styles.touxiang} />,
+        },
+        {
+            title: '固话',
+            dataIndex: 'telephone',
+            key: 'telephone',
+            align: 'center',
+        },
+        {
+            title: '手机号',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '内部岗位',
+            dataIndex: 'job',
+            key: 'job',
+            align: 'center',
+
+        },
+        {
+            title: '权重',
+            dataIndex: 'orderNo',
+            key: 'orderNo',
+            align: 'center',
+        },
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEdit(row.contactId)}>
+                        删除 
+                    </span>
+                </>
+            ),
+        },
+    ];
+
+    const { getFieldDecorator } = props.form
+    return (
+
+        <>
+            <div>
+                <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                    <Form.Item>
+                        {getFieldDecorator('contactName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="姓名"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('telephone')(
+                            <Input style={{ width: '180px' }} placeholder="固话">
+
+                            </Input>,
+                        )}
+                    </Form.Item>
+
+                    <Form.Item>
+                        {getFieldDecorator('phone')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="手机号"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('job')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="内部岗位"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+
+                        <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                            搜索
+              </Button>
+                        {/*  */}
+                        <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                            重置
+            </Button>
+                    </Form.Item>
+                </Form>
+
+                <Button type="danger" className={styles.addBtn} onClick={toAdd()}>选择联系人</Button>
+
+                <Table rowSelection={rowSelection} rowKey={r => r.contactId} dataSource={data.records} columns={columns} pagination={false} />
+
+                <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                    {<Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />}
+                </div>
+            </div>
+        </>
+    )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/promote/index.jsx

@@ -0,0 +1,236 @@
+import React, { useState, useEffect } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from './style.less';
+import { fetch, apis } from '../../utils/request';
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Navigate from '@/components/Navigate';
+
+function header(props) {
+    
+    const [taNoticeList, setTaNoticeList] = useState([])
+    const [ data, setData ] = useState({})
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.promote.list, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+
+    const toEditResource = (id) => () => {
+        router.push({
+            pathname: '/officenews/edit',
+              query: {
+                id
+              },
+        });
+    }
+
+    const publishNew = (row) => () => {
+        row.status = row.status === 1 ? 0 : 1
+        editNewsById(row)
+    }
+
+    const topNew = (row) => () => {
+        row.weight = row.weight === 1 ? 0 : 1
+        editNewsById(row)
+    }
+
+    const deleteRow = (row) => () =>{
+        row.status = -1
+        editNewsById(row)
+    }
+
+    //编辑资讯
+    const editNewsById = values => {
+        request({ ...apis.officenews.update, urlData: { id: values.newsId }, data: { ...values }}).then((data) => {
+            getList({ pageNum: 1, pageSize: 10 });
+          }).catch((err) => {
+            message.error(err.msg || err.message)
+          })
+    }
+
+    const handleSubmit = (e, props) => {
+        e.preventDefault();
+        getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+        getList({ pageNum: 1, pageSize: 10 });
+    }
+
+    const toDelBatch = rowData => () => {
+        console.log(taNoticeList, 'taNoticeList')
+        if (taNoticeList.length < 1) {
+            message.error('请至少选择一条数据')
+            return
+        }
+
+        Modal.confirm({
+            title: '确认将所选数据删除？',
+            okText: '确定',
+            cancelText: '取消',
+            onOk() {
+                request({ ...apis.openScreen.delete, data: taNoticeList, }).then((data) => {
+                  message.info("操作成功")
+                  getList({ pageNum: 1, pageSize: 10 });
+                  setTaNoticeList([])
+                }).catch((err) => {
+                })
+            },
+        });
+    }
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+
+    const columns = [
+        {
+            title: '表单编号',
+            dataIndex: 'serialNo',
+            key: 'serialNo',
+            align: 'center',
+            render:  (x, row) => <Navigate to={`/promote/detail?id=${row.serialNo}`}>{row.serialNo}</Navigate>,
+        },
+        {
+            title: '公司名称',
+            dataIndex: 'company',
+            key: 'company',
+            align: 'center',
+        },
+        {
+            title: '联系人',
+            dataIndex: 'name',
+            key: 'name',
+            align: 'center',
+        },
+        {
+            title: '手机号',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '邮箱',
+            dataIndex: 'email',
+            key: 'email',
+            align: 'center',
+        },
+        {
+            title: '提交时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+            render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
+        },
+        {
+            title: '状态',
+            dataIndex: 'status',
+            key: 'status',
+            align: 'center',
+            render: (x, row) => <><span>{row.status === 1 ? '有效' : row.status === 2 ? "待跟进" : '无效'}</span></>
+        },
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={publishNew(row)}>
+                        {row.status === 2 ? "立即跟进" : '添加备注'}<Icon type="form" className={styles.edit} />
+                    </span>
+                    <span style={{ color: '#FF925C', cursor: 'pointer', marginLeft: '20px'  }} onClick={publishNew(row)}>
+                        {row.status === 0 ? "删除" : ''}<Icon type="form" className={styles.edit} />
+                    </span>
+                </>
+            ),
+        },
+    ];
+
+    const { getFieldDecorator } = props.form
+
+    const rowSelection = {
+        onChange: (selectedRowKeys, selectedRows) => {
+          console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+          setTaNoticeList(selectedRows)
+        },
+      };
+ 
+    return (
+
+        <>
+            <div>
+                <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                    <Form.Item>
+                        {getFieldDecorator('company')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="公司名称"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('name')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="联系人"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('phone')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="手机号"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('status')(
+
+                            <Select style={{ width: '180px' }} placeholder="表单状态">
+                                <Option value="">全部</Option>
+                                <Option value="2">待跟进</Option>
+                                <Option value="1">有效</Option>
+                                <Option value="0">无效</Option>
+                            </Select>,
+
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+
+                        <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                            搜索
+              </Button> 
+                        {/*  */}
+                        <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                            重置
+            </Button>
+                    </Form.Item>
+                </Form>
+
+                <Table id='noticeTable' rowKey={r => r.newsId} dataSource={data.records} columns={columns} pagination={false} />
+
+                <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                    <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+                </div>
+            </div>
+        </>
+    )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/promote/style.less

@@ -0,0 +1,48 @@
+.addBtn {
+    padding: 0 40px;
+    height: 36px;
+    margin: 30px 0;
+  }
+  
+  .touxiang {
+    width: 93px;
+    height: 93px;
+  }
+  
+  .imgPerfect {
+    width: 120px;
+    height: 40px;
+  }
+  
+  .imgIndex {
+    width: 150px;
+    height: 92.7px;
+  }
+  
+  .imgSmall {
+    width: 128px;
+    height: 192px;
+  }
+  
+  .propaganda {
+    width: 240px;
+    height: 60px;
+  }
+  
+  .ant-table-column-title {
+    font-weight: 600;
+  }
+  
+  .shoppingCart {
+    // color: #dcdcdc;
+    color: #bebebe;
+    margin-left: 6px;
+    font-size: 16px;
+  }
+  
+  .edit {
+    // color: #dcdcdc;
+    color: #bebebe;
+    margin-left: 6px;
+    font-size: 15px;
+  }

src/services/apis.js

@@ -415,7 +415,36 @@ const apis = {
       method: 'POST',
       action: 'channel',
     }
-  }
+  },
+  officenews: {
+    list: {
+      url: `${prefix}/taOfficeNews`,
+      method: 'GET',
+      action: 'channel',
+    },
+    get: {
+      url: `${prefix}/taOfficeNews/:id`,
+      method: 'GET',
+      action: 'channel',
+    },
+    update: {
+      url: `${prefix}/taOfficeNews/:id`,
+      method: 'PUT',
+      action: 'channel',
+    },
+    save: {
+      url: `${prefix}/taOfficeNews`,
+      method: 'POST',
+      action: 'channel',
+    },
+  },
+  promote: {
+    list: {
+      url: `${prefix}/taOfficeContact`,
+      method: 'GET',
+      action: 'channel',
+    },
+  },
 }
 
 export default apis;