优化修复网站导航的bug

src/api/cms/article/index.ts

@@ -141,3 +141,13 @@ export async function checkExistence(
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+export async function getCount(params: ArticleParam) {
+  const res = await request.get(MODULES_API_URL + '/cms/article/data', {
+    params
+  });
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/cms/article/model/index.ts

@@ -66,7 +66,7 @@ export interface ArticleParam extends PageParam {
   articleId?: number;
   categoryId?: number;
   navigationId?: number;
-  status?: string;
+  status?: number;
   sortNumber?: string;
   createTime?: string;
   username?: string;

src/api/cms/navigation/model/index.ts

@@ -4,13 +4,20 @@
 export interface Navigation {
   navigationId?: number;
   parentId?: number;
+  parentName?: string;
+  parentPath?: string;
   title?: string;
+  code?: string;
   path?: string;
   icon?: string;
   component?: string;
+  model?: string;
+  modelName?: string;
   type?: number;
   sortNumber?: number;
   hide?: number;
+  permission?: number;
+  password?: string;
   home?: number;
   position?: number;
   top?: number;
@@ -31,6 +38,8 @@ export interface Navigation {
   pageName?: string;
   createTime?: string;
   isMpWeixin?: boolean;
+  label?: string;
+  value?: number;
 }
 
 /**

src/api/cms/website/field/model/index.ts

@@ -9,6 +9,8 @@ export interface WebsiteField {
   value?: string;
   comments?: string;
   userId?: number;
+  defaultValue?: string;
+  modifyRange?: string;
   type?: number;
   status?: any;
   sortNumber?: any;

src/api/system/website/field/index.ts

@@ -4,15 +4,15 @@ import type {
   Config,
   WebsiteField,
   WebsiteFieldParam
-} from "@/api/cms/website/field/model";
-import { MODULES_API_URL } from '@/config/setting';
+} from '@/api/cms/website/field/model';
+import { MODULES_API_URL, SERVER_API_URL } from "@/config/setting";
 
 /**
  * 分页查询项目参数
  */
 export async function pageWebsiteField(params: WebsiteFieldParam) {
   const res = await request.get<ApiResult<PageResult<WebsiteField>>>(
-    MODULES_API_URL + '/cms/website-field/page',
+    SERVER_API_URL + '/system/website-field/page',
     {
       params
     }
@@ -28,7 +28,7 @@ export async function pageWebsiteField(params: WebsiteFieldParam) {
  */
 export async function listWebsiteField(params?: WebsiteFieldParam) {
   const res = await request.get<ApiResult<WebsiteField[]>>(
-    'https://modules.gxwebsoft.com/api/cms/website-field',
+    SERVER_API_URL + '/system/website-field',
     {
       params
     }
@@ -44,7 +44,7 @@ export async function listWebsiteField(params?: WebsiteFieldParam) {
  */
 export async function getWebsiteField(id: number) {
   const res = await request.get<ApiResult<WebsiteField>>(
-    MODULES_API_URL + '/cms/website-field/' + id
+    SERVER_API_URL + '/system/website-field/' + id
   );
   if (res.data.code === 0 && res.data.data) {
     return res.data.data;
@@ -57,7 +57,7 @@ export async function getWebsiteField(id: number) {
  */
 export async function addWebsiteField(data: WebsiteField) {
   const res = await request.post<ApiResult<unknown>>(
-    MODULES_API_URL + '/cms/website-field',
+    SERVER_API_URL + '/system/website-field',
     data
   );
   if (res.data.code === 0) {
@@ -71,7 +71,7 @@ export async function addWebsiteField(data: WebsiteField) {
  */
 export async function updateWebsiteField(data: WebsiteField) {
   const res = await request.put<ApiResult<unknown>>(
-    MODULES_API_URL + '/cms/website-field',
+    SERVER_API_URL + '/system/website-field',
     data
   );
   if (res.data.code === 0) {
@@ -85,7 +85,7 @@ export async function updateWebsiteField(data: WebsiteField) {
  */
 export async function removeWebsiteField(id?: number) {
   const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/cms/website-field/' + id
+    SERVER_API_URL + '/system/website-field/' + id
   );
   if (res.data.code === 0) {
     return res.data.message;
@@ -98,7 +98,7 @@ export async function removeWebsiteField(id?: number) {
  */
 export async function removeBatchWebsiteField(data: (number | undefined)[]) {
   const res = await request.delete<ApiResult<unknown>>(
-    MODULES_API_URL + '/cms/website-field/batch',
+    SERVER_API_URL + '/system/website-field/batch',
     {
       data
     }
@@ -118,7 +118,7 @@ export async function checkExistence(
   id?: number
 ) {
   const res = await request.get<ApiResult<unknown>>(
-    MODULES_API_URL + '/cms/website-field/existence',
+    SERVER_API_URL + '/system/website-field/existence',
     {
       params: { field, value, id }
     }
@@ -134,7 +134,7 @@ export async function checkExistence(
  */
 export async function configWebsiteField(params?: WebsiteFieldParam) {
   const res = await request.get<ApiResult<Config>>(
-    'https://modules.gxwebsoft.com/api/cms/website-field/config',
+    'https://modules.gxwebsoft.com/api/system/website-field/config',
     {
       params
     }
@@ -144,3 +144,16 @@ export async function configWebsiteField(params?: WebsiteFieldParam) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 恢复项目参数
+ */
+export async function undeleteWebsiteField(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/cms/website-field/undelete/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/system/website/field/model/index.ts

@@ -9,10 +9,31 @@ export interface WebsiteField {
   value?: string;
   comments?: string;
   userId?: number;
-  websiteId?: number;
+  defaultValue?: string;
+  modifyRange?: string;
+  type?: number;
   status?: any;
   sortNumber?: any;
   createTime?: string;
+  deleted?: number;
+}
+
+// 约定的网站参数名称
+export interface WebsiteParam {
+  // 网站名称
+  site_logo?: string;
+  // 登录页面标题
+  login_name?: string;
+  // 登录页面的背景图片
+  login_bg_img?: string;
+}
+
+// 约定的小程序参数名称
+export interface MpWeixinParam {
+  // 小程序LOGO
+  site_logo?: string;
+  // 我的页面顶部背景图片
+  mp_user_top?: string;
 }
 
 /**
@@ -21,5 +42,22 @@ export interface WebsiteField {
 export interface WebsiteFieldParam extends PageParam {
   id?: number;
   userId?: number;
+  name?: string;
   websiteId?: number;
 }
+
+export interface Config {
+  siteName?: string;
+  siteLogo?: string;
+  domain?: string;
+  icpNo?: string;
+  copyright?: string;
+  loginBgImg?: string;
+  address?: string;
+  tel?: string;
+  kefu2?: string;
+  kefu1?: string;
+  email?: string;
+  loginTitle?: string;
+  sysLogo?: string;
+}