新版本官网优化完成

api/layout/index.ts

@@ -1,32 +1,35 @@
-import request from '@/utils/request';
+import request from '~/utils/request';
 import type { ApiResult } from '@/api';
 import type { User } from '@/api/system/user/model';
 import type { UpdatePasswordParam } from './model';
-import { MODULES_API_URL, SERVER_API_URL } from '~/config';
-import type {Website} from "~/api/cms/website/model";
+import type {CmsWebsite, CmsWebsiteParam} from "~/api/cms/cmsWebsite/model";
 
 /**
  * 获取网站信息
  */
-export async function getSiteInfo() {
-  const res = await request.get<ApiResult<Website>>(
-    MODULES_API_URL + '/cms/website/getSiteInfo'
+export async function getSiteInfo(params: CmsWebsiteParam) {
+  const res = await request.get<ApiResult<CmsWebsite>>(
+    '/cms/cms-website/getSiteInfo',
+      {
+        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));
 }
 
 /**
  * 获取当前登录的用户信息、菜单、权限、角色
  */
 export async function getUserInfo(): Promise<User> {
-  const res = await request.get<ApiResult<User>>(SERVER_API_URL + '/auth/user');
-  if (res.data.code === 0 && res.data.data) {
-    return res.data.data;
+  const config = useRuntimeConfig();
+  const res = await request.get<ApiResult<User>>(config.public.apiServer + '/auth/user');
+  if (res.code === 0 && res.data) {
+    return res.data;
   }
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
@@ -35,12 +38,12 @@ export async function getUserInfo(): Promise<User> {
  */
 export async function getServerTime() {
   const res = await request.get<ApiResult<any>>(
-    MODULES_API_URL + '/cms/website/getServerTime'
+    '/cms/website/getServerTime'
   );
-  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));
 }
 
 /**
@@ -49,13 +52,13 @@ export async function getServerTime() {
  */
 export async function getNext7day() {
   const res = await request.get<ApiResult<any>>(
-    MODULES_API_URL + '/cms/website/getNext7day'
+    '/cms/website/getNext7day'
   );
   console.log('res.data.code: ', res.data.code);
-  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));
 }
 
 /**
@@ -64,7 +67,7 @@ export async function getNext7day() {
  */
 export async function transferToken(url: string): Promise<string> {
   const res = await request.get<ApiResult<unknown>>(url);
-  return Promise.reject(new Error(res.data.message));
+  return Promise.reject(new Error(res.message));
 }
 
 /**
@@ -74,11 +77,11 @@ export async function updatePassword(
   data: UpdatePasswordParam
 ): Promise<string> {
   const res = await request.put<ApiResult<unknown>>(
-    SERVER_API_URL + '/auth/password',
+    '/auth/password',
     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));
 }

api/layout/model/index.ts

@@ -13,6 +13,9 @@ export interface Layout {
   backgroundColor?: string;
   headerStyle?: any;
   siteNameStyle?: any;
+  showBanner?: boolean;
+  // 背景图片
+  banner?: string;
 }
 
 /**