Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

config/proxy.js

@@ -11,7 +11,7 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      target: 'https://preview.pro.ant.design',
+      target: 'http://192.168.89.147:7080',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,

config/routes.js

@@ -62,7 +62,48 @@ export default [
       },
     ],
   },
-
+  {
+    path: '/ContentManagementSystem',
+    name: 'CMS管理',
+    icon: 'MediumOutlined',
+    component: '../layouts/BasicLayout',
+    routes: [
+      {
+        path: '/ContentManagementSystem/InformationClassification',
+        name: '资讯分类',
+        component: './ContentManagementSystem/InformationClassification',
+      },
+      {
+        path: '/ContentManagementSystem/InformationClassification/InformationClassificationEdit',
+        name: '资讯分类编辑',
+        component:
+          './ContentManagementSystem/InformationClassification/InformationClassificationEdit',
+        hideInMenu: true,
+      },
+      {
+        path: '/ContentManagementSystem/InformationList',
+        name: '资讯列表',
+        component: './ContentManagementSystem/InformationList',
+      },
+      {
+        path: '/ContentManagementSystem/InformationList/InformationListEdit',
+        name: '资讯列表编辑',
+        component: './ContentManagementSystem/InformationList/InformationListEdit',
+        hideInMenu: true,
+      },
+      {
+        path: '/ContentManagementSystem/BannerClassification',
+        name: 'Banner资讯',
+        component: './ContentManagementSystem/BannerClassification',
+      },
+      {
+        path: '/ContentManagementSystem/BannerClassification/BannerClassificationEdit',
+        name: 'Banner资讯编辑',
+        component: './ContentManagementSystem/BannerClassification/BannerClassificationEdit',
+        hideInMenu: true,
+      },
+    ],
+  },
   {
     path: '/Machinery',
     name: '农机管理',
@@ -78,7 +119,7 @@ export default [
         path: '/Machinery/Cooperative/edit.jsx',
         name: '合作社编辑',
         component: './Machinery/Cooperative/edit.jsx',
-        // hideInMenu: true,
+        hideInMenu: true,
       },
       {
         path: '/Machinery/Employees',
@@ -91,6 +132,22 @@ export default [
         component: './Machinery/Employees/edit.jsx',
         hideInMenu: true,
       },
+      {
+        path: '/Machinery/MachineryType',
+        name: '农机分类列表',
+        component: './Machinery/MachineryType',
+      },
+      {
+        path: '/Machinery/Machinery',
+        name: '农机列表',
+        component: './Machinery/Machinery',
+      },
+      {
+        path: '/Machinery/Machinery/edit.jsx',
+        name: '农机编辑',
+        component: './Machinery/Machinery/edit.jsx',
+        hideInMenu: true,
+      },
     ],
   },
   {
@@ -207,7 +264,7 @@ export default [
         path: '/GPSDevice/GPS/GPSEdit',
         name: '新增设备',
         component: './GPSDevice/GPS/GPSEdit',
-        hideInMenu: true
+        hideInMenu: true,
       },
     ],
   },
@@ -229,7 +286,6 @@ export default [
         icon: 'smile',
         component: './SystemManagement/Administrator/AdminEdit',
         hideInMenu: true,
-
       },
       {
         path: '/SystemManagement/UserRights',
@@ -255,48 +311,7 @@ export default [
       },
     ],
   },
-  {
-    path: '/ContentManagementSystem',
-    name: 'CMS管理',
-    icon: 'MediumOutlined',
-    component: '../layouts/BasicLayout',
-    routes: [
-      {
-        path: '/ContentManagementSystem/InformationClassification',
-        name: '资讯分类',
-        component: './ContentManagementSystem/InformationClassification',
-      },
-      {
-        path: '/ContentManagementSystem/InformationClassification/InformationClassificationEdit',
-        name: '资讯分类编辑',
-        component: './ContentManagementSystem/InformationClassification/InformationClassificationEdit',
-        hideInMenu: true
-      },
-      {
-        path: '/ContentManagementSystem/InformationList',
-        name: '资讯列表',
-        component: './ContentManagementSystem/InformationList',
-      },
-      {
-        path: '/ContentManagementSystem/InformationList/InformationListEdit',
-        name: '资讯列表编辑',
-        component: './ContentManagementSystem/InformationList/InformationListEdit',
-        hideInMenu: true
 
-      },
-      {
-        path: '/ContentManagementSystem/BannerClassification',
-        name: 'Banner资讯',
-        component: './ContentManagementSystem/BannerClassification',
-      }, {
-        path: '/ContentManagementSystem/BannerClassification/BannerClassificationEdit',
-        name: 'Banner资讯编辑',
-        component: './ContentManagementSystem/BannerClassification/BannerClassificationEdit',
-        hideInMenu: true
-
-      },
-    ],
-  },
   {
     path: '/',
     redirect: '/welcome',

package.json

@@ -46,6 +46,7 @@
     "not ie <= 10"
   ],
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-card": "^1.18.34",
     "@ant-design/pro-descriptions": "^1.10.0",
@@ -54,9 +55,11 @@
     "@ant-design/pro-list": "^1.21.32",
     "@ant-design/pro-table": "^2.61.0",
     "@umijs/route-utils": "^2.0.0",
+    "ali-oss": "^6.17.1",
     "antd": "^4.17.0",
     "classnames": "^2.3.0",
     "lodash": "^4.17.0",
+    "md5": "^2.3.0",
     "moment": "^2.29.1",
     "omit.js": "^2.0.2",
     "rc-menu": "^9.1.0",

src/app.jsx

@@ -1,10 +1,9 @@
-import { SettingDrawer } from '@ant-design/pro-layout';
 import { PageLoading } from '@ant-design/pro-layout';
 import { history, Link } from 'umi';
 import RightContent from '@/components/RightContent';
 import Footer from '@/components/Footer';
-import { currentUser as queryCurrentUser } from './services/ant-design-pro/api';
-import defaultSettings from '../config/defaultSettings';
+import { currentUser as queryCurrentUser } from './services/user';
+import { requestConfig } from '@/utils/request';
 const isDev = process.env.NODE_ENV === 'development';
 const loginPath = '/user/login';
 /** 获取用户信息比较慢的时候会展示一个 loading */
@@ -19,8 +18,8 @@ export const initialStateConfig = {
 export async function getInitialState() {
   const fetchUserInfo = async () => {
     try {
-      const msg = await queryCurrentUser();
-      return msg.data;
+      const { user } = await queryCurrentUser();
+      return user;
     } catch (error) {
       history.push(loginPath);
     }
@@ -33,20 +32,21 @@ export async function getInitialState() {
     return {
       fetchUserInfo,
       currentUser,
-      settings: defaultSettings,
+      settings: {},
     };
   }
 
   return {
     fetchUserInfo,
-    settings: defaultSettings,
+    settings: {},
   };
 } // ProLayout 支持的api https://procomponents.ant.design/components/layout
 
-export const layout = ({ initialState, setInitialState }) => {
+export const layout = ({ initialState }) => {
   return {
     rightContentRender: () => <RightContent />,
     disableContentMargin: false,
+
     footerRender: () => <Footer />,
     onPageChange: () => {
       const { location } = history; // 如果没有登录，重定向到 login
@@ -58,24 +58,8 @@ export const layout = ({ initialState, setInitialState }) => {
     menuHeaderRender: undefined,
     // 自定义 403 页面
     // unAccessible: <div>unAccessible</div>,
-    // 增加一个 loading 的状态
-    childrenRender: (children, props) => {
-      // if (initialState?.loading) return <PageLoading />;
-      return (
-        <>
-          {children}
-          {!props.location?.pathname?.includes('/login') && (
-            <SettingDrawer
-              enableDarkTheme
-              settings={initialState?.settings}
-              onSettingChange={(settings) => {
-                setInitialState((preInitialState) => ({ ...preInitialState, settings }));
-              }}
-            />
-          )}
-        </>
-      );
-    },
     ...initialState?.settings,
   };
 };
+
+export const request = requestConfig;

src/components/ExtendContent/List.jsx

@@ -1,64 +1,63 @@
-import { useEffect, useState, forwardRef, useImperativeHandle, useRef } from "react";
+import { useEffect, useState, forwardRef, useImperativeHandle, useRef } from 'react';
 import { Table, Space, Button, Popconfirm } from 'antd';
 import { getList, remove } from '@/services/extendContent';
 
 export default forwardRef((props, ref) => {
   const { targetType, targetId, onEdit } = props;
 
-  const [loading, setLoading] = useState(false)
-  const [list, setList] = useState([])
+  const [loading, setLoading] = useState(false);
+  const [list, setList] = useState([]);
   const refs = useRef();
 
-
   const tableList = () => {
-    setLoading(true)
+    setLoading(true);
     getList({
       pageSize: 9999,
       targetId,
       targetType,
-    }).then((res) => {
-      setList(res.records || [])
-      setLoading(false)
-    }).catch(() => setLoading(false))
-  }
-
-  refs.current = tableList
-
+    })
+      .then((res) => {
+        setList(res.records || []);
+        setLoading(false);
+      })
+      .catch(() => setLoading(false));
+  };
 
+  refs.current = tableList;
 
   // 父组件调用 updateList 来修改 list
   useImperativeHandle(ref, () => ({
     reload: refs.current,
     setLoading,
-  }))
+  }));
 
   const handleEdit = (record) => {
-    onEdit(record)
-
-  }
+    onEdit(record);
+  };
   //删除
   const handleDelete = (record) => {
-    setLoading(true)
-    remove(record.extId).then(() => {
-      setList(list.filter(x => x.extId !== record.extId))
-      setLoading(false)
-      // refs.current.reload();
-
-    }).catch(() => setLoading(false))
-  }
+    setLoading(true);
+    remove(record.extId)
+      .then(() => {
+        setList(list.filter((x) => x.extId !== record.extId));
+        setLoading(false);
+        // refs.current.reload();
+      })
+      .catch(() => setLoading(false));
+  };
 
   const columns = [
     {
       title: '序号',
       key: 'index',
       dataIndex: 'index',
-      render: (t, record, index) => `${index + 1}`
+      render: (t, record, index) => `${index + 1}`,
     },
     {
       title: '权重',
       key: 'sort',
       dataIndex: 'sort',
-      render: (t, record) => `${record.sort}`
+      render: (t, record) => `${record.sort}`,
     },
     {
       title: '内容',
@@ -68,12 +67,9 @@ export default forwardRef((props, ref) => {
       render: (t, record) => {
         if (record.contentType === 'text') return t;
         if (record.contentType === 'image') {
-          return <img style={{ width: '110px' }} src={t} alt="" />
-        }
-        if (record.contentType === 'video') {
-          return <video style={{ width: '110px' }} src={t} />
+          return <img style={{ width: '110px' }} src={t} alt="" />;
         }
-      }
+      },
     },
     {
       title: '操作',
@@ -81,25 +77,31 @@ export default forwardRef((props, ref) => {
       render: (_, record) => {
         return (
           <Space>
-            <Button type="link" onClick={() => handleEdit(record)}>编辑</Button>
+            <Button type="link" onClick={() => handleEdit(record)}>
+              编辑
+            </Button>
             {/* <Button type="link" onClick={() => handleEdit(record)}>插入</Button> */}
             <Popconfirm title="确定进行当前操作 ?" onConfirm={() => handleDelete(record)}>
               <Button type="link">删除</Button>
             </Popconfirm>
           </Space>
-        )
-      }
+        );
+      },
     },
-  ]
-
+  ];
 
   useEffect(() => {
     if (targetType) {
-      refs.current()
+      refs.current();
     }
-  }, [targetType])
+  }, [targetType]);
   return (
-
-    <Table loading={loading} rowKey="extId" columns={columns} dataSource={list} pagination={false} />
-  )
-})
+    <Table
+      loading={loading}
+      rowKey="extId"
+      columns={columns}
+      dataSource={list}
+      pagination={false}
+    />
+  );
+});

src/components/ExtendContent/ModalButton.jsx

@@ -1,53 +1,68 @@
-import { useEffect, useImperativeHandle, useState, forwardRef } from "react"
-import { Button } from 'antd'
-import ModalText from './ModalText'
-import ModalImage from './Modalimage'
-import ModalVideo from './ModalVideo'
-import { parseGeoJson } from "echarts"
+import { useEffect, useImperativeHandle, useState, forwardRef } from 'react';
+import { Button } from 'antd';
+import ModalText from './ModalText';
+import ModalImage from './Modalimage';
 
 export default forwardRef((props, ref) => {
-  const { contentType, record, onChange, onClose, ...btnProps } = props
-
-  const [visible, setVisible] = useState(false)
-  const [content, setContent] = useState()
-  const [sortVale, setSortVale] = useState()
+  const { contentType, record, onChange, onClose, ...btnProps } = props;
 
+  const [visible, setVisible] = useState(false);
+  const [content, setContent] = useState();
+  const [sortVale, setSortVale] = useState();
 
   const handleClose = () => {
-    setContent()
-    setSortVale()
-    setVisible(false)
-    onClose()
-  }
+    setContent();
+    setSortVale();
+    setVisible(false);
+    onClose();
+  };
 
   const handleChange = (val, e) => {
-    onChange({
-      ...record || {},
-      content: val,
-      sort: e - 0,
-      contentType,
-    }, handleClose)
-  }
+    onChange(
+      {
+        ...(record || {}),
+        content: val,
+        sort: e - 0,
+        contentType,
+      },
+      handleClose,
+    );
+  };
 
   useImperativeHandle(ref, () => ({
     toggle: () => {
-      setVisible(!visible)
-    }
-  }))
+      setVisible(!visible);
+    },
+  }));
 
   useEffect(() => {
-    setContent(record?.content)
-    setSortVale(record?.sort)
-  }, [record, visible])
-
-
+    setContent(record?.content);
+    setSortVale(record?.sort);
+  }, [record, visible]);
 
   return (
     <>
-      <Button onClick={() => setVisible(true)} {...btnProps}>{props.children}</Button>
-      {contentType === 'text' && <ModalText sortVale={sortVale} visible={visible} value={content} onChange={handleChange} onCancel={handleClose} />}
-      {contentType === 'image' && <ModalImage sortVale={sortVale} visible={visible} value={content} onChange={handleChange} onCancel={handleClose} />}
-      {contentType === 'video' && <ModalVideo sortVale={sortVale} visible={visible} value={content} onChange={handleChange} onCancel={handleClose} />}
+      <Button onClick={() => setVisible(true)} {...btnProps}>
+        {props.children}
+      </Button>
+      {contentType === 'text' && (
+        <ModalText
+          sortVale={sortVale}
+          visible={visible}
+          value={content}
+          onChange={handleChange}
+          onCancel={handleClose}
+        />
+      )}
+      {contentType === 'image' && (
+        <ModalImage
+          sortVale={sortVale}
+          visible={visible}
+          value={content}
+          onChange={handleChange}
+          onCancel={handleClose}
+        />
+      )}
     </>
-  )
-})
+  );
+});

src/components/ExtendContent/ModalVideo.jsx

@@ -1,43 +0,0 @@
-
-import { useEffect, useState } from 'react'
-import { UploadVideo } from '@/components/Upload'
-import { Input, Modal, Form, Button } from 'antd'
-
-
-const FormItem = Form.Item
-export default (props) => {
-  const { value, visible, onChange, onCancel, sortVale } = props
-
-  const [video, setVideo] = useState()
-  const [sort, setSort] = useState()
-
-  const Submit = (e) => {
-    setSort(e.target.value)
-  }
-  const handleOk = () => {
-    onChange(video, sort)
-  }
-  useEffect(() => {
-    setVideo(value)
-    setSort(sortVale)
-
-  }, [value, visible, sortVale])
-  const setld=()=>{
-
-  }
-  return (
-    <Modal title="请上传视频" visible={visible} onOk={handleOk} onCancel={onCancel} destroyOnClose={true}>
-
-      <Form onFinish={Submit} >
-        <FormItem label="内容" rules={[{ required: true, message: '请输入内容' }]} >
-          <UploadVideo value={video} onChange={setVideo}  poster='' setPoster={setld} setld={setld}/>
-
-        </FormItem>
-        <FormItem label="权重" rules={[{ required: true, message: '请设置权重' }]}>
-          <Input min={0} placeholder="请输入权重" type='number' value={sort} onChange={Submit} style={{ width: '350px' }} />
-        </FormItem>
-      </Form>
-    </Modal>
-
-  )
-}

src/components/ExtendContent/index.jsx

@@ -1,58 +1,51 @@
 import { Button, message, Space } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import { useRef, useState, } from 'react';
+import { useRef, useState } from 'react';
 import ModalButton from './ModalButton';
-import List from './List'
-import { save, update } from '@/services/extendContent'
-
-
+import List from './List';
+import { save, update } from '@/services/extendContent';
 
 export default (props) => {
-  const { onCancel, targetId, targetType } = props
-
-  const [record, setRecord] = useState()
-  const listRef = useRef()
-  const textBtnRef = useRef()
-  const imageBtnRef = useRef()
-  const videoBtnRef = useRef()
-
+  const { onCancel, targetId, targetType } = props;
 
+  const [record, setRecord] = useState();
+  const listRef = useRef();
+  const textBtnRef = useRef();
+  const imageBtnRef = useRef();
+  const videoBtnRef = useRef();
 
   const handleChange = (row, next) => {
     const data = {
       ...(row || {}),
       targetId,
       targetType,
-    }
+    };
 
     if (data.extId) {
       // 编辑提交
 
-      update(data.extId, data,).then(() => {
-        listRef.current.reload()
-        next()
-
-        message.success('更新数据成功')
-
-      })
+      update(data.extId, data).then(() => {
+        listRef.current.reload();
+        next();
 
+        message.success('更新数据成功');
+      });
     } else if (data.content) {
       // 新增提交
-      listRef.current.setLoading(true)
+      listRef.current.setLoading(true);
       save(data).then((res) => {
-        listRef.current.reload()
-        next()
+        listRef.current.reload();
+        next();
 
-        message.success('保存数据成功')
-      })
+        message.success('保存数据成功');
+      });
+    } else {
+      next();
     }
-    else {
-      next()
-    }
-  }
+  };
 
   const handleEdit = (row) => {
-    setRecord(row)
+    setRecord(row);
     switch (row.contentType) {
       case 'text':
         textBtnRef.current.toggle();
@@ -66,22 +59,42 @@ export default (props) => {
       default:
         break;
     }
-  }
-
+  };
 
   const handleClose = () => {
-    setRecord()
-  }
+    setRecord();
+  };
 
   return (
     <div>
       <Space size="large" style={{ marginBottom: '18px' }}>
-        <ModalButton ref={textBtnRef} type="dashed" icon={<PlusOutlined />} record={record} contentType="text" onChange={handleChange} onClose={handleClose}>文字</ModalButton>
-        <ModalButton ref={imageBtnRef} type="dashed" icon={<PlusOutlined />} record={record} contentType="image" onChange={handleChange} onClose={handleClose}>图片</ModalButton>
-        <ModalButton ref={videoBtnRef} type="dashed" icon={<PlusOutlined />} record={record} contentType="video" onChange={handleChange} onClose={handleClose}>视频</ModalButton>
+        <ModalButton
+          ref={textBtnRef}
+          type="dashed"
+          icon={<PlusOutlined />}
+          record={record}
+          contentType="text"
+          onChange={handleChange}
+          onClose={handleClose}
+        >
+          文字
+        </ModalButton>
+        <ModalButton
+          ref={imageBtnRef}
+          type="dashed"
+          icon={<PlusOutlined />}
+          record={record}
+          contentType="image"
+          onChange={handleChange}
+          onClose={handleClose}
+        >
+          图片
+        </ModalButton>
       </Space>
       <List ref={listRef} targetType={targetType} onEdit={handleEdit} targetId={targetId} />
-      <Button onClick={onCancel} style={{ marginTop: '2em', float: 'right' }}>返回</Button>
+      {/* <Button onClick={onCancel} style={{ marginTop: '2em', float: 'right' }}>
+        返回
+      </Button> */}
     </div>
-  )
-}
+  );
+};

src/components/RightContent/AvatarDropdown.jsx

@@ -1,32 +1,34 @@
-import React, { useCallback } from 'react';
-import { LogoutOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons';
-import { Avatar, Menu, Spin } from 'antd';
+import React, { useState, useCallback } from 'react';
+import { LogoutOutlined, KeyOutlined } from '@ant-design/icons';
+import { Avatar, Menu, message, Spin } from 'antd';
 import { history, useModel } from 'umi';
 import { stringify } from 'querystring';
 import HeaderDropdown from '../HeaderDropdown';
+import ChangePassword from './ChangePassword';
 import styles from './index.less';
-import { outLogin } from '@/services/ant-design-pro/api';
 
 /**
  * 退出登录，并且将当前的 url 保存
  */
 const loginOut = async () => {
-  await outLogin();
-  const { query = {}, search, pathname } = history.location;
+  localStorage.removeItem('token');
+  const { query = {}, pathname } = history.location;
   const { redirect } = query; // Note: There may be security issues, please note
 
   if (window.location.pathname !== '/user/login' && !redirect) {
     history.replace({
       pathname: '/user/login',
       search: stringify({
-        redirect: pathname + search,
+        redirect: pathname,
       }),
     });
   }
 };
 
 const AvatarDropdown = ({ menu }) => {
+  const [showPasswordModal, setShowPasswordModal] = useState(false);
   const { initialState, setInitialState } = useModel('@@initialState');
+
   const onMenuClick = useCallback(
     (event) => {
       const { key } = event;
@@ -37,10 +39,22 @@ const AvatarDropdown = ({ menu }) => {
         return;
       }
 
-      history.push(`/account/${key}`);
+      if (key === 'changepassword') {
+        setShowPasswordModal(true);
+        return;
+      }
     },
     [setInitialState],
   );
+
+  const handleChangeSuccessful = () => {
+    message.success('密码修改成功');
+    setShowPasswordModal(false);
+    setInitialState((s) => ({ ...s, currentUser: undefined }));
+    loginOut();
+    return;
+  };
+
   const loading = (
     <span className={`${styles.action} ${styles.account}`}>
       <Spin
@@ -59,39 +73,38 @@ const AvatarDropdown = ({ menu }) => {
 
   const { currentUser } = initialState;
 
-  if (!currentUser || !currentUser.name) {
+  if (!currentUser || !currentUser.userName) {
     return loading;
   }
 
   const menuHeaderDropdown = (
     <Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick}>
-      {menu && (
-        <Menu.Item key="center">
-          <UserOutlined />
-          个人中心
-        </Menu.Item>
-      )}
-      {menu && (
-        <Menu.Item key="settings">
-          <SettingOutlined />
-          个人设置
-        </Menu.Item>
-      )}
-      {menu && <Menu.Divider />}
-
+      <Menu.Item key="changepassword">
+        <KeyOutlined />
+        修改密码
+      </Menu.Item>
+      <Menu.Divider />
       <Menu.Item key="logout">
         <LogoutOutlined />
         退出登录
       </Menu.Item>
     </Menu>
   );
+
   return (
-    <HeaderDropdown overlay={menuHeaderDropdown}>
-      <span className={`${styles.action} ${styles.account}`}>
-        <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" />
-        <span className={`${styles.name} anticon`}>{currentUser.name}</span>
-      </span>
-    </HeaderDropdown>
+    <>
+      <HeaderDropdown overlay={menuHeaderDropdown}>
+        <span className={`${styles.action} ${styles.account}`}>
+          {/* <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" /> */}
+          <span className={`${styles.name} anticon`}>{currentUser.userName}</span>
+        </span>
+      </HeaderDropdown>
+      <ChangePassword
+        visible={showPasswordModal}
+        onCancel={() => setShowPasswordModal(false)}
+        onSuccess={handleChangeSuccessful}
+      />
+    </>
   );
 };
 

src/components/RightContent/ChangePassword.jsx

@@ -0,0 +1,87 @@
+import React, { useState } from 'react';
+import { Form, Input, Button, Modal } from 'antd';
+import md5 from 'md5';
+import { changePassword } from '@/services/user'
+
+const layout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+const tailLayout = {
+  wrapperCol: { offset: 6, span: 14 },
+};
+
+export default (props) => {
+  const { visible, onSuccess, onCancel } = props
+
+  const [loading, setLoading] = useState(false)
+
+  const handleFinish = (values) => {
+    const data = {
+      originPassword: md5(values.originPassword),
+      newPassword: md5(values.newPassword)
+    }
+
+    setLoading(true)
+    changePassword(data).then(() => {
+      setLoading(false)
+      if (onSuccess) {
+        onSuccess()
+      }
+    }).catch((err) => {
+      setLoading(false)
+    })
+  }
+
+  const handleCancel = () => {
+    if (onCancel) {
+      onCancel()
+    }
+  }
+
+  return (
+    <Modal visible={visible} title="修改密码" footer={null} onCancel={handleCancel}>
+      <Form {...layout} onFinish={handleFinish}>
+        <Form.Item
+          name="originPassword"
+          label="原密码"
+          rules={[{ required: true, message: '请填写原密码!' }]}
+        >
+          <Input.Password placeholder="请填写原密码" />
+        </Form.Item>
+        <Form.Item
+          name="newPassword"
+          label="新密码"
+          rules={[{ required: true, message: '请填写新密码!' }]}
+        >
+          <Input.Password placeholder="请填写新密码" />
+        </Form.Item>
+        <Form.Item
+          name="newPassword2"
+          label="确认密码"
+          rules={[
+            { required: true, message: '请填写新密码!' },
+            ({ getFieldValue }) => ({
+              validator(_, value) {
+                if (!value || getFieldValue('newPassword') === value) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(new Error('两次输入密码不一致!'));
+              },
+            })
+          ]}
+        >
+          <Input.Password placeholder="确认密码需要与新密码保持一致" />
+        </Form.Item>
+        <Form.Item {...tailLayout}>
+          <Button loading={loading} type="primary" htmlType="submit">
+            提交
+          </Button>
+          <Button htmlType="button" onClick={handleCancel} style={{ marginLeft: '4em' }}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+}

src/components/RightContent/index.jsx

@@ -1,9 +1,7 @@
 import { Space } from 'antd';
-import { QuestionCircleOutlined } from '@ant-design/icons';
 import React from 'react';
-import { useModel, SelectLang } from 'umi';
+import { useModel } from 'umi';
 import Avatar from './AvatarDropdown';
-import HeaderSearch from '../HeaderSearch';
 import styles from './index.less';
 
 const GlobalHeaderRight = () => {
@@ -22,41 +20,7 @@ const GlobalHeaderRight = () => {
 
   return (
     <Space className={className}>
-      <HeaderSearch
-        className={`${styles.action} ${styles.search}`}
-        placeholder="站内搜索"
-        defaultValue="umi ui"
-        options={[
-          {
-            label: <a href="https://umijs.org/zh/guide/umi-ui.html">umi ui</a>,
-            value: 'umi ui',
-          },
-          {
-            label: <a href="next.ant.design">Ant Design</a>,
-            value: 'Ant Design',
-          },
-          {
-            label: <a href="https://protable.ant.design/">Pro Table</a>,
-            value: 'Pro Table',
-          },
-          {
-            label: <a href="https://prolayout.ant.design/">Pro Layout</a>,
-            value: 'Pro Layout',
-          },
-        ]} // onSearch={value => {
-        //   console.log('input', value);
-        // }}
-      />
-      <span
-        className={styles.action}
-        onClick={() => {
-          window.open('https://pro.ant.design/docs/getting-started');
-        }}
-      >
-        <QuestionCircleOutlined />
-      </span>
       <Avatar />
-      <SelectLang className={styles.action} />
     </Space>
   );
 };

src/components/RightContent/index.less

@@ -1,4 +1,4 @@
-@import (reference) '~antd/es/style/themes/index';
+@import '~antd/es/style/themes/default.less';
 
 @pro-header-hover-bg: rgba(0, 0, 0, 0.025);
 
@@ -18,7 +18,7 @@
   margin-left: auto;
   overflow: hidden;
   .action {
-    display: flex;
+    display: ;
     align-items: center;
     height: 48px;
     padding: 0 12px;

src/components/Upload/UploadVideo.jsx

@@ -1,95 +0,0 @@
-import React, { useState, useRef } from 'react';
-import { Button } from 'antd'
-import Upload from './Upload';
-import { uplodeNoteImage } from '@/services/note'
-import styles from './style.less';
-import { useEffect } from 'react';
-
-function beforeUpload(file) {
-  const isMp4 = file.type === 'video/mp4';
-  if (!isMp4) {
-    message.error('请上传 MP4 视频!');
-  }
-
-  return isMp4;
-}
-
-export default (props) => {
-  //onPoster 改变主图事件   isScreenshot判断父组件是否需要截屏按钮
-  const { value, onChange, onPoster, isScreenshot } = props;
-  const [loading, setLoading] = useState(false);//上传按钮loading框
-  const [capturing, setCapturing] = useState(false);//截屏按钮loading框
-  const [video, setVideo] = useState()//当前上传的视频
-  const [isVideoReady, setIsVideoReady] = useState(false)//判断视频是否加载成功
-  
-  const canvasRef = useRef()
-  const videoRef = useRef()
-
-  useEffect(() => {
-    setVideo(value)//父组件的视频获取成功时改变当前页面的视频
-  }, [value])
-
-  const handleChange = info => {
-    if (info.file.status === 'uploading') {
-      setLoading(true);
-      return;
-    }
-    if (info.file.status === 'error') {
-      setLoading(false);
-      return;
-    }
-    if (info.file.status === 'done') {
-      onChange(info.file.response);
-      setLoading(false);
-    }
-  };
-
-  //开始截图
-  const handelScreenshot = () => {
-    const ctx = canvasRef.current.getContext("2d");  
-    ctx.drawImage(videoRef.current, 0, 0);    
-    const image = canvasRef.current.toDataURL("image/png", 0.9)
-    setCapturing(true)
-    uplodeNoteImage({ base64: image }).then((res) => {
-      onPoster(res)
-      setCapturing(false)
-    })
-  }
-
-  //视频加载成功事件
-  const handleVideoReady = (e) => {
-    setIsVideoReady(true)
-    canvasRef.current.width = e.target.videoWidth;
-    canvasRef.current.height = e.target.videoHeight;
-  }
-
-  return (
-    <div className={styles['video-uploader']}>
-      <Upload
-        className="image-uploader"
-        showUploadList={false}
-        beforeUpload={beforeUpload}
-        onChange={handleChange}
-      >
-        <div style={{ maxWidth: '1px', maxHeight: '1px', overflow: 'hidden' }}>
-          <canvas ref={canvasRef}></canvas>
-        </div>
-        <Button loading={loading}>
-          点击上传视频 (MP4)
-        </Button>
-
-      </Upload>
-      {
-        isScreenshot && (
-          // disabled={!isVideoReady} 当视频准备成功时截屏按钮可以点击  否则不能点击
-          <Button loading={capturing} style={{ marginLeft: '1em' }} onClick={handelScreenshot} disabled={!isVideoReady}>截屏</Button>
-        )
-      }
-      {
-        !!video && (
-          <video ref={videoRef} width="320" height='500' crossOrigin='anonymous' controls src={video} onCanPlay={handleVideoReady}></video>
-        )
-      }
-    </div>
-  );
-}

src/components/Upload/index.jsx

@@ -1,11 +1,5 @@
 import Upload from './Upload';
 import UploadImage from './UploadImage';
 import UploadImageList from './UploadImageList';
-import UploadVideo from './UploadVideo';
 
-export {
-  Upload,
-  UploadImage,
-  UploadImageList,
-  UploadVideo,
-}
+export { Upload, UploadImage, UploadImageList };

src/pages/Machinery/Cooperative/edit.jsx

@@ -2,6 +2,8 @@ import { Form, Input, Card, InputNumber, Select, message, Button } from 'antd';
 import { history } from 'umi';
 import ProCard from '@ant-design/pro-card';
 import { useState, useEffect } from 'react';
+import POI from '@/components/POI/POI';
+
 // import { getTagList } from '@/services/tag';
 // import { addAttaList, gettaTouristForm, EditaddAttaList } from '@/services/AttaList'
 
@@ -20,13 +22,17 @@ export default (props) => {
   const [listForm, setListForm] = useState({});
   const [loading, setLoading] = useState(false);
   const [imageList, setImageList] = useState([]);
-
+  //地址--占位
+  const [newLocName, setLocName] = useState('');
+  const [newAddress, setAddress] = useState('');
   const Submit = (data) => {
     const typeList = (data.typeList || []).map((x) => {
       return { ...x, targetId: id, targetType: 'tourist' };
     });
-    setLoading(true);
-
+    // setLoading(true);
+    console.log(data);
+    console.log(newLocName);
+    console.log(newAddress);
     // if (id) {
     //   EditaddAttaList(id, { ...listForm, ...data, imageList, typeList }).then(() => {
     //     setLoading(false);
@@ -50,10 +56,6 @@ export default (props) => {
     // }
   };
 
-  //地址--占位
-  const [newLocName, setLocName] = useState('');
-  const [newAddress, setAddress] = useState('');
-
   const selectTagList = (params) => {
     // return getTagList({
     // }).then((res) => {
@@ -126,6 +128,18 @@ export default (props) => {
             >
               <Input placeholder="请输入联系方式" rows={4} style={{ width: '350px' }} />
             </FormItem>
+            <FormItem
+              label="定位经纬"
+              name="locaton"
+              rules={[{ required: true, message: '请定位' }]}
+            >
+              <POI
+                placeholder="定位"
+                setLocName={setLocName}
+                setAddress={setAddress}
+                roomBoole={true}
+              />
+            </FormItem>
             <FormItem
               label="地址"
               name="address"

src/pages/Machinery/Cooperative/index.jsx

@@ -13,11 +13,11 @@ const formatterTime = (val) => {
 
 export default (props) => {
   const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
       新增合作社
     </Button>,
   ];
-  const gotoDetail = (id) => {
+  const gotoEdit = (id) => {
     const queryStr = id ? `?id=${id}` : '';
     history.push(`./Cooperative/edit.jsx${queryStr}`);
   };

src/pages/Machinery/Employees/edit.jsx

@@ -118,7 +118,11 @@ export default (props) => {
                 </Option>
               </Select>
             </FormItem>
-            <FormItem label="角色" name="role" rules={[{ required: true, message: '请选择角色' }]}>
+            <FormItem
+              label="身份"
+              name="identity"
+              rules={[{ required: true, message: '请选择身份' }]}
+            >
               <Select style={{ width: '350px' }}>
                 <Option value="6" key="6">
                   农机手

src/pages/Machinery/Employees/index.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { history, Link } from 'umi';
 import { Button, Popconfirm, message, Tooltip } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
 // import { getPersonList, exportPersonList } from '@/services/person';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
@@ -11,6 +12,15 @@ const formatterTime = (val) => {
 };
 
 export default (props) => {
+  const actions = () => [
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
+      新增员工
+    </Button>,
+  ];
+  const gotoEdit = (id) => {
+    const queryStr = id ? `?id=${id}` : '';
+    history.push(`./Employees/edit.jsx${queryStr}`);
+  };
   const columns = [
     {
       title: '姓名',
@@ -28,9 +38,14 @@ export default (props) => {
       key: 'title',
     },
     {
-      title: '角色',
-      dataIndex: 'role',
-      key: 'role',
+      title: '身份',
+      dataIndex: 'identity',
+      key: 'identity',
+    },
+    {
+      title: '工作状态',
+      dataIndex: 'status',
+      key: 'status',
     },
     {
       title: '注册时间',
@@ -62,6 +77,7 @@ export default (props) => {
       <PageTable
         // request={getPersonList}
         // expfunc={exportPersonList}
+        toolBarRender={actions}
         columns={columns}
         rowKey="employeesId"
         options={false}

src/pages/Machinery/Machinery/edit.jsx

@@ -0,0 +1,167 @@
+import { Form, Input, Card, InputNumber, Select, message, Button } from 'antd';
+import { history } from 'umi';
+import ProCard from '@ant-design/pro-card';
+import { useState, useEffect } from 'react';
+// import { getTagList } from '@/services/tag';
+// import { addAttaList, gettaTouristForm, EditaddAttaList } from '@/services/AttaList'
+
+const { TextArea } = Input;
+const { Option } = Select;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+
+const goBack = () => {
+  history.goBack();
+};
+const FormItem = Form.Item;
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [form] = Form.useForm();
+  const [listForm, setListForm] = useState({});
+  const [loading, setLoading] = useState(false);
+  const [imageList, setImageList] = useState([]);
+
+  const Submit = (data) => {
+    const typeList = (data.typeList || []).map((x) => {
+      return { ...x, targetId: id, targetType: 'tourist' };
+    });
+    setLoading(true);
+
+    // if (id) {
+    //   EditaddAttaList(id, { ...listForm, ...data, imageList, typeList }).then(() => {
+    //     setLoading(false);
+    //     message.success('数据更新成功');
+    //     goBack();
+    //   })
+    //     .catch(err => {
+    //       setLoading(false);
+    //       message.error(err.message || err);
+    //     });
+    // } else {
+    //   addAttaList({ ...data, imageList, typeList }).then((res) => {
+    //     setLoading(false);
+    //     message.success('数据保存成功');
+    //     history.replace(`/Attractions/Edit?id=${res.touristId}`)
+    //   })
+    //     .catch(err => {
+    //       setLoading(false);
+    //       message.error(err.message || err);
+    //     });
+    // }
+  };
+
+  //地址--占位
+  const [newLocName, setLocName] = useState('');
+  const [newAddress, setAddress] = useState('');
+
+  const selectTagList = (params) => {
+    // return getTagList({
+    // }).then((res) => {
+    // }).catch((err) => {
+    //   return {
+    //     success: false,
+    //   }
+    // })
+  };
+
+  const imageInput = (image) => {
+    return {
+      uid: image.imageId,
+      url: image.url,
+    };
+  };
+
+  const imageOutput = (image) => {
+    return {
+      imageId: image?.raw?.imageId,
+      shopId: id,
+      url: image.url,
+    };
+  };
+  useEffect(() => {
+    selectTagList();
+    // if (id) {
+    //   gettaTouristForm(id).then((res) => {
+    //     setListForm(res)
+    //     form.setFieldsValue(res)
+    //     setImageList(res?.imageList || [])
+    //   })
+    // }
+  }, [id]);
+
+  return (
+    <Card>
+      <ProCard tabs={{ type: 'card' }}>
+        <ProCard.TabPane key={1} tab="农机编辑">
+          <Form {...formItemLayout} onFinish={Submit} form={form}>
+            <FormItem
+              label="农机名"
+              name="name"
+              rules={[{ required: true, message: '请输入农机名' }]}
+            >
+              <Input placeholder="请输入农机名" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="农机类型"
+              name="typeId"
+              rules={[{ required: true, message: '请选择农机类型' }]}
+            >
+              <Select style={{ width: '350px' }}>
+                <Option value="6" key="6">
+                  {6}
+                </Option>
+                <Option value="7" key="7">
+                  {7}
+                </Option>
+              </Select>
+            </FormItem>
+            <FormItem
+              label="农机归属"
+              name="regionId"
+              rules={[{ required: true, message: '请选择农机归属' }]}
+            >
+              <Select style={{ width: '350px' }}>
+                <Option value="6" key="6">
+                  {6}
+                </Option>
+                <Option value="7" key="7">
+                  {7}
+                </Option>
+              </Select>
+            </FormItem>
+            <FormItem label="价格" name="price" rules={[{ required: true, message: '请输入价格' }]}>
+              <Input placeholder="请输入价格" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="押金"
+              name="deposit"
+              rules={[{ required: true, message: '请输入押金' }]}
+            >
+              <Input placeholder="请输入押金" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem
+              label="人工费"
+              name="laborCost"
+              rules={[{ required: true, message: '请输入人工费' }]}
+            >
+              <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/Machinery/Machinery/index.jsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import { history, Link } from 'umi';
+import { Button, Popconfirm, message, Tooltip } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+// import { getPersonList, exportPersonList } from '@/services/person';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+};
+
+export default (props) => {
+  const actions = () => [
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
+      新增农机
+    </Button>,
+  ];
+  const gotoEdit = (id) => {
+    const queryStr = id ? `?id=${id}` : '';
+    history.push(`./machinery/edit.jsx${queryStr}`);
+  };
+  const columns = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '农机类型',
+      dataIndex: 'typeName',
+      key: 'typeName',
+    },
+    {
+      title: '农机归属',
+      dataIndex: 'regionName',
+      key: 'regionName',
+    },
+    {
+      title: '农机价格',
+      dataIndex: 'price',
+      key: 'price',
+    },
+    {
+      title: '人工费',
+      dataIndex: 'laborCost',
+      key: 'laborCost',
+    },
+    {
+      title: '押金',
+      dataIndex: 'deposit',
+      key: 'deposit',
+    },
+    {
+      title: '工作状态',
+      dataIndex: 'jobStatus',
+      key: 'jobStatus',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      render: (_, record) => [
+        <Link key={1} to={`./machinery/edit.jsx`}>
+          编辑
+        </Link>,
+        <Popconfirm
+          key={2}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.cooperativeId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <a href="#">删除</a>
+        </Popconfirm>,
+      ],
+    },
+  ];
+  const handleDelete = () => {};
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        // request={getPersonList}
+        // expfunc={exportPersonList}
+        toolBarRender={actions}
+        columns={columns}
+        rowKey="machineryId"
+        options={false}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  );
+};

src/pages/Machinery/MachineryType/index.jsx

@@ -0,0 +1,133 @@
+import React from 'react';
+import { history, Link } from 'umi';
+import { Button, Popconfirm, Modal, Form, Input, message, Space, Tooltip } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+// import { getPersonList, exportPersonList } from '@/services/person';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { useRef, useState, useEffect } from 'react';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+};
+const FormItem = Form.Item;
+export default (props) => {
+  const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const actionRef = useRef();
+  const [name, setName] = useState();
+  const [selectModal, setSelectModal] = useState(false);
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
+
+  const handleName = (val) => {
+    setName(val);
+  };
+  const changeWeight = (record) => {
+    setSelectModal(true);
+
+    // setWeight(record.weight || 0)
+    // setEditDetail(record)
+  };
+  const actions = () => [
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={selectModalOpen}>
+      新增农机分类
+    </Button>,
+  ];
+  const columns = [
+    {
+      title: '分类名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '操作',
+      key: 'option',
+      render: (_, record) => {
+        return (
+          <Space>
+            <Button key={1} onClick={() => changeWeight(record)} type="link">
+              编辑
+            </Button>
+            <Popconfirm
+              key={2}
+              title="您是否确认删除 ?"
+              onConfirm={() => handleDelete(record.cooperativeId)}
+              okText="确定"
+              cancelText="取消"
+            >
+              <a href="#">删除</a>
+            </Popconfirm>
+          </Space>
+        );
+      },
+      search: false,
+    },
+  ];
+  const handleDelete = () => {};
+
+  const Submit = () => {
+    setLoading(true);
+    editRecommend({ ...editdetail, weight }, editdetail.serialNo).then(() => {
+      message.success(`修改成功`);
+      setLoading(false);
+      onCancel();
+      setName();
+      actionRef.current.reload();
+    });
+  };
+  const selectModalOpen = () => {
+    setSelectModal(true);
+  };
+  const onCancel = () => {
+    form.resetFields();
+    setSelectModal(false);
+  };
+  useEffect(() => {
+    form.setFieldsValue({ targetName: '' });
+    // setPackageList();
+    // getResource({ pageSize: 100 }).then((res) => {
+    //   setMachineryTypeList(res.records || []);
+    // });
+  }, []);
+  return (
+    <PageHeaderWrapper>
+      <Modal
+        title="套餐权重修改"
+        visible={selectModal}
+        onCancel={onCancel}
+        destroyOnClose={true}
+        footer={null}
+      >
+        <Form {...formItemLayout} onFinish={Submit} form={form}>
+          <FormItem label="权重" name="name" initialValue={name}>
+            <Input onChange={handleName} style={{ width: '100%' }} placeholder="请输入分类名" />
+          </FormItem>
+          <FormItem label=" " colon={false}>
+            <Button type="default" onClick={onCancel}>
+              取消
+            </Button>
+            <Button
+              type="primary"
+              loading={loading}
+              htmlType="Submit"
+              style={{ marginLeft: '4em' }}
+            >
+              修改
+            </Button>
+          </FormItem>
+        </Form>
+      </Modal>
+      <PageTable
+        // request={getPersonList}
+        // expfunc={exportPersonList}
+        toolBarRender={actions}
+        columns={columns}
+        rowKey="typeId"
+        options={false}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  );
+};

src/pages/PlatformMessageManagement/MessageEdit/index.jsx

@@ -1,18 +1,18 @@
-import { Input, Card, Select, Button, message } from "antd"
-import { useEffect, useState } from 'react'
-import { Form } from "antd";
+import { Input, Card, Select, Button, message } from 'antd';
+import { useEffect, useState } from 'react';
+import { Form } from 'antd';
 import { history } from 'umi';
-import ProCard from '@ant-design/pro-card'
+import ExtendContent from '@/components/ExtendContent';
+import ProCard from '@ant-design/pro-card';
 
 const { Option } = Select;
 const goBack = () => {
-  history.goBack()
-}
-const FormItem = Form.Item
+  history.goBack();
+};
+const FormItem = Form.Item;
 export default (props) => {
-
-  const [form] = Form.useForm()
-  const [loading, setLoading] = useState(false)
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
 
   const formItemLayout = {
     //布局
@@ -20,24 +20,19 @@ export default (props) => {
     wrapperCol: { span: 14 },
   };
 
-  const Submit = values => {
-    console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
-
+  const Submit = (values) => {
+    console.log('🚀 ~ file: index.jsx ~ line 21 ~ values', values);
   };
 
   return (
-    <Card >
-      <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}
-      >
+    <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: '请输入' }]}>
+          <Form {...formItemLayout} onFinish={Submit} form={form}>
+            <FormItem label="标题" name="title" rules={[{ required: true, message: '请输入' }]}>
               <Input placeholder="请输入" style={{ width: '350px' }} />
             </FormItem>
-            <FormItem label="推送方式" name="phone" rules={[{ required: true, message: '请输入' }]} >
+            <FormItem label="推送方式" name="phone" rules={[{ required: true, message: '请输入' }]}>
               <Select
                 placeholder="请选择方式"
                 // onChange={onGenderChange}
@@ -49,13 +44,30 @@ export default (props) => {
                 <Option value="other">短信推送</Option>
               </Select>
             </FormItem>
-            <FormItem label=" " colon={false} >
-              <Button type='default' onClick={() => goBack()} >返回</Button>
-              <Button type='primary' loading={loading} htmlType="Submit" style={{ marginLeft: '4em' }}>保存</Button>
+
+            <FormItem label="图文信息" colon={false}>
+              <ExtendContent
+                targetType="tourist"
+                targetId={'66'}
+                onCancel={() => history.goBack()}
+              />
+            </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

@@ -14,11 +14,10 @@ export default (props) => {
       pushPerson: '农机手',
       status: 'APP内消息中心推送',
     },
-
   ];
   const gotoDetail = (id) => {
-    history.push(`./MessageEdit`)
-  }
+    history.push(`./MessageEdit`);
+  };
 
   const actions = () => [
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>
@@ -96,7 +95,7 @@ export default (props) => {
       width: '300px',
       render: (_, record) => [
         <Link key={2} to={`./MessageEdit`}>
-          查看
+          编辑
         </Link>,
         <Popconfirm
           key={3}

src/pages/user/Login/index.jsx

@@ -1,284 +1,123 @@
-import {
-  AlipayCircleOutlined,
-  LockOutlined,
-  MobileOutlined,
-  TaobaoCircleOutlined,
-  UserOutlined,
-  WeiboCircleOutlined,
-} from '@ant-design/icons';
+import { LockOutlined, UserOutlined } from '@ant-design/icons';
 import { Alert, message, Tabs } from 'antd';
 import React, { useState } from 'react';
-import { ProFormCaptcha, ProFormCheckbox, ProFormText, LoginForm } from '@ant-design/pro-form';
-import { useIntl, history, FormattedMessage, SelectLang, useModel } from 'umi';
+import md5 from 'md5';
+import ProForm, { ProFormText } from '@ant-design/pro-form';
+import { useIntl, Link, history, FormattedMessage, SelectLang, useModel } from 'umi';
 import Footer from '@/components/Footer';
-import { login } from '@/services/ant-design-pro/api';
-import { getFakeCaptcha } from '@/services/ant-design-pro/login';
+import { login } from '@/services/login';
 import styles from './index.less';
 
-const LoginMessage = ({ content }) => (
-  <Alert
-    style={{
-      marginBottom: 24,
-    }}
-    message={content}
-    type="error"
-    showIcon
-  />
-);
-
 const Login = () => {
-  const [userLoginState, setUserLoginState] = useState({});
-  const [type, setType] = useState('account');
+  const [submitting, setSubmitting] = useState(false);
   const { initialState, setInitialState } = useModel('@@initialState');
   const intl = useIntl();
 
-  const fetchUserInfo = async () => {
-    const userInfo = await initialState?.fetchUserInfo?.();
-
-    if (userInfo) {
-      await setInitialState((s) => ({ ...s, currentUser: userInfo }));
-    }
-  };
-
   const handleSubmit = async (values) => {
+    setSubmitting(true);
+
     try {
       // 登录
-      const msg = await login({ ...values, type });
+      const { user } = await login({ ...values, password: md5(values.password) });
 
-      if (msg.status === 'ok') {
-        const defaultLoginSuccessMessage = intl.formatMessage({
-          id: 'pages.login.success',
-          defaultMessage: '登录成功！',
-        });
-        message.success(defaultLoginSuccessMessage);
-        await fetchUserInfo();
-        /** 此方法会跳转到 redirect 参数所在的位置 */
+      await setInitialState((s) => ({ ...s, currentUser: user }));
 
-        if (!history) return;
-        const { query } = history.location;
-        const { redirect } = query;
-        history.push(redirect || '/');
-        return;
-      }
+      message.success('登录成功！');
+      /** 此方法会跳转到 redirect 参数所在的位置 */
 
-      console.log(msg); // 如果失败去设置用户错误信息
-
-      setUserLoginState(msg);
+      if (!history) return;
+      const { query } = history.location;
+      const { redirect } = query;
+      history.push(redirect || '/');
+      return;
     } catch (error) {
-      const defaultLoginFailureMessage = intl.formatMessage({
-        id: 'pages.login.failure',
-        defaultMessage: '登录失败，请重试！',
-      });
-      message.error(defaultLoginFailureMessage);
+      console.error(error);
     }
+
+    setSubmitting(false);
   };
 
-  const { status, type: loginType } = userLoginState;
   return (
     <div className={styles.container}>
       <div className={styles.lang} data-lang>
         {SelectLang && <SelectLang />}
       </div>
       <div className={styles.content}>
-        <LoginForm
-          logo={<img alt="logo" src="/logo.svg" />}
-          title="Ant Design"
-          subTitle={intl.formatMessage({
-            id: 'pages.layouts.userLayout.title',
-          })}
-          initialValues={{
-            autoLogin: true,
-          }}
-          actions={[
-            <FormattedMessage
-              key="loginWith"
-              id="pages.login.loginWith"
-              defaultMessage="其他登录方式"
-            />,
-            <AlipayCircleOutlined key="AlipayCircleOutlined" className={styles.icon} />,
-            <TaobaoCircleOutlined key="TaobaoCircleOutlined" className={styles.icon} />,
-            <WeiboCircleOutlined key="WeiboCircleOutlined" className={styles.icon} />,
-          ]}
-          onFinish={async (values) => {
-            await handleSubmit(values);
-          }}
-        >
-          <Tabs activeKey={type} onChange={setType}>
-            <Tabs.TabPane
-              key="account"
-              tab={intl.formatMessage({
-                id: 'pages.login.accountLogin.tab',
-                defaultMessage: '账户密码登录',
-              })}
-            />
-            <Tabs.TabPane
-              key="mobile"
-              tab={intl.formatMessage({
-                id: 'pages.login.phoneLogin.tab',
-                defaultMessage: '手机号登录',
-              })}
-            />
-          </Tabs>
-
-          {status === 'error' && loginType === 'account' && (
-            <LoginMessage
-              content={intl.formatMessage({
-                id: 'pages.login.accountLogin.errorMessage',
-                defaultMessage: '账户或密码错误(admin/ant.design)',
-              })}
-            />
-          )}
-          {type === 'account' && (
-            <>
-              <ProFormText
-                name="username"
-                fieldProps={{
-                  size: 'large',
-                  prefix: <UserOutlined className={styles.prefixIcon} />,
-                }}
-                placeholder={intl.formatMessage({
-                  id: 'pages.login.username.placeholder',
-                  defaultMessage: '用户名: admin or user',
-                })}
-                rules={[
-                  {
-                    required: true,
-                    message: (
-                      <FormattedMessage
-                        id="pages.login.username.required"
-                        defaultMessage="请输入用户名!"
-                      />
-                    ),
-                  },
-                ]}
-              />
-              <ProFormText.Password
-                name="password"
-                fieldProps={{
-                  size: 'large',
-                  prefix: <LockOutlined className={styles.prefixIcon} />,
-                }}
-                placeholder={intl.formatMessage({
-                  id: 'pages.login.password.placeholder',
-                  defaultMessage: '密码: ant.design',
-                })}
-                rules={[
-                  {
-                    required: true,
-                    message: (
-                      <FormattedMessage
-                        id="pages.login.password.required"
-                        defaultMessage="请输入密码！"
-                      />
-                    ),
-                  },
-                ]}
-              />
-            </>
-          )}
-
-          {status === 'error' && loginType === 'mobile' && <LoginMessage content="验证码错误" />}
-          {type === 'mobile' && (
-            <>
-              <ProFormText
-                fieldProps={{
-                  size: 'large',
-                  prefix: <MobileOutlined className={styles.prefixIcon} />,
-                }}
-                name="mobile"
-                placeholder={intl.formatMessage({
-                  id: 'pages.login.phoneNumber.placeholder',
-                  defaultMessage: '手机号',
-                })}
-                rules={[
-                  {
-                    required: true,
-                    message: (
-                      <FormattedMessage
-                        id="pages.login.phoneNumber.required"
-                        defaultMessage="请输入手机号！"
-                      />
-                    ),
-                  },
-                  {
-                    pattern: /^1\d{10}$/,
-                    message: (
-                      <FormattedMessage
-                        id="pages.login.phoneNumber.invalid"
-                        defaultMessage="手机号格式错误！"
-                      />
-                    ),
-                  },
-                ]}
-              />
-              <ProFormCaptcha
-                fieldProps={{
-                  size: 'large',
-                  prefix: <LockOutlined className={styles.prefixIcon} />,
-                }}
-                captchaProps={{
-                  size: 'large',
-                }}
-                placeholder={intl.formatMessage({
-                  id: 'pages.login.captcha.placeholder',
-                  defaultMessage: '请输入验证码',
-                })}
-                captchaTextRender={(timing, count) => {
-                  if (timing) {
-                    return `${count} ${intl.formatMessage({
-                      id: 'pages.getCaptchaSecondText',
-                      defaultMessage: '获取验证码',
-                    })}`;
-                  }
-
-                  return intl.formatMessage({
-                    id: 'pages.login.phoneLogin.getVerificationCode',
-                    defaultMessage: '获取验证码',
-                  });
-                }}
-                name="captcha"
-                rules={[
-                  {
-                    required: true,
-                    message: (
-                      <FormattedMessage
-                        id="pages.login.captcha.required"
-                        defaultMessage="请输入验证码！"
-                      />
-                    ),
-                  },
-                ]}
-                onGetCaptcha={async (phone) => {
-                  const result = await getFakeCaptcha({
-                    phone,
-                  });
-
-                  if (result === false) {
-                    return;
-                  }
+        <div className={styles.top}>
+          <div className={styles.header}>
+            <Link to="/">
+              {/* <img alt="logo" className={styles.logo} src="/logo.svg" /> */}
+              <span className={styles.title}>南阳智慧农机系统</span>
+            </Link>
+          </div>
+          <div className={styles.desc}>我们是一群被打了鸡血的小伙伴</div>
+        </div>
 
-                  message.success('获取验证码成功！验证码为：1234');
-                }}
-              />
-            </>
-          )}
-          <div
-            style={{
-              marginBottom: 24,
+        <div className={styles.main}>
+          <ProForm
+            initialValues={{
+              autoLogin: true,
+            }}
+            submitter={{
+              searchConfig: {
+                submitText: intl.formatMessage({
+                  id: 'pages.login.submit',
+                  defaultMessage: '登录',
+                }),
+              },
+              render: (_, dom) => dom.pop(),
+              submitButtonProps: {
+                loading: submitting,
+                size: 'large',
+                style: {
+                  width: '100%',
+                },
+              },
+            }}
+            onFinish={async (values) => {
+              handleSubmit(values);
             }}
           >
-            <ProFormCheckbox noStyle name="autoLogin">
-              <FormattedMessage id="pages.login.rememberMe" defaultMessage="自动登录" />
-            </ProFormCheckbox>
-            <a
-              style={{
-                float: 'right',
+            <ProFormText
+              name="userName"
+              fieldProps={{
+                size: 'large',
+                prefix: <UserOutlined className={styles.prefixIcon} />,
               }}
-            >
-              <FormattedMessage id="pages.login.forgotPassword" defaultMessage="忘记密码" />
-            </a>
-          </div>
-        </LoginForm>
+              placeholder="用户名"
+              rules={[
+                {
+                  required: true,
+                  message: (
+                    <FormattedMessage
+                      id="pages.login.username.required"
+                      defaultMessage="请输入用户名!"
+                    />
+                  ),
+                },
+              ]}
+            />
+            <ProFormText.Password
+              name="password"
+              fieldProps={{
+                size: 'large',
+                prefix: <LockOutlined className={styles.prefixIcon} />,
+              }}
+              placeholder="密码"
+              rules={[
+                {
+                  required: true,
+                  message: (
+                    <FormattedMessage
+                      id="pages.login.password.required"
+                      defaultMessage="请输入密码！"
+                    />
+                  ),
+                },
+              ]}
+            />
+          </ProForm>
+        </div>
       </div>
       <Footer />
     </div>

src/pages/user/Login/index.less

@@ -1,4 +1,4 @@
-@import (reference) '~antd/es/style/themes/index';
+@import '~antd/es/style/themes/default.less';
 
 .container {
   display: flex;
@@ -36,15 +36,79 @@
   }
 }
 
-.icon {
-  margin-left: 8px;
-  color: rgba(0, 0, 0, 0.2);
-  font-size: 24px;
-  vertical-align: middle;
-  cursor: pointer;
-  transition: color 0.3s;
+.top {
+  text-align: center;
+}
+
+.header {
+  height: 44px;
+  line-height: 44px;
+  a {
+    text-decoration: none;
+  }
+}
+
+.logo {
+  height: 44px;
+  margin-right: 16px;
+  vertical-align: top;
+}
+
+.title {
+  position: relative;
+  top: 2px;
+  color: @heading-color;
+  font-weight: 600;
+  font-size: 33px;
+  font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
+}
+
+.desc {
+  margin-top: 12px;
+  margin-bottom: 40px;
+  color: @text-color-secondary;
+  font-size: @font-size-base;
+}
+
+.main {
+  width: 328px;
+  margin: 0 auto;
+  @media screen and (max-width: @screen-sm) {
+    width: 95%;
+    max-width: 328px;
+  }
+
+  :global {
+    .@{ant-prefix}-tabs-nav-list {
+      margin: auto;
+      font-size: 16px;
+    }
+  }
+
+  .icon {
+    margin-left: 16px;
+    color: rgba(0, 0, 0, 0.2);
+    font-size: 24px;
+    vertical-align: middle;
+    cursor: pointer;
+    transition: color 0.3s;
+
+    &:hover {
+      color: @primary-color;
+    }
+  }
+
+  .other {
+    margin-top: 24px;
+    line-height: 22px;
+    text-align: left;
+    .register {
+      float: right;
+    }
+  }
 
-  &:hover {
+  .prefixIcon {
     color: @primary-color;
+    font-size: @font-size-base;
   }
 }

src/services/extendContent.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+/**
+ * 保存扩展内容
+ * @param {*} data 
+ * @returns 
+ */
+export const save = (data) => request('/taExtendContent', { method: 'post', data })
+
+/**
+ * 修改扩展内容
+ * @param {*} data 
+ * @returns 
+ */
+export const update = (id, data) => request(`/taExtendContent/${id}`, { method: 'put', data })
+
+/**
+ * 查询扩展内容列表 
+ * @param {*} params 
+ * @returns 
+ */
+export const getList = (params) => request('/taExtendContent', { params })
+
+
+/**
+ * 删除扩展内容
+ * @param {*} data 
+ * @returns 
+ */
+ export const remove = (id) => request(`/taExtendContent/${id}`, { method: 'delete'})
+ 
+/**
+ * 查询扩展内容详情
+ * @param {*} params 
+ * @returns 
+ */
+export const getDetail = (id) => request(`/taExtendContent/${id}`)

src/services/login.js

@@ -0,0 +1,3 @@
+import request from '@/utils/request';
+
+export const login = (data) => request('/login', { method: 'post', data });

src/services/oss.js

@@ -0,0 +1,61 @@
+import OSS from 'ali-oss';
+import request from '@/utils/request';
+
+let client;
+let stsInfo;
+
+/**
+ * 获取 OSS-STS 临时凭证
+ * @returns
+ */
+export const getSTSToken = () => request('/oss-sts');
+
+/**
+ * 获取 OSS 客户端
+ * @returns
+ */
+export function getOSSClient() {
+  if (client) {
+    return Promise.resolve(client);
+  }
+
+  return getSTSToken().then((sts) => {
+    stsInfo = sts;
+
+    client = new OSS({
+      accessKeyId: sts.accessKeyId,
+      accessKeySecret: sts.accessKeySecret,
+      stsToken: sts.stsToken,
+      bucket: sts.bucket,
+      endpoint: sts.endpoint,
+      refreshSTSTokenInterval: 25 * 60 * 1000, // 每25min刷新一次
+      refreshSTSToken: () => {
+        return getSTSToken().then((res) => {
+          return {
+            accessKeyId: res.accessKeyId,
+            accessKeySecret: res.accessKeySecret,
+            stsToken: res.stsToken,
+          };
+        });
+      },
+    });
+
+    return client;
+  });
+}
+
+/**
+ * 上传文件到 OSS
+ * @param {*} file
+ * @returns
+ */
+export function upload(file) {
+  return getOSSClient().then(() => {
+    const data = new FormData();
+    data.append('file', file);
+    const now = new Date();
+    const fileName = `${stsInfo.path}/${now.valueOf()}-${file.name}`;
+
+    return client.put(fileName, file).then((res) => res.url);
+  });
+}

src/services/user.js

@@ -0,0 +1,5 @@
+import request from '@/utils/request';
+
+export const currentUser = () => request('/currentUser');
+
+export const changePassword = (data) => request('/change-password', { data, method: 'PUT' });

src/utils/request.js

@@ -5,7 +5,8 @@ function requestInterceptor(url, options) {
   const headers = options.headers || {};
   const token = localStorage.getItem('token')
     ? { 'X-Authorization-JWT': localStorage.getItem('token') }
-    : {};
+    : // ? { 'Authorization': localStorage.getItem('token') }
+      {};
   const prefix =
     process.env.NODE_ENV === 'production' ? 'http://sgl-v2.njyunzhi.com/api/admin' : '/api/admin';
 

src/utils/upload.js

@@ -0,0 +1,17 @@
+import { upload } from '@/services/oss'
+
+/**
+ * 获取 OSS 客户端
+ * @returns 
+ */
+export function uploadFile({ file, onSuccess, onError }) {
+  upload(file).then((url) => {
+    onSuccess(url, file)
+  }).catch((e) => {
+    onError(e)
+  });
+
+  return {
+    abort: () => {},
+  };
+}