新版本官网优化完成

api/system/company/index.ts

@@ -1,7 +1,7 @@
-import request from '@/utils/request';
+import request from '~/utils/request';
 import type { ApiResult } from '@/api';
 import type { Company, CompanyParam } from './model';
-import { PageResult } from '@/api';
+import type { PageResult } from '@/api';
 import { SERVER_API_URL } from '@/config';
 
 /**
@@ -14,10 +14,10 @@ export async function getCompany(params?: CompanyParam) {
       params
     }
   );
-  if (res.data.code === 0 && res.data.data) {
-    return res.data.data;
+  if (res.code === 0 && res.data) {
+    return res.data;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
@@ -27,11 +27,11 @@ export async function getCompanyAll(companyId: number) {
   const res = await request.get<ApiResult<Company>>(
     SERVER_API_URL + '/system/company/profileAll/' + companyId
   );
-  if (res.data.code === 0 && res.data) {
+  if (res.code === 0 && res.data) {
     console.log(res.data);
-    return res.data.data;
+    return res.data;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
@@ -42,10 +42,10 @@ export async function pageCompany(params: CompanyParam) {
     SERVER_API_URL + '/system/company/page',
     { params }
   );
-  if (res.data.code === 0) {
-    return res.data.data;
+  if (res.code === 0) {
+    return res.data;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
@@ -56,10 +56,10 @@ export async function pageCompanyAll(params: CompanyParam) {
     SERVER_API_URL + '/system/company/pageAll',
     { params }
   );
-  if (res.data.code === 0) {
-    return res.data.data;
+  if (res.code === 0) {
+    return res.data;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
@@ -70,10 +70,10 @@ export async function addCompany(data: Company) {
     SERVER_API_URL + '/system/company',
     data
   );
-  if (res.data.code === 0) {
-    return res.data.message;
+  if (res.code === 0) {
+    return res.message;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
@@ -84,10 +84,10 @@ export async function updateCompany(data: Company) {
     SERVER_API_URL + '/system/company',
     data
   );
-  if (res.data.code === 0) {
-    return res.data.message;
+  if (res.code === 0) {
+    return res.message;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
@@ -98,50 +98,50 @@ export async function updateCompanyAll(data: Company) {
     SERVER_API_URL + '/system/company/updateCompanyAll',
     data
   );
-  if (res.data.code === 0) {
-    return res.data.message;
+  if (res.code === 0) {
+    return res.message;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
  * 删除Company
  */
 export async function removeCompany(id?: number) {
-  const res = await request.delete<ApiResult<unknown>>(
+  const res = await request.del<ApiResult<unknown>>(
     SERVER_API_URL + '/system/company/' + id
   );
-  if (res.data.code === 0) {
-    return res.data.message;
+  if (res.code === 0) {
+    return res.message;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 // 销毁租户
 export async function destructionTenant(id?: number) {
-  const res = await request.delete<ApiResult<unknown>>(
+  const res = await request.del<ApiResult<unknown>>(
     SERVER_API_URL + '/system/company/destruction/' + id
   );
-  if (res.data.code === 0) {
-    return res.data.message;
+  if (res.code === 0) {
+    return res.message;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
  * 批量删除Company
  */
 export async function removeBatchCompany(data: (number | undefined)[]) {
-  const res = await request.delete<ApiResult<unknown>>(
+  const res = await request.del<ApiResult<unknown>>(
     SERVER_API_URL + '/system/company/batch',
     {
       data
     }
   );
-  if (res.data.code === 0) {
-    return res.data.message;
+  if (res.code === 0) {
+    return res.message;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 export async function checkExistence(
@@ -155,8 +155,8 @@ export async function checkExistence(
       params: { field, value, id }
     }
   );
-  if (res.data.code === 0) {
-    return res.data.message;
+  if (res.code === 0) {
+    return res.message;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }

api/system/company/model/index.ts

@@ -10,7 +10,6 @@ export interface Company {
   companyId?: number;
   type?: number;
   menuId?: number;
-  appName?: string;
   shortName?: string;
   companyName?: string;
   companyType?: number;
@@ -56,7 +55,6 @@ export interface Company {
   userId?: number;
   official?: boolean;
   price?: number;
-  deliveryMethod?: number;
   chargingMethod?: number;
   planId?: number;
   sortNumber?: number;
@@ -103,7 +101,7 @@ export interface Company {
  */
 export interface CompanyParam extends PageParam {
   companyId?: number;
-  type?: number;
+  type?: any;
   official?: boolean;
   shortName?: string;
   companyName?: string;
@@ -119,4 +117,5 @@ export interface CompanyParam extends PageParam {
   status?: number;
   recommend?: boolean;
   collection?: boolean;
+  limit?: number;
 }