feat:解决合并代码后的冲突

src/common/js/axios.ts

 /*
 /*
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-08-31 09:34:31
  * @Date: 2020-08-31 09:34:31
- * @LastEditors: yuananting
- * @LastEditTime: 2021-07-14 10:49:14
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-08-17 15:46:59
  * @Description: 
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -102,6 +102,12 @@ class Axios {
             content: "直播进行中，无法删除直播",
             content: "直播进行中，无法删除直播",
             okText: "我知道了"
             okText: "我知道了"
           })
           })
+        }else if(resultCode === 'NO_CREATE_STORE'){
+          Modal.warning({
+            title:"提示",
+            content: "企业总学院数达到上限，无法继续创建。",
+            okText: "我知道了"
+          })
         } else if (success || resultCode === 0) {
         } else if (success || resultCode === 0) {
           return response;
           return response;
         } else if (!options.reject) {
         } else if (!options.reject) {

src/modules/home/Home.jsx

@@ -427,8 +427,8 @@ class Home extends React.Component {
               <Choose>
               <Choose>
                 <When condition={_.isEmpty(list)}>
                 <When condition={_.isEmpty(list)}>
                   <div className='study-empty'>
                   <div className='study-empty'>
-                    <img src='https://image.xiaomaiketang.com/xm/52dmait5Bx.png' alt='' />
-                    <div>暂无课程上榜</div>
+                    <img src='https://image.xiaomaiketang.com/xm/fFnpKMJD6x.png' alt='' />
+                    <div className="text">暂无学员上榜</div>
                   </div>
                   </div>
                 </When>
                 </When>
                 <Otherwise>
                 <Otherwise>

src/modules/home/Home.less

@@ -239,13 +239,13 @@
           margin-top: 102px;
           margin-top: 102px;
           img {
           img {
             display: block;
             display: block;
-            width: 100px;
-            height: 100px;
+            width: 150px;
+            height: 150px;
             margin: 0 auto 8px;
             margin: 0 auto 8px;
           }
           }
           div {
           div {
             text-align: center;
             text-align: center;
-            color: #333;
+            color: #999;
           }
           }
         }
         }
         .circle-box {
         .circle-box {

src/modules/root/CollegeManagePage.jsx

@@ -260,7 +260,6 @@ export default class CollegeManagePage extends React.Component {
                 {
                 {
                   initWechat && <WWOpenDataCom type="userName" openid={name} />
                   initWechat && <WWOpenDataCom type="userName" openid={name} />
                 }
                 }
-
               </span>
               </span>
               <span
               <span
                 className="logout"
                 className="logout"