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

src/common/js/axios.ts

@@ -90,7 +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;
-        if (resultCode === 10001) {
+        if (resultCode === "CROP_DEPLOY_PAST_BETTER") {
           Modal.warning({
           Modal.warning({
             title:"服务已到期",
             title:"服务已到期",
             content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
             content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
@@ -119,13 +119,6 @@ class Axios {
             window.RCHistory.replace('/login');
             window.RCHistory.replace('/login');
             return Promise.reject();
             return Promise.reject();
           break;
           break;
-          case 10001:
-            Modal.warning({
-              title:"服务已到期",
-              content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
-              okText: "我知道了"
-            })
-            break;
           default:
           default:
             message.error(error.message);
             message.error(error.message);
             console.log('222');
             console.log('222');