Merge branch 'feature/maolipeng/youhua' into dev

# Conflicts:
#	src/modules/college-manage/EmployeeManage.tsx

src/components/ContactWidget.tsx

 import React, { ReactElement } from "react";
 import React, { ReactElement } from "react";
 import { Popover } from "antd";
 import { Popover } from "antd";
 import { TooltipPlacement } from "antd/lib/tooltip";
 import { TooltipPlacement } from "antd/lib/tooltip";
-import { ActionType } from "rc-trigger/lib/interface";
 import "./ContactWidget.less"
 import "./ContactWidget.less"
 
 
 interface ContactWidgetProps {
 interface ContactWidgetProps {
   placement: TooltipPlacement
   placement: TooltipPlacement
   children: React.ReactElement
   children: React.ReactElement
   visible?: boolean
   visible?: boolean
-  trigger: ActionType | ActionType[]
+  trigger: string | string[]
 }
 }
 
 
 function Content() {
 function Content() {

src/modules/college-manage/EmployeeManage.tsx

@@ -174,7 +174,7 @@ function EmployeeManage() {
         },
         },
       },
       },
       {
       {
-        title: "身份",
+        title: "角色",
         dataIndex: "role",
         dataIndex: "role",
         key: "role",
         key: "role",
         render: (val: string) => {
         render: (val: string) => {
@@ -284,18 +284,18 @@ function EmployeeManage() {
 
 
   return (
   return (
     <div className="page employee-manage-page">
     <div className="page employee-manage-page">
-      <div className="content-header">员工管理</div>
-      <div className="box">
-        <div className="box-header">
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "flex-start",
-              padding: "0px 0 4px",
-            }}
-          >
-            <div>
+        <div className="content-header">角色管理</div>
+        <div className="box">
+          <div className="box-header">
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "flex-start",
+                padding: "0px 0 4px",
+              }}
+            >
+              <div>
               搜索员工：
               搜索员工：
               <Search
               <Search
                 style={{
                 style={{
@@ -334,7 +334,7 @@ function EmployeeManage() {
             </div>
             </div>
 
 
             <div>
             <div>
-              身份：
+              角色：
               {_.map(roleIds, (item: any) => {
               {_.map(roleIds, (item: any) => {
                 return (
                 return (
                   <CheckBox
                   <CheckBox

src/modules/root/Header.jsx

@@ -154,7 +154,7 @@ function Header(props) {
                 });
                 });
               }}>
               }}>
               <span className='menu-before iconfont icon'>&#xe84e;</span>
               <span className='menu-before iconfont icon'>&#xe84e;</span>
-              <span>进入管理后台</span>
+              <span>多学院管理面板</span>
               <span className='menu-after iconfont icon'>&#xe79b;</span>
               <span className='menu-after iconfont icon'>&#xe79b;</span>
             </div>
             </div>
           )}
           )}

src/modules/store-manage/EmployeeAddOrEditModal.tsx

@@ -273,7 +273,7 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
               </Form.Item>
               </Form.Item>
             )}
             )}
             <Form.Item
             <Form.Item
-              label="员工身份"
+              label="员工角色"
               name="role"
               name="role"
               rules={[{ required: false }]}
               rules={[{ required: false }]}
               style={{marginBottom:'-2px !important'}}
               style={{marginBottom:'-2px !important'}}

src/modules/store-manage/EmployeesManagePage.tsx

@@ -315,7 +315,7 @@ function EmployeesManagePage() {
 
 
   return (
   return (
     <div className=" page employee-manage-page">
     <div className=" page employee-manage-page">
-        <div className="content-header">员工管理</div>
+        <div className="content-header">角色管理</div>
         <div className="box">
         <div className="box">
           <div className="box-header">
           <div className="box-header">
             <div
             <div

src/routes/config/mainRoutes.tsx

@@ -46,12 +46,12 @@ const mainRoutes = [
   {
   {
     path: '/employees-manage',
     path: '/employees-manage',
     component: EmployeesManagePage,
     component: EmployeesManagePage,
-    name: '员工管理',
+    name: '角色管理',
   },
   },
   {
   {
     path: '/college-employee',
     path: '/college-employee',
     component: EmployeeManage,
     component: EmployeeManage,
-    name: '员工管理',
+    name: '角色管理',
   },
   },
   {
   {
     path: '/personal-info',
     path: '/personal-info',

src/routes/config/menuList.tsx

@@ -99,14 +99,14 @@ export const menuList: any = [
     selectImg: 'https://image.xiaomaiketang.com/xm/5sN4MzjxYc.png',
     selectImg: 'https://image.xiaomaiketang.com/xm/5sN4MzjxYc.png',
   },
   },
   {
   {
-    groupName: '人员管理',
+    groupName: '权限管理',
     groupCode: 'PersonManage',
     groupCode: 'PersonManage',
     icon: '',
     icon: '',
     img: 'https://image.xiaomaiketang.com/xm/PRCnrt35y8.png',
     img: 'https://image.xiaomaiketang.com/xm/PRCnrt35y8.png',
     selectImg: 'https://image.xiaomaiketang.com/xm/GhkwbdpwfK.png',
     selectImg: 'https://image.xiaomaiketang.com/xm/GhkwbdpwfK.png',
     children: [
     children: [
       {
       {
-        groupName: '员工管理',
+        groupName: '角色管理',
         groupCode: 'ShopStaff',
         groupCode: 'ShopStaff',
         link: '/college-employee',
         link: '/college-employee',
       },
       },