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

src/components/ContactWidget.tsx

 import React, { ReactElement } from "react";
 import { Popover } from "antd";
 import { TooltipPlacement } from "antd/lib/tooltip";
-import { ActionType } from "rc-trigger/lib/interface";
 import "./ContactWidget.less"
 
 interface ContactWidgetProps {
   placement: TooltipPlacement
   children: React.ReactElement
   visible?: boolean
-  trigger: ActionType | ActionType[]
+  trigger: string | string[]
 }
 
 function Content() {
@@ -27,7 +26,7 @@ function Content() {
 export default function ContactWidget(props:ContactWidgetProps) {
 
     return <Popover 
-            className="contact-widget-popover"
+            overlayClassName="contact-widget-popover"
             placement={props.placement} 
             arrowPointAtCenter 
             content={Content}

src/modules/college-manage/EmployeeManage.tsx

@@ -166,7 +166,7 @@ function EmployeeManage() {
         },
       },
       {
-        title: "身份",
+        title: "角色",
         dataIndex: "role",
         key: "role",
         render: (val: string) => {
@@ -276,7 +276,7 @@ function EmployeeManage() {
 
   return (
     <div className="page employee-manage-page">
-        <div className="content-header">员工管理</div>
+        <div className="content-header">角色管理</div>
         <div className="box">
           <div className="box-header">
             <div
@@ -326,7 +326,7 @@ function EmployeeManage() {
               </div>
 
               <div>
-                身份：
+                角色：
                 {_.map(roleIds, (item: any) => {
                   return (
                     <CheckBox

src/modules/college-manage/modal/SetEmployeeModal.jsx

@@ -77,7 +77,7 @@ export default class SetEmployeeModal extends React.Component {
             ))}
           </div>
           <div className="detail-box">
-            <div className="title">员工身份：</div>
+            <div className="title">员工角色：</div>
             <RadioGroup
               value={roleCode}
               onChange={(e) => {

src/modules/root/Header.jsx

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

src/modules/store-manage/EmployeeAddOrEditModal.tsx

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

src/modules/store-manage/EmployeesManagePage.tsx

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

src/modules/teach-tool/components/CourseCategoryManage.jsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-02-23 18:28:50
  * @LastEditors: wufan
- * @LastEditTime: 2021-06-24 13:39:30
+ * @LastEditTime: 2021-07-23 15:02:34
  * @Description: 助学工具-课程分类
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */

src/modules/teach-tool/components/CourseCategoryManage.less

@@ -31,7 +31,7 @@
         height: 44px;
         padding: 0;
         span {
-          line-height: 44px;
+          line-height: 47px;
           vertical-align: middle;
         }
         .ant-tree-node-content-wrapper.ant-tree-node-selected {
@@ -45,10 +45,10 @@
             *.node-title-div {
               width: 100%;
               display: flex;
-              justify-content: space-between;
               .title-opts {
                 visibility: hidden;
-                margin-right: 16px;
+                margin-left: 24px;
+                margin-bottom: 4px;
               }
             }
           }

src/modules/teach-tool/components/XMAudio.less

@@ -8,8 +8,8 @@
 .xm-audio {
   display: flex;
   align-items: center;
-  width: 280px;
-  padding: 10px 20px;
+  width: 315px;
+  padding: 10px 0 10px 20px;
   border-radius: 5px;
   background-color: #ffffff;
   .audio-image {

src/modules/teach-tool/paper-manage/modal/PreviewPaperModal.less

@@ -101,7 +101,6 @@
       .voice-box {
         margin-bottom: 12px;
         box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-        padding: 10px 20px;
         width: 320px;
       }
     }

src/modules/teach-tool/question-manage/components/OperateQuestionTab.less

@@ -314,7 +314,6 @@
         .audio-box {
           position: relative;
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
           margin-bottom: 12px;
           .icon_sider {

src/modules/teach-tool/question-manage/modal/PreviewQuestionModal.less

@@ -68,7 +68,6 @@
       .voice-box {
         margin-bottom: 12px;
         box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-        padding: 10px 20px;
         width: 320px;
       }
     }
@@ -144,7 +143,6 @@
         .voice-box {
           margin-bottom: 12px;
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
         }
       }
@@ -248,7 +246,6 @@
         margin-bottom: 16px;
         .audio-box {
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
           margin-bottom: 12px;
         }

src/routes/config/mainRoutes.tsx

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

src/routes/config/menuList.tsx

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