Commit d64efc4f by wufan

Merge branch 'feature/zhangleyuan/20210814/week-optimize' into 'master'

Feature/zhangleyuan/20210814/week optimize

See merge request !94
parents 92998a29 1131d310
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-31 09:34:31 * @Date: 2020-08-31 09:34:31
* @LastEditors: yuananting * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-12 17:40:26 * @LastEditTime: 2021-08-17 16:27:31
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -102,6 +102,12 @@ class Axios { ...@@ -102,6 +102,12 @@ class Axios {
content: "直播进行中,无法删除直播", content: "直播进行中,无法删除直播",
okText: "我知道了" okText: "我知道了"
}) })
}else if(resultCode === 'STORE_NUM_FULL'){
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) {
......
...@@ -427,8 +427,8 @@ class Home extends React.Component { ...@@ -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='' /> <img src='https://image.xiaomaiketang.com/xm/fFnpKMJD6x.png' alt='' />
<div>暂无课程上榜</div> <div className="text">暂无学员上榜</div>
</div> </div>
</When> </When>
<Otherwise> <Otherwise>
......
...@@ -240,13 +240,13 @@ ...@@ -240,13 +240,13 @@
margin-top: 102px; margin-top: 102px;
img { img {
display: block; display: block;
width: 100px; width: 150px;
height: 100px; 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 {
......
...@@ -261,7 +261,6 @@ export default class CollegeManagePage extends React.Component { ...@@ -261,7 +261,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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment