Merge branch 'feature/zhangleyuan/20210608/optimize' into gray

src/modules/root/Menu.less

@@ -48,8 +48,8 @@
         margin-right: 20px
         margin-right: 20px
       }
       }
       .icon-img{
       .icon-img{
-        width:16px;
-        height:16px;
+        width:18px;
+        height:18px;
         margin-right:16px;
         margin-right:16px;
       }
       }
       .listType {
       .listType {

src/routes/config/menuList.tsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Author: yuananting
  * @Date: 2021-02-21 15:53:31
  * @Date: 2021-02-21 15:53:31
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-30 11:00:09
+ * @LastEditTime: 2021-06-08 16:46:15
  * @Description: 描述一下咯
  * @Description: 描述一下咯
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -44,22 +44,6 @@ export const menuList: any = [
     ]
     ]
   },
   },
   {
   {
-    groupName: "知识库",
-    groupCode: "CloudKnowledge",
-    icon: '',
-    link: '/knowledge-base',
-    img:'https://image.xiaomaiketang.com/xm/8sbP5rGQWh.png',
-    selectImg:'https://image.xiaomaiketang.com/xm/hJKCfibC22.png'
-  },
-  {
-    groupName: "资料云盘",
-    groupCode: "CloudDisk",
-    icon: '',
-    link: '/resource-disk',
-    img:'https://image.xiaomaiketang.com/xm/zGKbXJPzXx.png',
-    selectImg:'https://image.xiaomaiketang.com/xm/5sN4MzjxYc.png',
-  },
-  {
     groupName: "培训管理",
     groupName: "培训管理",
     groupCode: "TrainManage",
     groupCode: "TrainManage",
     icon: '',
     icon: '',
@@ -96,17 +80,28 @@ export const menuList: any = [
     ]
     ]
   },
   },
   {
   {
-    groupName: "学院管理",
-    groupCode: "CloudShop",
+    groupName: "知识库",
+    groupCode: "CloudKnowledge",
+    icon: '',
+    link: '/knowledge-base',
+    img:'https://image.xiaomaiketang.com/xm/8sbP5rGQWh.png',
+    selectImg:'https://image.xiaomaiketang.com/xm/hJKCfibC22.png'
+  },
+  {
+    groupName: "资料云盘",
+    groupCode: "CloudDisk",
+    icon: '',
+    link: '/resource-disk',
+    img:'https://image.xiaomaiketang.com/xm/zGKbXJPzXx.png',
+    selectImg:'https://image.xiaomaiketang.com/xm/5sN4MzjxYc.png',
+  },
+  {
+    groupName: "人员管理",
+    groupCode: "PersonManage",
     icon: '',
     icon: '',
-    img:'https://image.xiaomaiketang.com/xm/Q8i5RSMKNc.png',
+    img:'https://image.xiaomaiketang.com/xm/PRCnrt35y8.png',
     children: [
     children: [
       {
       {
-        groupName: "学院信息",
-        groupCode: "ShopInfo",
-        link: '/college-info'
-      },
-      {
         groupName: "员工管理",
         groupName: "员工管理",
         groupCode: "ShopStaff",
         groupCode: "ShopStaff",
         link: '/college-employee'
         link: '/college-employee'
@@ -115,11 +110,19 @@ export const menuList: any = [
         groupName: "学员管理",
         groupName: "学员管理",
         groupCode: "ShopUser",
         groupCode: "ShopUser",
         link: '/college-user'
         link: '/college-user'
-      },
+      }
+    ]
+  },
+  {
+    groupName: "学院管理",
+    groupCode: "CloudShop",
+    icon: '',
+    img:'https://image.xiaomaiketang.com/xm/Q8i5RSMKNc.png',
+    children: [
       {
       {
-          groupName: "课程分类",
-          groupCode: "CourseCategory",
-          link: '/course-category-manage'
+        groupName: "学院信息",
+        groupCode: "ShopInfo",
+        link: '/college-info'
       },
       },
       {
       {
         groupName: "学院装修",
         groupName: "学院装修",
@@ -127,6 +130,11 @@ export const menuList: any = [
         link: '/store-decoration'
         link: '/store-decoration'
       },
       },
       {
       {
+          groupName: "分类管理",
+          groupCode: "CourseCategory",
+          link: '/course-category-manage'
+      },
+      {
         groupName: "H5学院",
         groupName: "H5学院",
         groupCode: "ShopDecorationH5",
         groupCode: "ShopDecorationH5",
         link: '/store-decoration/h5'
         link: '/store-decoration/h5'
@@ -138,5 +146,4 @@ export const menuList: any = [
       }
       }
     ]
     ]
   },
   },
-
 ]
 ]
\ No newline at end of file