feats

config/routes.js

@@ -214,6 +214,11 @@ export default [
                 component: './property/lifeConsultant/Score',
                 hideInMenu: true,
               },
+              {
+                path: 'message-event',
+                name: '消息推送',
+                component: './property/message/event'
+              },
             ]
           },
           {

src/pages/property/message/event/Editor.jsx

@@ -0,0 +1,101 @@
+import React, { useEffect, useState } from 'react'
+import { Form, Modal, Button, Input, InputNumber, Select, Radio } from 'antd'
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 },
+  },
+}
+
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0,
+    },
+    sm: {
+      span: 16,
+      offset: 6,
+    },
+  },
+}
+
+export default Form.create()(props => {
+  const [evtType, setEvtType] = useState()
+
+  const handleSubmit = e => {
+    e.preventDefault()
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        props.onSubmit({
+          ...(props.dataSource || {}),
+          ...values
+        })
+      }
+    })
+  }
+
+  useEffect(() => {
+    if (props.visible) {
+      const data = props.dataSource || {}
+      props.form.setFieldsValue(data)
+      setEvtType(data.evtType)
+    }
+  }, [props.dataSource, props.visible])
+
+  return (
+    <Modal  footer={null} maskClosable={false} onCancel={props.onCancel} visible={props.visible}>
+      <Form onSubmit={handleSubmit} {...formItemLayout}>
+        <Form.Item label="类型">
+          {
+            props.form.getFieldDecorator('evtType', {
+              rules: [{required: true, message: '请选择类型'}]
+            })(
+              <Select onChange={v => setEvtType(v)}>
+                <Select.Option value="festival">节日</Select.Option>
+                <Select.Option value="birthday">生日</Select.Option>
+              </Select>
+            )
+          }
+        </Form.Item>
+        <Form.Item label="名称">
+          {
+            props.form.getFieldDecorator('name', {
+              rules: [{required: true, message: '请填写名称'}]
+            })(<Input placeholder="请填写名称" />)
+          }
+        </Form.Item>
+        {
+          evtType === 'festival' &&
+          <Form.Item label="发生日" help="mm-dd格式">
+            {
+              props.form.getFieldDecorator('evtDate')(<Input placeholder="mm-dd格式" />)
+            }
+          </Form.Item>
+        }
+        {
+          evtType === 'festival' &&
+          <Form.Item label="是否阳历">
+            {
+              props.form.getFieldDecorator('isSolar')(
+                <Radio.Group>
+                  <Radio value={true}>阳历</Radio>
+                  <Radio value={false}>阴历</Radio>
+                </Radio.Group>
+              )
+            }
+          </Form.Item>
+        }
+        <Form.Item {...tailFormItemLayout}>
+          <Button type="primary" htmlType="submit">确定</Button>
+          <Button onClick={props.onCancel} style={{ marginLeft: '48px' }}>取消</Button>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+})

src/pages/property/message/event/index.jsx

@@ -0,0 +1,175 @@
+import React, { useState, useEffect, useRef } from 'react'
+import { Select, Spin, Table, Button, Form, Input, Divider, Tag, Modal,Popconfirm } from 'antd'
+import NavLink from 'umi/navlink'
+import { fetch, apis, fetchList } from '@/utils/request'
+import Search from '../../components/Search'
+import List from '../../components/List'
+import Editor from './Editor'
+
+const listMessageEvent = fetchList(apis.announcement.messageEvent.list)
+const saveMessageEvent = fetch(apis.announcement.messageEvent.save)
+const updateMessageEvent = fetch(apis.announcement.messageEvent.update)
+const deleteMessageEvent = fetch(apis.announcement.messageEvent.delete)
+
+const StatusDict = {
+  '0': '未发布',
+  '1': '已发布',
+}
+
+const EvtTypeDict = {
+  'birthday': '生日',
+  'festival': '节日',
+}
+
+const Condition = props => {
+  return (
+    <Search
+      onSearch={props.onSearch}
+      onReset={props.onReset}
+      render={form => {
+        const { getFieldDecorator } = form
+        
+        return (
+          <>
+            <Form.Item label="名称">
+            {
+              getFieldDecorator('name')(<Input placeholder="名称" />)
+            }
+            </Form.Item>
+            <Form.Item label="公告类型">
+            {
+              getFieldDecorator('evtType')(
+                <Select style={{minWidth: '120px'}} allowClear>
+                  {
+                    Object.entries(EvtTypeDict).map(pair => {
+                      const [key, val] = pair
+                      return <Select.Option key={key} value={key}>{val}</Select.Option>
+                    })
+                  }
+                </Select>
+              )
+            }
+            </Form.Item>
+          </>
+        )
+      }}
+    />
+  )
+}
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [showEditor, setShowEditor] = useState(false)
+
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
+  }
+
+  const handleSubmit = data => {
+    saveMessageEvent({data}).then(res => {
+      Modal.success({
+        content: '新增内容成功',
+        onOk: () => {
+          // 触发数据刷新
+          setQueryParams({...queryParams})
+          setShowEditor(false)
+        }
+      })
+    })
+  }
+
+  const handleEdit = row => {
+    const status = Math.abs(row.status - 1)
+    const data = {...row, status}
+    updateMessageEvent({data, urlData: {id: row.evtId}}).then(res => {
+      Modal.success({
+        content: '删除内容成功',
+        onOk: () => {
+          // 触发数据刷新
+          setQueryParams({...queryParams})
+        }
+      })
+    })
+  }
+
+  const handleDeleteRow = row => {
+    deleteAnnouncement({urlData: {id: row.evtId}}).then(res => {
+      Modal.success({
+        content: '删除内容成功',
+        onOk: () => {
+          // 触发数据刷新
+          setQueryParams({...queryParams})
+        }
+      })
+    })
+  }
+
+  const handlePageChange = (pageNum, pageSize) => {
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    listMessageEvent({ data: queryParams }).then(res => {
+      const [list, pageInfo] = res || {}
+      setListData(list)
+      setPagination(pageInfo)
+      setLoading(false)
+    }).catch(() => setLoading(false))
+  }, [queryParams])
+
+  return (
+    <div>
+      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <div style={{ margin: '24px 0' }}>
+        <Button type="primary" onClick={() => setShowEditor(true)}>添加</Button>
+      </div>
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="evtId">
+        <Table.Column title="类型" dataIndex="evtType" key="evtType" render={t => EvtTypeDict[t] || ''} />
+        <Table.Column title="名称" dataIndex="name" key="name" />
+        <Table.Column title="发生日" dataIndex="evtDate" key="evtDate" render={(_, row) => {
+          return row.evtDate && (
+            <span>
+              <Tag color={!row.isSolar ? '#87d068' : '#108ee9'}>{!row.isSolar ? '阴历' : '阳历'}</Tag>
+              <span>{row.evtDate}</span>
+            </span>
+          )
+        }} />
+        <Table.Column title="状态" dataIndex="status" key="status" render={t => StatusDict[t] || ''} />
+        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" />
+        <Table.Column
+          title="操作"
+          key="action"
+          render={(_, row) => {
+            return (
+              <>
+                <Popconfirm
+                  title="确认进行作废操作?"
+                  onConfirm={() => handleDeleteRow(row)}
+                  okText="作废"
+                  cancelText="取消"
+                >
+                  <Button type="link">删除</Button>
+                </Popconfirm>
+                <Divider type="vertical" />
+                <Button type="link" onClick={() => handleEdit(row)}>{row.status === 1 ? '取消发布' : '发布'}</Button>
+              </>
+            )
+          }}
+        />
+      </List>
+      <Editor visible={showEditor} onCancel={() => setShowEditor(false)} onSubmit={handleSubmit} />
+    </div>
+  )
+}

src/services/announcement_api.js

@@ -62,5 +62,33 @@ export default prefix => {
       action: 'admin.announcement-tel.delete'
     },
 
+    messageEvent: {
+      list: {
+        url: `${prefix}/tpMessageEvent`,
+        method: 'get',
+        action: 'admin.tpMessageEvent.url'
+      },
+      save: {
+        url: `${prefix}/tpMessageEvent`,
+        method: 'post',
+        action: 'admin.tpMessageEvent.post'
+      },
+      update: {
+        url: `${prefix}/tpMessageEvent/:id`,
+        method: 'put',
+        action: 'admin.tpMessageEvent.put'
+      },
+      delete: {
+        url: `${prefix}/tpMessageEvent/:id`,
+        method: 'delete',
+        action: 'admin.tpMessageEvent.delete'
+      },
+      get: {
+        url: `${prefix}/tpMessageEvent/:id`,
+        method: 'get',
+        action: 'admin.tpMessageEvent.get'
+      },
+    }
+
   }
 }

src/services/prop_news_api.js

@@ -33,7 +33,7 @@ export default prefix => {
 
     // 删除
     deleteNews: {
-      url: `${prefix}/${moduleName}/id`,
+      url: `${prefix}/${moduleName}/:id`,
       method: 'delete',
       action: `admin.${moduleName}.delete`
     },