Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc

src/modules/college-manage/UserManagePage.tsx

@@ -143,9 +143,6 @@ function UserManagePage() {
             <div className="header-item">
             <div className="header-item">
               <span className="item-name">搜索学员：</span>
               <span className="item-name">搜索学员：</span>
               <Search
               <Search
-                style={{
-                  width: 300,
-                }}
                 placeholder="搜索学员姓名/手机号"
                 placeholder="搜索学员姓名/手机号"
                 onSearch={(value) => {
                 onSearch={(value) => {
                   const _query = { ...query };
                   const _query = { ...query };

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

@@ -285,6 +285,10 @@ class ChooseMembersModal extends React.Component {
           visible={isOpen}
           visible={isOpen}
           onCancel={() => this.handleClose()}
           onCancel={() => this.handleClose()}
           onOk={() => {
           onOk={() => {
+            if (User.getVersion() && User.getVersion().whetherReachUserNum) {
+              message.error("添加失败，企业使用人数超出限制")
+              return
+            }
             if (_.isEmpty(selectUserList)) {
             if (_.isEmpty(selectUserList)) {
               message.warning(type === 'USER' ? '请选择员工' : '请选择学员')
               message.warning(type === 'USER' ? '请选择员工' : '请选择学员')
               return null;
               return null;

src/modules/root/Menu.less

@@ -164,6 +164,7 @@
         display: inline-block;
         display: inline-block;
         width: 58px;
         width: 58px;
         text-align: center;
         text-align: center;
+        color: #333333;
         margin: 0 auto;
         margin: 0 auto;
         border-radius: 2px;
         border-radius: 2px;
         border: 1px solid #E8E8E8;
         border: 1px solid #E8E8E8;
@@ -182,7 +183,7 @@
       font-size: 12px;
       font-size: 12px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       font-weight: 400;
-      color: #666666;
+      color: #999999;
       line-height: 22px;
       line-height: 22px;
       margin: 6px auto 0 auto;
       margin: 6px auto 0 auto;
     }
     }