Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

config/defaultSettings.js

@@ -8,7 +8,7 @@ const proSettings = {
   colorWeak: false,
   title: 'CLD.V2',
   pwa: false,
-  iconfontUrl: '//at.alicdn.com/t/font_2276974_ergd1ry0m0a.js',
+  iconfontUrl: '//at.alicdn.com/t/font_2276974_ho65393xavq.js',
   splitMenus: true
 }
 export default proSettings

config/routes.js

@@ -145,6 +145,33 @@ export default [
     ]
   },
   {
+    path: 'statistic',
+    name: 'statistic',
+    icon: 'icon-tongji',
+    routes: [
+      {
+        path: '/statistic',
+        redirect: '/statistic/software'
+      },
+      {
+        path: 'software',
+        name: 'software',
+        icon: 'icon-chanpin',
+        routes: [
+          {
+            path: '/statistic/software',
+            redirect: '/statistic/software/usage'
+          },
+          {
+            path: 'usage',
+            name: 'usage',
+            component: './Statistic/Software/Usage'
+          }
+        ]
+      }
+    ]
+  },
+  {
     path: '/hr',
     name: 'hr',
     icon: 'icon-users',

src/locales/zh-CN/menu.js

@@ -33,5 +33,8 @@ export default {
   'menu.account.trigger': '触发报错',
   'menu.account.logout': '退出登录',
   'menu.account.settings': '个人中心',
-  'menu.settings': '个人中心'
+  'menu.settings': '个人中心',
+  'menu.statistic': '统计',
+  'menu.statistic.software': '产品销售',
+  'menu.statistic.software.usage': '软件锁用量'
 }

src/pages/Statistic/Software/Usage/index.jsx

@@ -0,0 +1,5 @@
+const Usage = () => {
+  return <div>usage</div>
+}
+
+export default Usage