Merge branch 'dev' of…

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

src/modules/root/WechatLogin.tsx

@@ -2,7 +2,6 @@ import React, { useState, useRef, useEffect } from 'react';
 import qrcode from "@/libs/qrcode/qrcode.js";
 import qrcode from "@/libs/qrcode/qrcode.js";
 import Service from "@/common/js/service";
 import Service from "@/common/js/service";
 import User from '@/common/js/user';
 import User from '@/common/js/user';
-import qrcode from "@/libs/qrcode/qrcode.js";
 import { PATH } from '@/domains/basic-domain/constants';
 import { PATH } from '@/domains/basic-domain/constants';
 import './WechatLogin.less'
 import './WechatLogin.less'
 const Logo = require("@/common/images/logo.png")
 const Logo = require("@/common/images/logo.png")

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-06-08 10:01:13
+ * @LastEditTime: 2021-06-08 16:46:15
  * @Description: 描述一下咯
  * @Description: 描述一下咯
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -80,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'
@@ -99,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: "学院装修",
@@ -111,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'
@@ -122,20 +146,4 @@ 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',
-  },
 ]
 ]
\ No newline at end of file