Merge remote-tracking branch 'origin/feature/v1.3_营销资产中台' into feature/v1.3_营销资产中台

# Conflicts:
#	src/api/all/propertyMarketing.ts

src/api/all/common.ts

@@ -6,10 +6,10 @@ import Http from '@/api';
 
 // 获取用户自定义列
 export const getCustomColumns = (params = {}) => {
-  return Http.get('/v1/user-custom-columns', params);
+  return Http.get('/v1/custom-columns', params);
 };
 
 // 保存用户自定义列
 export const updateCustomColumns = (params = {}) => {
-  return Http.put('/v1/user-custom-columns', params);
+  return Http.put('/v1/custom-columns', params);
 };

src/api/all/propertyMarketing.ts

@@ -19,16 +19,21 @@ export const fetchAccountOperators = (params = {}) => {
   return Http.get('/v1/media-account-operators/list', params);
 };
 
-// 投放账户运营人员分组-列表
-export const fetchPlacementAccountOperators = (params = {}) => {
-  return Http.get('/v1/placement-account-operators/list', params);
-};
-
 // 媒体账号-分页
 export const getMediaAccounts = (params = {}) => {
   return Http.get('/v1/media-accounts', params);
 };
 
+// 媒体账号-健康情况
+export const getMediaAccountsHealth = (params = {}) => {
+  return Http.get('/v1/media-accounts/health', params);
+};
+
+// 投放账号-健康情况
+export const getPlacementAccountsHealth = (params = {}) => {
+  return Http.get('/v1/placement-accounts/health', params);
+};
+
 // 媒体账号-添加
 export const postMediaAccounts = (params = {}) => {
   return Http.post('/v1/media-accounts', params);
@@ -298,3 +303,8 @@ export const getPlacementGuide = (params: {}) => {
 export const getAiResult = (params: {}) => {
   return Http.get(`/v1/placement-guide/getAiResult`);
 };
+
+// 投放账号-列表
+export const getPlacementAccountsList = (params = {}) => {
+  return Http.get('/v1/placement-accounts/list', params);
+};

src/api/index.ts

@@ -2,7 +2,7 @@
  * @Author: 田鑫
  * @Date: 2023-02-17 11:58:44
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-06-23 05:51:32
+ * @LastEditTime: 2025-07-05 17:59:59
  * @Description:
  */
 
@@ -16,7 +16,7 @@ const contentType = 'application/json';
 const requestTimeout = 30000;
 
 enum HttpStatusCode {
-  OK = 200,
+  Success = 200,
   BadRequest = 400, // 请求参数错误
   Unauthorized = 401, // token 无效或过期
   NotFound = 404,
@@ -62,22 +62,30 @@ export class Request {
       (res: AxiosResponse) => {
         const { data } = res;
         switch (data.code) {
-          case HttpStatusCode.OK:
+          case HttpStatusCode.Success:
             return data;
           default:
             return Promise.reject(data);
         }
       },
       (err: any) => {
-        const { message, code } = err.response?.data ?? {};
-        AMessage.error(message ?? err.message);
+        const { response } = err;
+        const status = response?.status;
+        let errMessage = response?.data?.message ?? err.message;
 
-        switch (code) {
+        switch (status) {
+          case HttpStatusCode.InternalServerError:
+            errMessage = '系统繁忙，请稍后再试或联系管理员。';
+            break;
+          case HttpStatusCode.NotFound:
+            errMessage = '接口不存在';
+            break;
           case HttpStatusCode.Unauthorized:
-            goUserLogin();
+            handleUserLogout();
             break;
         }
 
+        AMessage.error(errMessage);
         return Promise.reject(err.response);
       },
     );