init

lovesL · Dec 6, 2021 · 0fa63b9 · 0fa63b9
1 parent 6287ea7
commit 0fa63b9
Show file tree

Hide file tree

Showing 23 changed files with 89 additions and 1,165 deletions.
diff --git a/config/defaultSettings.js b/config/defaultSettings.js
@@ -4,7 +4,7 @@ const Settings = {
   primaryColor: '#1890ff',
   layout: 'mix',
   contentWidth: 'Fluid',
-  fixedHeader: false,
+  fixedHeader: true,
   fixSiderbar: true,
   colorWeak: false,
   title: 'Ant Design Pro',

diff --git a/config/dynamicRoutes.js b/config/dynamicRoutes.js
@@ -0,0 +1,42 @@
+export default [
+  {
+    path: '/eawcs',
+    layout: true,
+    exact: true,
+    routes: [
+      { path: '/eawcs', redirect: '/eawcs/des1' },
+      {
+        path: '/eawcs/des1',
+        name: '环水保菜单1',
+        component:'./eawcs/page1'
+      },
+      {
+        path: '/eawcs/des2',
+        name: '环水保菜单2',
+        component:'./eawcs/page2'
+      },
+    ]
+  },
+  {
+    path: '/demolition',
+    layout: true,
+    exact: true,
+    routes: [
+      { path: '/demolition', redirect: '/demolition/dem1' },
+      {
+        path: '/demolition/dem1',
+        name: '先签后建菜单1',
+        component:'./demolition/page1'
+      },
+      {
+        path: '/demolition/dem2',
+        name: '先签后建菜单2',
+        exact: true,
+        component:'./demolition/page2'
+      },
+    ]
+  },
+  {
+    component: './404',
+  },
+];
diff --git a/config/routes.js b/config/routes.js
@@ -1,3 +1,5 @@
+import dynamicRoutes from './dynamicRoutes'
+
 export default [
   {
     path: '/user/login',
@@ -8,6 +10,9 @@ export default [
     path: '/',
     component: './Root',
     layout: false,
+    routes:[
+        ...dynamicRoutes
+    ],
   },
   {
     component: './404',

diff --git a/mock/route.js b/mock/route.js
@@ -4,14 +4,12 @@ export default {
       res.send({
         data: [
           {
-            path: '/des1',
-            name: '菜单1',
-            component:'@/eawcs/page1'
+            path: '/eawcs/des1',
+            name: '环水保菜单1',
           },
           {
-            path: '/des2',
-            name: '菜单2',
-            component:'@/eawcs/page2'
+            path: '/eawcs/des2',
+            name: '环水保菜单2',
           }
         ],
         success: true,
@@ -20,14 +18,14 @@ export default {
       res.send({
         data: [
           {
-            path: '/dem1',
-            name: '菜单1',
-            component:'@/demolition/page1'
+            path: '/demolition/dem1',
+            name: '先签后建菜单1',
+            exact: true,
           },
           {
-            path: '/dem2',
-            name: '菜单2',
-            component:'@/demolition/page2'
+            path: '/demolition/dem2',
+            name: '先签后建菜单2',
+            exact: true,
           }
         ],
         success: true,

diff --git a/mock/user.js b/mock/user.js
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "react-dev-inspector": "^1.1.1",
     "react-dom": "^17.0.0",
     "react-helmet-async": "^1.0.4",
-    "umi": "^3.5.0",
+    "umi": "^3.5.20",
     "umi-serve": "^1.9.10"
   },
   "devDependencies": {

diff --git a/src/access.js b/src/access.js
@@ -4,6 +4,6 @@
 export default function access(initialState) {
   const { currentUser } = initialState || {};
   return {
-    canAdmin: currentUser && currentUser.access === 'admin',
+    canAdmin: {}
   };
 }