Merge remote-tracking branch 'origin/feature/0902_antd组件替换' into test
# Conflicts: # src/App.vue # src/components/common-select/index.vue # src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue # src/views/components/login/index.vue # src/views/home/components/history-conversation-drawer/index.vue # src/views/login/style.scss # src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue
This commit is contained in:
@ -8,7 +8,7 @@
|
||||
|
||||
import router from '@/router';
|
||||
import { clearToken } from '@/utils/auth';
|
||||
import { Message } from '@arco-design/web-vue';
|
||||
import { message } from 'ant-design-vue';
|
||||
|
||||
/**
|
||||
* 处理业务逻辑定义的错误code
|
||||
@ -28,5 +28,5 @@ export const handleCodeError = (error: any) => {
|
||||
default:
|
||||
errMessage = error.msg || `未知错误-${error.code}`;
|
||||
}
|
||||
Message.error(errMessage);
|
||||
message.error(errMessage);
|
||||
};
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
import axios from 'axios';
|
||||
import { message } from 'ant-design-vue';
|
||||
import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
|
||||
import { handleUserLogout, goUserLogin } from '@/utils/user';
|
||||
import { useEnterpriseStore } from '@/stores/modules/enterprise';
|
||||
@ -84,7 +85,7 @@ export class Request {
|
||||
break;
|
||||
}
|
||||
|
||||
AMessage.error(errMessage);
|
||||
message.error(errMessage);
|
||||
return Promise.reject(err.response);
|
||||
},
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user