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

src/common/js/axios.ts

@@ -90,8 +90,7 @@ class Axios {
 
 
       instance.interceptors.response.use((response: AxiosResponse): AxiosResponse | AxiosPromise => {
       instance.interceptors.response.use((response: AxiosResponse): AxiosResponse | AxiosPromise => {
         const { message: ResMessage, success, resultMsg, code: resultCode } = response.data;
         const { message: ResMessage, success, resultMsg, code: resultCode } = response.data;
-        const requestStatus = response.status;
-        if (requestStatus === 10001) {
+        if (resultCode === 10001) {
           Modal.warning({
           Modal.warning({
             title:"服务已到期",
             title:"服务已到期",
             content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
             content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",

src/modules/root/Menu.less

@@ -148,6 +148,7 @@
     bottom: 0;
     bottom: 0;
     width: 100%;
     width: 100%;
     cursor: pointer;
     cursor: pointer;
+    z-index: -1;
     .row-1 {
     .row-1 {
       width: fit-content;
       width: fit-content;
       font-size: 14px;
       font-size: 14px;

src/modules/root/Menu.tsx

@@ -257,7 +257,7 @@ function Aside(props: any) {
                 return <Menu.Item 
                 return <Menu.Item 
                         onClick={() => { toggleMenu(item) }} 
                         onClick={() => { toggleMenu(item) }} 
                         key={item.groupCode} 
                         key={item.groupCode} 
-                        icon={selectKey === item.groupCode ? <img src={item.selectImg} className="icon-img"></img>:<img src={item.img} className="icon-img"></img>}
+                        icon={<img src={selectKey === item.groupCode ? item.selectImg : item.img} className="icon-img"></img>}
                         >
                         >
                     {menuType ? item.groupName : ""}
                     {menuType ? item.groupName : ""}
                 </Menu.Item>
                 </Menu.Item>