bug fix

config/config.js

@@ -23,11 +23,11 @@ const plugins = [
         // default true, when it is true, will use `navigator.language` overwrite default
         baseNavigator: true,
       },
-      // dynamicImport: {
-      //   loadingComponent: './components/PageLoading/index',
-      //   webpackChunkName: true,
-      //   level: 3,
-      // },
+      dynamicImport: {
+        loadingComponent: './components/PageLoading/index',
+        webpackChunkName: true,
+        level: 3,
+      },
       pwa: pwa
         ? {
           workboxPluginMode: 'InjectManifest',

src/layouts/SecurityLayout.jsx

@@ -25,6 +25,8 @@ class SecurityLayout extends React.Component {
     const { isReady } = this.state;
     const { children, loading, currentUser } = this.props;
 
+    console.log('------------>', loading, currentUser)
+
     if ((!currentUser.userId && loading) || !isReady) {
       return <PageLoading />;
     }

src/models/login.js

@@ -36,7 +36,6 @@ const Model = {
       }
 
       yield put(routerRedux.replace(redirect || '/'));
-      
     },
 
     *getCaptcha({ payload }, { call }) {
@@ -60,7 +59,7 @@ const Model = {
   },
   reducers: {
     changeLoginStatus(state, { payload }) {
-      setAuthority('admin');
+      setAuthority((payload.user.roles || []).map(x => x.roleId));
       return { ...state, status: 'ok', type: payload.type };
     },
   },

src/utils/request.js

@@ -4,6 +4,8 @@
  */
 import request from 'umi-request';
 import { notification } from 'antd';
+import apis from '../services/apis';
+
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -25,7 +27,7 @@ const codeMessage = {
 const replaceURLParams = (url, params = {}) => {
   return Object.keys(params).reduce((acc, k) => { // 此方法对每个元素进行处理
     const re = new RegExp(`:${k}(?!w)`, 'i')
-    return acc.replace(re, args[k])
+    return acc.replace(re, params[k])
   }, url)
 }
 
@@ -92,6 +94,9 @@ request.interceptors.response.use(async (response, options) => {
   }
 });
 
+
+const fetch = api => options => request(api.url, {...api, ...options || {}})
+
 export default config => {
   if (typeof config === 'string') {
     return request(config);
@@ -100,3 +105,5 @@ export default config => {
     return request(url, options);
   }
 };
+
+export { fetch, apis }