feats

config/routes.js

@@ -554,7 +554,27 @@ export default [
               },
             ],
           },
-
+          {
+            path: '/borker',
+            name: '全民经纪人',
+            component: '../layouts/BlankLayout',
+            menuCode: '/borker',
+            routes: [
+              {
+                path: '/borker/announcement',
+                name: '通知公告',
+                component: './borker/announcement/index',
+                menuCode: '/borker/announcement',
+              },
+              {
+                path: '/borker/announcement/edit',
+                name: '通知公告维护',
+                hideInMenu: true,
+                component: './borker/announcement/Edit/index',
+                menuCode: '/borker/announcement/edit',
+              }
+            ],
+          },
           {
             path: '/system',
             name: '系统管理',

src/pages/borker/announcement/Edit/index.jsx

@@ -0,0 +1,106 @@
+import React, { useState } from 'react'
+import { Card, Form, Select, Input, Button } from 'antd'
+import SelectCity from '@/components/SelectButton/CitySelect'
+import ImageUpload from '@/components/XForm/ImageUpload'
+import Wangedit from '@/components/Wangedit/Wangedit';
+
+import { formItemLayout, showTypeList, pages } from '../util'
+
+const FormItem = Form.Item
+const Option = Select.Option
+
+const editorMenus = [
+  'head', // 标题
+  'bold', // 粗体
+  'italic', // 斜体
+  'underline', // 下划线
+  'strikeThrough', // 删除线
+  'indent', // 缩进
+  'lineHeight', // 行高
+  'foreColor', // 文字颜色
+  'list', // 列表
+  'justify', // 对齐方式
+  'quote', // 引用
+  'undo', // 撤销
+];
+const fullWidth = { width: '100%' }
+
+const AnnouncementEdit = React.forwardRef((props) => {
+  const { history, form } = props
+  const { query } = history.location
+  const { id } = query
+  const { getFieldDecorator, getFieldValue, setFieldsValue } = form
+
+  const [loading, setLoading] = useState(false)
+
+  return (
+    <Card>
+      <Form {...formItemLayout}>
+        <FormItem label="公告类型">
+          {
+            getFieldDecorator('showType', {
+              rules: [{ required: true, message: '请填写标题' }],
+            })(
+              <Select style={fullWidth} allowClear>
+                {
+                  showTypeList.map(x => <Option key={x.value} value={x.value}>{x.label}</Option>)
+                }
+              </Select>
+            )
+          }
+        </FormItem>
+        <FormItem label="公告图片" help="建议图片尺寸：640*960px，比例2:3,格式：jpg">
+          {
+            getFieldDecorator('imageUrl', {
+              rules: [{ required: true, message: '公告图片' }],
+            })(<ImageUpload />)
+          }
+        </FormItem>
+        <FormItem label="公告标题">
+          {
+            getFieldDecorator('title', {
+              rules: [{ required: true, message: '请填写标题' }],
+            })(<Input />)
+          }
+        </FormItem>
+        <FormItem label="所属城市">
+          {
+            getFieldDecorator('cityId', {
+              rules: [{ required: true, message: '请选择城市' }],
+            })(
+              <SelectCity style={fullWidth} />,
+            )
+          }
+        </FormItem>
+        <FormItem label="跳转页面">
+          {
+            getFieldDecorator('linkPage')(
+              <Select style={fullWidth} allowClear>
+                {
+                  pages.map(x => <Option key={x.page} value={x.page}>{x.title}</Option>)
+                }
+              </Select>
+            )
+          }
+        </FormItem>
+        <FormItem label="页面参数">
+          {
+            getFieldDecorator('pageParam')(<Input placeholder="key1=value1&key2=value2" />)
+          }
+        </FormItem>
+        <FormItem label="公告详情">
+          { 
+            getFieldDecorator('content')(<Wangedit menus={editorMenus} />)
+          }
+        </FormItem>
+        <FormItem colon={false} label=" ">
+          <Button type="primary" htmlType="submit" loading={loading}>
+            提交
+          </Button>
+        </FormItem>
+      </Form>
+    </Card>
+  )
+})
+
+export default Form.create()(AnnouncementEdit)

src/pages/borker/announcement/index.jsx

@@ -0,0 +1,95 @@
+import React, { useMemo, useRef, useCallback, useState } from 'react'
+import { Button, notification, Spin, Badge } from 'antd'
+import { router } from 'umi'
+import moment from 'moment'
+import QueryTable from '@/components/QueryTable'
+import SelectCity from '@/components/SelectButton/CitySelect'
+import OperButton from '@/components/OperButton'
+import { apis } from '@/utils/request'
+
+import { pages } from './util'
+
+const searchFields = [
+  {
+    name: 'cityId',
+    label: '城市',
+    placeholder: '请选择城市',
+    render: () => <SelectCity style={{width: 160}} />
+  },
+]
+
+const actionRender = () => {
+  const gotoAdd = () => router.push('/borker/announcement/edit')
+  return (
+    <Button type="primary" icon="plus" onClick={gotoAdd}>新增</Button>
+  )
+}
+
+export default (props) => {
+  const ref = useRef()
+  const [loading, setLoading] = useState(false)
+  const [page, setPage] = useState({current: 1, pageSize: 10})
+    
+  const tableColumns = [
+    {
+      title: '图片',
+      dataIndex: 'imageUrl',
+      key: 'imageUrl',
+      align: 'center',
+      render: (t) => {
+        return <img src={t} width={72} height={128} style={{borderRadius: '4px'}} alt="" />
+      }
+    },
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'title',
+    },
+    {
+      title: '跳转页面',
+      dataIndex: 'linkPage',
+      key: 'linkPage',
+      render: t => (pages.filter(x => x.page === t)[0] || {}).title
+    },
+    {
+      title: '时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (t) => moment(t).format('YYYY-MM-DD HH:mm')
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (t) => t === 1 ? <Badge status="success" text="已发布" /> : <Badge status="processing" text="未发布" />
+    },
+    {
+      title: '操作',
+      key: 'options',
+      align: 'center',
+      render: (_, row) => (
+        <>
+          <OperButton>查看详情</OperButton>,
+          <OperButton onClick={() => onPublish(row)}>{row.status === 1 ? '取消发布' : '发布'}</OperButton>
+        </>
+      )
+    },
+  ]
+
+
+  return (
+    <Spin spinning={loading}>
+      <QueryTable
+        ref={ref}
+        rowKey="screenId"
+        api={apis.borker.getFirstScreenList}
+        searchFields={searchFields}
+        columns={tableColumns}
+        actionRender={actionRender}
+        onPageChange={(pg) => setPage(pg)}
+      />
+    </Spin>
+  )
+}

src/pages/borker/announcement/util.js

@@ -0,0 +1,22 @@
+
+export const showTypeList = [
+  { label: '开屏', value: 'first-screen' }
+]
+
+export const pages = [
+  {
+    title: '页面1',
+    page: '/subpackages/pages/borker',
+  }
+]
+
+export const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 19 },
+  },
+}

src/pages/building/Edit/Borker/index.jsx

@@ -9,7 +9,6 @@ const FormItem = Form.Item
 const updateBorker = fetch(apis.borker.updateBuildingBorker)
 const getAgreementList = fetch(apis.borker.getBkAgreementList)
 const saveAgreement = fetch(apis.borker.saveBkAgreement)
-const updateAgreement = fetch(apis.borker.updateBkAgreement)
 
 const editorMenus = [
   'head', // 标题
@@ -59,8 +58,7 @@ const Borker = React.forwardRef((props, ref) => {
       }
 
       setLoading(true)
-      const p = data.ruleId ? updateAgreement({ urlData: { id: data.ruleId }, data }) : saveAgreement({ data })
-      p.then(res => {
+      saveAgreement({ data }).then(res => {
         setLoading(false)
         // setBkAgreement(res)
         form.setFieldsValue(res || {});
@@ -82,6 +80,8 @@ const Borker = React.forwardRef((props, ref) => {
       }).catch(() => {
         setLoading(false)
       })
+
+      setIsBorker(buildingInfo.isBorker ? 'true' : 'false')
     }
   }, [buildingId])
 
@@ -113,7 +113,7 @@ const Borker = React.forwardRef((props, ref) => {
             })(<Wangedit menus={editorMenus} />)}          
           </FormItem>
           <FormItem colon={false} label=" ">
-            <Button type="primary" loading={loading} onClick={handelSubmit}>
+            <Button type="primary" htmlType="submit" loading={loading}>
               提交
             </Button>
           </FormItem>

src/services/apis.js

@@ -2402,6 +2402,7 @@ export default {
   },
 
   // 全民经纪人
+  // 因为懒, 没有写权限相关
   borker: {
     // 开启功能
     updateBuildingBorker: {
@@ -2423,5 +2424,10 @@ export default {
       method: 'PUT',
       url: `${prefix}/bkAgreement/:id`,
     },
+    // 消息通知列表
+    getFirstScreenList: {
+      method: 'GET',
+      url: `${prefix}/bkFirstScreen`,
+    },
   }
 };