feats

config/proxy.js

@@ -8,8 +8,8 @@
 export default {
   dev: {
     '/api/': {
-      // target: 'https://xlk.njyz.tech/',
-      target: 'http://localhost:8081/',
+      target: 'https://xlj.newlandsh.com/',
+      // target: 'http://localhost:8081/',
       // target: 'https://xlj.newlandsh.com/',
       changeOrigin: true,
       pathRewrite: {

config/routes.js

@@ -606,17 +606,20 @@ export default [
             path: '/statistics',
             name: '数据统计',
             component: '../layouts/BlankLayout',
+            menuCode: '/statistics',
             // hideInMenu: true,
             routes: [
               {
                 path: '/statistics/dataReport',
                 name: '数据报表',
                 component: './statistics/dataReport',
+                menuCode: '/statistics/dataReport',
               },
               {
                 path: '/statistics/activity',
                 name: '活动统计',
                 component: './statistics/activity',
+                menuCode: '/statistics/activity',
               },
             ],
           },

src/layouts/BasicLayout.jsx

@@ -33,7 +33,9 @@ const menuDataRender = (menuRoles) => (menuList) =>
     const needAuth = !!item.menuCode;
 
     const authority =
-      (menuRoles.filter((x) => x.menuCode === item.menuCode)[0] || {}).roles || [];
+      (menuRoles.filter((x) => x.code === item.menuCode)[0] || {}).roles || [];
+
+    console.log('-------------->', item.menuCode, authority)
 
     const localItem = { ...item, children: item.children ? menuDataRender(menuRoles)(item.children) : [] };
     return Authorized.check(needAuth ? authority : undefined, localItem, null);
@@ -71,7 +73,7 @@ const BasicLayout = (props) => {
       };
     }
 
-    const authority = (menus.filter((x) => x.menuCode === routeItem.menuCode)[0] || {}).roles;
+    const authority = (menus.filter((x) => x.code === routeItem.menuCode)[0] || {}).roles;
     return {
       authority: authority && authority.length ? authority : ['any-string-for-no-right'],
     };

src/pages/building/Developers/tableColumns.js

@@ -23,7 +23,7 @@ export default ({page,getBrandData, onEdit, onDelete}) => [
     align: 'center',
   },
   {
-    title: '品牌宣传图',
+    title: '品牌Logo',
     dataIndex: 'brandLogo',
     key: 'brandLogo',
     align: 'center',
@@ -41,6 +41,7 @@ export default ({page,getBrandData, onEdit, onDelete}) => [
     dataIndex: 'brandRemark',
     key: 'brandRemark',
     align: 'center',
+    width: '40%',
   },
   {
     title: '操作',