form

config/config.js

@@ -13,7 +13,7 @@ export default defineConfig({
   },
   layout: {
     // https://umijs.org/zh-CN/plugins/plugin-layout
-    locale: true,
+    locale: false,
     siderWidth: 208,
     ...defaultSettings,
   },

config/routes.js

@@ -42,6 +42,65 @@ export default [
       },
     ],
   },
+  {
+    path: '/',
+    name: '消息管理',
+    icon: 'crown',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/PlatformMessageManagement/MessageManageList',
+        name: '平台消息管理',
+        icon: 'smile',
+        component: './PlatformMessageManagement/MessageManageList',
+      },
+      {
+        path: '/PlatformMessageManagement/MessageEdit',
+        name: '消息查看',
+        component: './PlatformMessageManagement/MessageEdit',
+        hideInMenu: true
+      },
+
+    ],
+  },
+  {
+    path: '/SystemManagement',
+    name: '系统管理',
+    icon: 'crown',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/SystemManagement/Administrator',
+        name: '管理员',
+        icon: 'smile',
+        component: './SystemManagement/Administrator',
+      },
+      {
+        path: '/SystemManagement/UserRights',
+        name: '角色权限',
+        component: './SystemManagement/UserRights',
+      },
+      {
+        path: '/SystemManagement/BasicParameters',
+        name: '基本参数',
+        component: './SystemManagement/BasicParameters',
+      },
+      {
+        path: '/SystemManagement/MapExtent',
+        name: '区域设置',
+        component: './SystemManagement/MapExtent',
+        // hideInMenu: true
+      },
+      {
+        path: '/SystemManagement/Agreement',
+        name: '协议对接',
+        component: './SystemManagement/Agreement',
+        // hideInMenu: true
+      },
+
+    ],
+  },
+
   {
     name: 'list.table-list',
     icon: 'table',

package.json

@@ -37,11 +37,18 @@
   "lint-staged": {
     "**/*.less": "stylelint --syntax less",
     "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
-    "**/*.{js,jsx,tsx,ts,less,md,json}": ["prettier --write"]
+    "**/*.{js,jsx,tsx,ts,less,md,json}": [
+      "prettier --write"
+    ]
   },
-  "browserslist": ["> 1%", "last 2 versions", "not ie <= 10"],
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ],
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
+    "@ant-design/pro-card": "^1.18.34",
     "@ant-design/pro-descriptions": "^1.10.0",
     "@ant-design/pro-form": "^1.52.0",
     "@ant-design/pro-layout": "^6.32.0",
@@ -97,6 +104,10 @@
     "typescript": "^4.5.0",
     "umi-serve": "^1.9.10"
   },
-  "engines": { "node": ">=10.0.0" },
-  "gitHooks": { "commit-msg": "fabric verify-commit" }
+  "engines": {
+    "node": ">=10.0.0"
+  },
+  "gitHooks": {
+    "commit-msg": "fabric verify-commit"
+  }
 }

src/layouts/BasicLayout.jsx

@@ -0,0 +1 @@
+export default props => props.children

src/pages/PlatformMessageManagement/MessageEdit/index.jsx

@@ -0,0 +1,52 @@
+import { Input, Card, InputNumber, Button, message } from "antd"
+import { useEffect, useState } from 'react'
+import { Form } from "antd";
+import { history } from 'umi';
+import ProCard from '@ant-design/pro-card'
+
+
+const goBack = () => {
+  history.goBack()
+}
+const FormItem = Form.Item
+export default (props) => {
+
+  const [form] = Form.useForm()
+  const [loading, setLoading] = useState(false)
+
+  const formItemLayout = {
+    //布局
+    labelCol: { span: 6 },
+    wrapperCol: { span: 14 },
+  };
+
+  const Submit = values => {
+    console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
+
+  };
+
+  return (
+    <Card >
+      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}
+      >
+        <ProCard.TabPane key={1} tab="基本信息">
+          <Form {...formItemLayout} onFinish={Submit} form={form} >
+            <FormItem label="农机手" name="shopName" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="农户" name="title" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="推送方式" name="phone" >
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label=" " colon={false} >
+              <Button type='default' onClick={() => goBack()} >返回</Button>
+              <Button type='primary' loading={loading} htmlType="Submit" style={{ marginLeft: '4em' }}>保存</Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+      </ProCard>
+    </Card>
+  )
+}

src/pages/PlatformMessageManagement/MessageManageList/index.jsx

@@ -0,0 +1,119 @@
+import { history, Link } from 'umi';
+import { useRef, useState, useEffect } from 'react';
+import { Button, Popconfirm, message, Tooltip } from 'antd';
+import { PlusOutlined, QuestionCircleOutlined, DownOutlined } from '@ant-design/icons';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import ProTable from '@ant-design/pro-table';
+
+
+
+export default (props) => {
+  const dataSource = [
+    {
+      key: '1',
+      name: '胡彦斌',
+      age: 32,
+      address: '西湖区湖底公园1号',
+    },
+    {
+      key: '2',
+      name: '胡彦祖',
+      age: 42,
+      address: '西湖区湖底公园1号',
+    },
+  ];
+
+  const actions = () => [
+    <Button key='add' type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>新增商户</Button>,
+  ]
+  const columns = [
+    {
+      title: '消息ID',
+
+      key: 'id',
+      dataIndex: 'id',
+      search: false,
+
+      render: (t, record) => <Link key={1} to={`./edit?id=${record.shopId}`}>{record.shopName}</Link>,
+
+    },
+
+    {
+      title: '消息标题',
+      dataIndex: 'packageNum',
+      render: (t, record) => <Link key={1} to={`./package?shopId=${record.shopId}`}>{record?.packageNum}</Link>,
+    },
+
+    {
+      title: '推送对象',
+      search: false,
+      dataIndex: 'packageNum',
+      render: (t, record) => record.status === 1 ? '农机手' : '农户',
+
+    },
+
+
+    {
+      title: '推送方式',
+      key: 'status',
+      dataIndex: 'status',
+      // render: (t, record) => record.status === 1 ? '发布' : '未发布',
+      formItemProps: { label: '推送方式' },
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '通知栏推送', },
+        1: { text: 'APP内消息中心推送', },
+        2: { text: '短信推送', },
+      }
+    },
+
+    {
+      title: (
+        <>
+          创建时间
+          <Tooltip placement="top" >
+            <QuestionCircleOutlined style={{ marginLeft: 4 }} />
+          </Tooltip>
+        </>
+      ),
+      width: 140,
+      key: 'since',
+      dataIndex: 'createdAt',
+      valueType: 'date',
+      // render: (t) => formatterTime(t),
+      sorter: (a, b) => a.createdAt - b.createdAt,
+    },
+
+    {
+      title: '操作',
+      valueType: 'option',
+      width: '300px',
+      render: (_, record) => [
+        <Link key={2} to={`./MessageEdit`}>查看</Link>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.noticeId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <a href="#">删除</a>
+        </Popconfirm>,
+      ]
+    },
+  ]
+
+  return (
+    <PageHeaderWrapper>
+      <ProTable
+        dataSource={dataSource}
+        columns={columns}
+        // request={getList}
+        rowKey="shopId"
+        options={false}
+        toolBarRender={actions}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  )
+}

src/pages/SystemManagement/Administrator/index.jsx

@@ -0,0 +1,52 @@
+import { Input, Card, InputNumber, Button, message } from "antd"
+import { useEffect, useState } from 'react'
+import { Form } from "antd";
+import { history } from 'umi';
+import ProCard from '@ant-design/pro-card'
+
+
+const goBack = () => {
+  history.goBack()
+}
+const FormItem = Form.Item
+export default (props) => {
+
+  const [form] = Form.useForm()
+  const [loading, setLoading] = useState(false)
+
+  const formItemLayout = {
+    //布局
+    labelCol: { span: 6 },
+    wrapperCol: { span: 14 },
+  };
+
+  const Submit = values => {
+    console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
+
+  };
+
+  return (
+    <Card >
+      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}
+      >
+        <ProCard.TabPane key={1} tab="基本信息">
+          <Form {...formItemLayout} onFinish={Submit} form={form} >
+            <FormItem label="农机手" name="shopName" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="农户" name="title" rules={[{ required: true, message: '请输入' }]}>
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="推送方式" name="phone" >
+              <Input placeholder="请输入" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label=" " colon={false} >
+              <Button type='default' onClick={() => goBack()} >返回</Button>
+              <Button type='primary' loading={loading} htmlType="Submit" style={{ marginLeft: '4em' }}>保存</Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+      </ProCard>
+    </Card>
+  )
+}

src/pages/SystemManagement/Agreement/index.jsx

@@ -0,0 +1,5 @@
+export default (props) => {
+  return (
+    <div>协议对接</div>
+  )
+}

src/pages/SystemManagement/BasicParameters/index.jsx

@@ -0,0 +1,5 @@
+export default (props) => {
+  return (
+    <div>基本参数</div>
+  )
+}

src/pages/SystemManagement/MapExtent/index.jsx

@@ -0,0 +1,7 @@
+
+
+export default (props) => {
+  return (
+    <div>区域范围</div>
+  )
+}

src/pages/SystemManagement/UserRights/index.jsx

@@ -0,0 +1,7 @@
+
+
+export default (props) => {
+  return (
+    <div>用户权限</div>
+  )
+}