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

config/config.dev.js

@@ -1,6 +1,7 @@
 // https://umijs.org/config/
 import { defineConfig } from 'umi';
 export default defineConfig({
+  //
   plugins: [
     // https://github.com/zthxxx/react-dev-inspector
     'react-dev-inspector/plugins/umi/react-inspector',

config/config.js

@@ -5,7 +5,9 @@ import defaultSettings from './defaultSettings';
 import proxy from './proxy';
 import routes from './routes';
 const { REACT_APP_ENV } = process.env;
+
 export default defineConfig({
+  // 以下是 umi 参数
   hash: true,
   antd: {},
   dva: {

src/access.js

@@ -2,8 +2,12 @@
  * @see https://umijs.org/zh-CN/plugins/plugin-access
  * */
 export default function access(initialState) {
-  const { currentUser } = initialState || {};
-  return {
-    canAdmin: currentUser && currentUser.access === 'admin',
-  };
+  const { menuAccess } = initialState || {};
+  return (menuAccess || []).reduce((acc, item) => {
+    const { permission: canAccess } = item;
+    return {
+      ...acc,
+      [permission]: canAccess,
+    };
+  }, {});
 }

src/app.jsx

@@ -18,8 +18,7 @@ export const initialStateConfig = {
 export async function getInitialState() {
   const fetchUserInfo = async () => {
     try {
-      const { user } = await queryCurrentUser();
-      return user;
+      return await queryCurrentUser();
     } catch (error) {
       history.push(loginPath);
     }
@@ -28,10 +27,11 @@ export async function getInitialState() {
   }; // 如果是登录页面，不执行
 
   if (history.location.pathname !== loginPath) {
-    const currentUser = await fetchUserInfo();
+    const res = await fetchUserInfo();
     return {
       fetchUserInfo,
-      currentUser,
+      currentUser: res.user,
+      menuAccess: res.menu,
       settings: {},
     };
   }

src/pages/ContentManagementSystem/BannerClassification/index.jsx

@@ -13,6 +13,7 @@ export default (props) => {
       name: '胡彦斌',
       age: 32,
       zz: '西湖区湖底公园1号',
+      status: 1
     },
   ];
 
@@ -38,7 +39,7 @@ export default (props) => {
       title: titleCourse,
       okText: '确认',
       cancelText: '取消',
-      onOk() {
+      onOk () {
         publishNote(record.noteId, record.status ? 'off' : 'on').then((res) => {
           message.success('操作成功');
           actionRef.current.reload();

src/pages/ContentManagementSystem/InformationList/index.jsx

@@ -8,7 +8,7 @@ import ProTable, { TableDropdown } from '@ant-design/pro-table';
 export default (props) => {
   const dataSource = [
     {
-      id: 9,
+      status: 0,
       key: '1',
       name: '胡彦斌',
       age: 32,
@@ -39,14 +39,14 @@ export default (props) => {
   const columns = [
     {
       title: '分类名',
-      key: 'typeName',
-      dataIndex: 'typeName',
+      key: 'name',
+      dataIndex: 'name',
       search: false,
     },
     {
       title: '资讯标题',
-      dataIndex: 'title',
-      key: 'title',
+      dataIndex: 'zz',
+      key: 'zz',
       search: false,
     },
     {

src/pages/Machinery/MachineryType/index.jsx

@@ -65,7 +65,7 @@ export default (props) => {
       search: false,
     },
   ];
-  const handleDelete = () => {};
+  const handleDelete = () => { };
 
   const Submit = () => {
     setLoading(true);
@@ -84,6 +84,7 @@ export default (props) => {
     form.resetFields();
     setSelectModal(false);
   };
+
   useEffect(() => {
     form.setFieldsValue({ targetName: '' });
     // setPackageList();
@@ -94,7 +95,7 @@ export default (props) => {
   return (
     <PageHeaderWrapper>
       <Modal
-        title="套餐权重修改"
+        title="修改"
         visible={selectModal}
         onCancel={onCancel}
         destroyOnClose={true}