gxwebsoft
/
next-10398
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复已知bug

master
科技小王子 3 months ago
parent
551e932b5c
commit
e7b8fb3823
12 changed files with 8 additions and 492 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/api/cms/cmsWebsite/model/index.ts
  2. 2
      src/api/system/company/model/index.ts
  3. 39
      src/api/system/file/index.ts
  4. 2
      src/api/system/modules/index.ts
  5. 4
      src/api/system/payment/index.ts
  6. 2
      src/api/system/user/index.ts
  7. 142
      src/api/system/website/field/index.ts
  8. 65
      src/api/system/website/field/model/index.ts
  9. 169
      src/api/system/website/index.ts
  10. 63
      src/api/system/website/model/index.ts
  11. 2
      src/components/sections/HeroSection.tsx
  12. 3
      src/config/setting.ts

7
src/api/cms/cmsWebsite/model/index.ts
View File

@ -1,7 +1,6 @@
import type { PageParam } from '@/api'; import type { PageParam } from '@/api';
import {CmsWebsiteSetting} from "@/api/cms/cmsWebsiteSetting/model"; import {CmsWebsiteSetting} from "@/api/cms/cmsWebsiteSetting/model";
import {CmsNavigation} from "@/api/cms/cmsNavigation/model"; import {CmsNavigation} from "@/api/cms/cmsNavigation/model";
import {CmsNavigation} from "@/api/cms/cmsNavigation/model";
/** /**
* 网站信息记录表 * 网站信息记录表
@ -121,18 +120,12 @@ export interface CmsWebsite {
username?: string; username?: string;
// 网站配置 // 网站配置
setting?: CmsWebsiteSetting; setting?: CmsWebsiteSetting;
// 导航菜单列表
navigations?: CmsNavigation[];
// 顶部导航菜单 // 顶部导航菜单
topNavs?: CmsNavigation[]; topNavs?: CmsNavigation[];
// 底部导航菜单 // 底部导航菜单
bottomNavs?: CmsNavigation[]; bottomNavs?: CmsNavigation[];
// 导航菜单列表 // 导航菜单列表
navigations?: CmsNavigation[]; navigations?: CmsNavigation[];
// 顶部导航菜单
topNavs?: CmsNavigation[];
// 底部导航菜单
bottomNavs?: CmsNavigation[];
} }
/** /**

2
src/api/system/company/model/index.ts
View File

@ -175,7 +175,7 @@ export interface Company {
export interface CompanyParam extends PageParam { export interface CompanyParam extends PageParam {
companyId?: number; companyId?: number;
phone?: string; phone?: string;
userId?: string;
userId?: number;
type?: number; type?: number;
tenantId?: number; tenantId?: number;
version?: number; version?: number;

39
src/api/system/file/index.ts
View File

@ -2,45 +2,6 @@ import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api'; import type { ApiResult, PageResult } from '@/api';
import type { FileRecord, FileRecordParam } from './model'; import type { FileRecord, FileRecordParam } from './model';
import { SERVER_API_URL } from '@/config/setting'; import { SERVER_API_URL } from '@/config/setting';
import { FILE_SERVER } from '@/config/setting';
/**
* 上传文件
*/
export async function uploadFileLocal(file: File, AppId: number) {
const formData = new FormData();
formData.append('file', file);
const res = await request.post<ApiResult<FileRecord>>(
FILE_SERVER + '/api/file/upload',
formData,
{
headers: { AppId }
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 上传文件
*/
export async function uploadFileLocalByCompany(file: File, CompanyId: number) {
const formData = new FormData();
formData.append('file', file);
const res = await request.post<ApiResult<FileRecord>>(
FILE_SERVER + '/api/file/upload',
formData,
{
headers: { CompanyId }
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/** /**
* 上传文件 * 上传文件

2
src/api/system/modules/index.ts
View File

@ -6,7 +6,7 @@ import { SERVER_API_URL } from '@/config/setting';
/** /**
* 分页查询角色module * 分页查询角色module
*/ */
export async function pageModules(params) {
export async function pageModules(params?: ModulesParam) {
const res = await request.get<ApiResult<PageResult<Modules>>>( const res = await request.get<ApiResult<PageResult<Modules>>>(
SERVER_API_URL + '/system/modules/page', SERVER_API_URL + '/system/modules/page',
{ params } { params }

4
src/api/system/payment/index.ts
View File

@ -2,7 +2,7 @@ import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api'; import type { ApiResult, PageResult } from '@/api';
import type { Payment, PaymentParam } from './model'; import type { Payment, PaymentParam } from './model';
import { SERVER_API_URL } from '@/config/setting'; import { SERVER_API_URL } from '@/config/setting';
import type { Order } from '@/api/shop/order/model';
import type { ShopOrder } from '@/api/shop/shopOrder/model';
/** /**
* 分页查询支付方式 * 分页查询支付方式
@ -109,7 +109,7 @@ export async function getPayment(id: number) {
/** /**
* 生成支付二维码(微信native) * 生成支付二维码(微信native)
*/ */
export async function getNativeCode(data: Order) {
export async function getNativeCode(data: ShopOrder) {
const res = await request.post<ApiResult<unknown>>( const res = await request.post<ApiResult<unknown>>(
SERVER_API_URL + '/system/wx-native-pay/codeUrl', SERVER_API_URL + '/system/wx-native-pay/codeUrl',
data data

2
src/api/system/user/index.ts
View File

@ -155,7 +155,7 @@ export async function updateUserStatus(userId?: number, status?: number) {
/** /**
* 修改推荐状态 * 修改推荐状态
*/ */
export async function updateUserRecommend(form) {
export async function updateUserRecommend(form: UserParam) {
const res = await request.put<ApiResult<unknown>>( const res = await request.put<ApiResult<unknown>>(
SERVER_API_URL + '/system/user/recommend', SERVER_API_URL + '/system/user/recommend',
form form

142
src/api/system/website/field/index.ts
View File

@ -1,142 +0,0 @@
import request from '@/utils/request';
import type {ApiResult, PageResult} from '@/api';
import type {
CmsWebsiteField,
CmsWebsiteFieldParam
} from '@/api/cms/cmsWebsiteField/model';
import {COMMON_API_URL, SERVER_API_URL} from '@/config/setting';
/**
* 分页查询项目参数
*/
export async function pageWebsiteField(params: CmsWebsiteFieldParam) {
const res = await request.get<ApiResult<PageResult<CmsWebsiteField>>>(
COMMON_API_URL + '/system/website-field/page',
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询项目参数列表
*/
export async function listWebsiteField(params?: CmsWebsiteFieldParam) {
const res = await request.get<ApiResult<CmsWebsiteField[]>>(
SERVER_API_URL + '/system/website-field',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询项目参数
*/
export async function getWebsiteField(id: number) {
const res = await request.get<ApiResult<CmsWebsiteField>>(
SERVER_API_URL + '/system/website-field/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加项目参数
*/
export async function addWebsiteField(data: CmsWebsiteField) {
const res = await request.post<ApiResult<unknown>>(
SERVER_API_URL + '/system/website-field',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改项目参数
*/
export async function updateWebsiteField(data: CmsWebsiteField) {
const res = await request.put<ApiResult<unknown>>(
SERVER_API_URL + '/system/website-field',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除项目参数
*/
export async function removeWebsiteField(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
SERVER_API_URL + '/system/website-field/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除项目参数
*/
export async function removeBatchWebsiteField(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
SERVER_API_URL + '/system/website-field/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 检查IP是否存在
*/
export async function checkExistence(
field: string,
value: string,
id?: number
) {
const res = await request.get<ApiResult<unknown>>(
SERVER_API_URL + '/system/website-field/existence',
{
params: {field, value, id}
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 恢复项目参数
*/
export async function undeleteWebsiteField(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
SERVER_API_URL + '/system/website-field/undelete/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}

65
src/api/system/website/field/model/index.ts
View File

@ -1,65 +0,0 @@
import type { PageParam } from '@/api';
/**
* 网站参数
*/
export interface WebsiteField {
id?: number;
name?: string;
value?: string;
comments?: string;
userId?: number;
template?: string;
defaultValue?: string;
modifyRange?: string;
type?: number;
status?: any;
sortNumber?: any;
createTime?: string;
deleted?: number;
style?: string;
}
// 约定的网站参数名称
export interface WebsiteParam {
// 网站名称
site_logo?: string;
// 登录页面标题
login_name?: string;
// 登录页面的背景图片
login_bg_img?: string;
}
// 约定的小程序参数名称
export interface MpWeixinParam {
// 小程序LOGO
site_logo?: string;
// 我的页面顶部背景图片
mp_user_top?: string;
}
/**
* 网站参数搜索条件
*/
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;
}

169
src/api/system/website/index.ts
View File

@ -1,169 +0,0 @@
import request from '@/utils/request';
import type { ApiResult, PageResult } from '@/api';
import type { Website, WebsiteParam } from './model';
import { MODULES_API_URL } from '@/config/setting';
/**
* 获取网站信息
*/
export async function getSiteInfo() {
const res = await request.get<ApiResult<Website>>(
MODULES_API_URL + '/cms/website/getSiteInfo'
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 清除缓存
*/
export async function removeSiteInfoCache(key?: string) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/cms/website/clearSiteInfo/' + key
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 分页查询网站
*/
export async function pageWebsite(params: WebsiteParam) {
const res = await request.get<ApiResult<PageResult<Website>>>(
MODULES_API_URL + '/cms/website/page',
{
params
}
);
if (res.data.code === 0) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 查询网站列表
*/
export async function listWebsite(params?: WebsiteParam) {
const res = await request.get<ApiResult<Website[]>>(
MODULES_API_URL + '/cms/website',
{
params
}
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 添加网站
*/
export async function addWebsite(data: Website) {
const res = await request.post<ApiResult<unknown>>(
MODULES_API_URL + '/cms/website',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改网站
*/
export async function updateWebsite(data: Website) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/cms/website',
data
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 删除网站
*/
export async function removeWebsite(id?: number) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/cms/website/' + id
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 批量删除网站
*/
export async function removeBatchWebsite(data: (number | undefined)[]) {
const res = await request.delete<ApiResult<unknown>>(
MODULES_API_URL + '/cms/website/batch',
{
data
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 修改用户状态
*/
export async function updateWebsiteStatus(websiteId?: number, status?: number) {
const res = await request.put<ApiResult<unknown>>(
MODULES_API_URL + '/cms/website/status',
{
websiteId,
status
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 根据id查询网站
*/
export async function getWebsite(id: number) {
const res = await request.get<ApiResult<Website>>(
MODULES_API_URL + '/cms/website/' + id
);
if (res.data.code === 0 && res.data.data) {
return res.data.data;
}
return Promise.reject(new Error(res.data.message));
}
/**
* 检查IP是否存在
*/
export async function checkExistence(
field: string,
value: string,
id?: number
) {
const res = await request.get<ApiResult<unknown>>(
MODULES_API_URL + '/cms/website/existence',
{
params: { field, value, id }
}
);
if (res.data.code === 0) {
return res.data.message;
}
return Promise.reject(new Error(res.data.message));
}

63
src/api/system/website/model/index.ts
View File

@ -1,63 +0,0 @@
import { WebsiteField } from '@/api/cms/website/field/model';
import { Navigation } from '@/api/cms/navigation/model';
import { Link } from '@/api/cms/link/model';
import { ArrangeCategory } from '@/api/cms/category/model';
import { PageParam } from '@/api';
/**
* 菜单
*/
export interface Website {
websiteId?: number;
websiteName?: string;
websiteCode?: string;
websiteIcon?: string;
websiteLogo?: string;
websiteDarkLogo?: string;
keywords?: string;
address?: string;
phone?: string;
email?: string;
version?: number;
websiteType?: string;
expirationTime?: string;
templateId?: string;
industryParent?: string;
industryChild?: string;
companyId?: number;
prefix?: string;
domain?: string;
adminUrl?: string;
icpNo?: string;
policeNo?: string;
comments?: string;
statusText?: string;
sortNumber?: number;
createTime?: string;
disabled?: boolean;
country?: string;
province?: string;
city?: string;
region?: string;
appId?: number;
fields?: WebsiteField[];
status?: number;
tenantId?: number;
tenantName?: string;
navigations?: Navigation[];
categoryList?: ArrangeCategory[];
links?: Link[];
// 配置信息
config?: any;
style?: string;
}
/**
* 菜单搜索参数
*/
export interface WebsiteParam extends PageParam {
title?: string;
path?: string;
authority?: string;
parentId?: number;
}

2
src/components/sections/HeroSection.tsx
View File

@ -1,7 +1,5 @@
'use client'; 'use client';
import Link from 'next/link';
const HeroSection = () => { const HeroSection = () => {
return ( return (
<section className="bg-gradient-to-br from-green-50 to-green-100 py-20 lg:py-32"> <section className="bg-gradient-to-br from-green-50 to-green-100 py-20 lg:py-32">

3
src/config/setting.ts
View File

@ -25,6 +25,9 @@ export const UPLOAD_API_URL = 'https://cms-api.websoft.top/api/upload';
*/ */
export const TEMPLATE_ID = '10258'; export const TEMPLATE_ID = '10258';
// 文件服务器地址
export const FILE_SERVER = 'https://oss.wsnds.cn';
// ==================== 环境配置 ==================== // ==================== 环境配置 ====================
/** /**

Write Preview
Loading…
Cancel
Save