diff --git a/api/cms/ad/index.ts b/api/cms/ad/index.ts index 356d5fd..6139cd4 100644 --- a/api/cms/ad/index.ts +++ b/api/cms/ad/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Ad, AdParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询广告位 diff --git a/api/cms/article/index.ts b/api/cms/article/index.ts index 2dcf6ee..d21582d 100644 --- a/api/cms/article/index.ts +++ b/api/cms/article/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Article, ArticleParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询文章 diff --git a/api/cms/article/model/index.ts b/api/cms/article/model/index.ts index 0486f45..908f8ad 100644 --- a/api/cms/article/model/index.ts +++ b/api/cms/article/model/index.ts @@ -14,6 +14,8 @@ export interface Article { showType?: any; // 文章类型 categoryId?: number; + // 文章分类 + categoryName?: string; // 封面图 image?: string; // 附件 diff --git a/api/cms/category/index.ts b/api/cms/category/index.ts index 1bceeea..e1835ad 100644 --- a/api/cms/category/index.ts +++ b/api/cms/category/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { ArticleCategory, ArticleCategoryParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询文章分类 diff --git a/api/cms/design/index.ts b/api/cms/design/index.ts index 6631dde..910a4f8 100644 --- a/api/cms/design/index.ts +++ b/api/cms/design/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Design, DesignParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询页面设计 diff --git a/api/cms/docs-book/index.ts b/api/cms/docs-book/index.ts index a764abe..b3e4937 100644 --- a/api/cms/docs-book/index.ts +++ b/api/cms/docs-book/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { DocsBook, DocsBookParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询书籍 diff --git a/api/cms/docs-content/index.ts b/api/cms/docs-content/index.ts index b840e2b..f263076 100644 --- a/api/cms/docs-content/index.ts +++ b/api/cms/docs-content/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { DocsContent, DocsContentParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询文档 diff --git a/api/cms/docs/index.ts b/api/cms/docs/index.ts index d67672c..6036e90 100644 --- a/api/cms/docs/index.ts +++ b/api/cms/docs/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Docs, DocsParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询文档 diff --git a/api/cms/domain/index.ts b/api/cms/domain/index.ts index 3689b4b..2af1adb 100644 --- a/api/cms/domain/index.ts +++ b/api/cms/domain/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Domain, DomainParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询网站域名 diff --git a/api/cms/form-record/index.ts b/api/cms/form-record/index.ts index 110f4c4..2df2910 100644 --- a/api/cms/form-record/index.ts +++ b/api/cms/form-record/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { FormRecord, FormRecordParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询表单设计 diff --git a/api/cms/form/index.ts b/api/cms/form/index.ts index 7679845..5f69d24 100644 --- a/api/cms/form/index.ts +++ b/api/cms/form/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Form, FormParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询表单设计 diff --git a/api/cms/link/index.ts b/api/cms/link/index.ts index e18a108..bf50f6d 100644 --- a/api/cms/link/index.ts +++ b/api/cms/link/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Link, LinkParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询链接 diff --git a/api/cms/mp-menu/index.ts b/api/cms/mp-menu/index.ts index 72153dc..fe8d53e 100644 --- a/api/cms/mp-menu/index.ts +++ b/api/cms/mp-menu/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { MpMenu, MpMenuParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询小程序端菜单 diff --git a/api/cms/mp/index.ts b/api/cms/mp/index.ts index dd9f106..7f3ba93 100644 --- a/api/cms/mp/index.ts +++ b/api/cms/mp/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Mp, MpParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询小程序信息 diff --git a/api/cms/mpAd/index.ts b/api/cms/mpAd/index.ts index 379b06e..ab4b468 100644 --- a/api/cms/mpAd/index.ts +++ b/api/cms/mpAd/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { MpAd, MpAdParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询小程序广告位 diff --git a/api/cms/mpField/index.ts b/api/cms/mpField/index.ts index 8edb923..f3d69a6 100644 --- a/api/cms/mpField/index.ts +++ b/api/cms/mpField/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { MpField, MpFieldParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询小程序配置 diff --git a/api/cms/mpPages/index.ts b/api/cms/mpPages/index.ts index eed003b..fbbf48a 100644 --- a/api/cms/mpPages/index.ts +++ b/api/cms/mpPages/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { MpPages, MpPagesParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询小程序页面 diff --git a/api/cms/navigation/index.ts b/api/cms/navigation/index.ts index e71feab..56f656a 100644 --- a/api/cms/navigation/index.ts +++ b/api/cms/navigation/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Navigation, NavigationParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 分页查询导航 @@ -141,3 +141,20 @@ export async function checkExistence( } return Promise.reject(new Error(res.data.message)); } + +/** + * 树形结构 + * @param params + */ +export async function treeNavigation(params?: NavigationParam) { + const res = await request.get>( + MODULES_API_URL + '/cms/navigation/tree', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/api/cms/website/field/index.ts b/api/cms/website/field/index.ts index b621b51..0f19fdf 100644 --- a/api/cms/website/field/index.ts +++ b/api/cms/website/field/index.ts @@ -4,7 +4,8 @@ import type { WebsiteField, WebsiteFieldParam } from '@/api/cms/website/field/model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; +import type {Config} from "~/types/config"; /** * 分页查询项目参数 @@ -140,3 +141,20 @@ export async function undeleteWebsiteField(id?: number) { } return Promise.reject(new Error(res.data.message)); } + + +/** + * 查询网站参数(对象形式) + */ +export async function getSiteConfig(params: WebsiteFieldParam) { + const res = await request.get>( + MODULES_API_URL + '/cms/website-field/config', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/api/cms/website/index.ts b/api/cms/website/index.ts index 133fe1a..831512d 100644 --- a/api/cms/website/index.ts +++ b/api/cms/website/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { Website, WebsiteParam } from './model'; -import { MODULES_API_URL } from '@/config/setting'; +import { MODULES_API_URL } from '~/config'; /** * 获取网站信息 diff --git a/api/layout/index.ts b/api/layout/index.ts index 08282dc..68b1533 100644 --- a/api/layout/index.ts +++ b/api/layout/index.ts @@ -2,7 +2,7 @@ import request from '@/utils/request'; import type { ApiResult } from '@/api'; import type { User } from '@/api/system/user/model'; import type { UpdatePasswordParam, NoticeResult } from './model'; -import { MODULES_API_URL, SERVER_API_URL } from '@/config/setting'; +import { MODULES_API_URL, SERVER_API_URL } from '~/config'; import type {Website} from "~/api/cms/website/model"; /** diff --git a/api/passport/login/index.ts b/api/passport/login/index.ts index a58b719..bbec0fd 100644 --- a/api/passport/login/index.ts +++ b/api/passport/login/index.ts @@ -7,7 +7,7 @@ import type { CaptchaResult, SmsCaptchaResult } from './model'; -import { SERVER_API_URL } from '@/config/setting'; +import { SERVER_API_URL } from '~/config'; /** * 登录 diff --git a/assets/css/main.css b/assets/css/main.css index 50e29fb..5cd6764 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -5,7 +5,7 @@ body { margin: 0; - font-family: "Microsoft YaHei", "微软雅黑", "STHeiti", "WenQuanYi Micro Hei", SimSun, sans-serif; + font-family: Inter, "Inter Fallback: Arial",ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji; font-size: 14px; line-height: 140%; } @@ -28,7 +28,7 @@ h1, h2, h3, h4, h5, h6 { } .container { - width: 1380px; + width: 1280px !important; margin: 0 auto; } diff --git a/assets/images/icon_1.png b/assets/images/icon_1.png new file mode 100644 index 0000000..6ff32a9 Binary files /dev/null and b/assets/images/icon_1.png differ diff --git a/assets/images/icon_12.png b/assets/images/icon_12.png new file mode 100644 index 0000000..8fa98fb Binary files /dev/null and b/assets/images/icon_12.png differ diff --git a/assets/images/icon_2.png b/assets/images/icon_2.png new file mode 100644 index 0000000..a00e29b Binary files /dev/null and b/assets/images/icon_2.png differ diff --git a/assets/images/icon_26.png b/assets/images/icon_26.png new file mode 100644 index 0000000..4ecc9e5 Binary files /dev/null and b/assets/images/icon_26.png differ diff --git a/assets/images/icon_30.png b/assets/images/icon_30.png new file mode 100644 index 0000000..02aedb5 Binary files /dev/null and b/assets/images/icon_30.png differ diff --git a/assets/images/jlt.png b/assets/images/jlt.png new file mode 100644 index 0000000..e410ede Binary files /dev/null and b/assets/images/jlt.png differ diff --git a/assets/images/toux.png b/assets/images/toux.png new file mode 100644 index 0000000..33f572d Binary files /dev/null and b/assets/images/toux.png differ diff --git a/assets/logo.png b/assets/logo.png new file mode 100644 index 0000000..7ac6c2d Binary files /dev/null and b/assets/logo.png differ diff --git a/assets/scss/var.scss b/assets/scss/var.scss new file mode 100644 index 0000000..ebb54c2 --- /dev/null +++ b/assets/scss/var.scss @@ -0,0 +1,3 @@ +$drak-blue: #292838; + +$light-gray: #666; diff --git a/components/AppFooter.vue b/components/AppFooter.vue index 83d6a7b..061a814 100644 --- a/components/AppFooter.vue +++ b/components/AppFooter.vue @@ -1,4 +1,5 @@ diff --git a/pages/product/[name].vue b/pages/product/[name].vue new file mode 100644 index 0000000..29e69be --- /dev/null +++ b/pages/product/[name].vue @@ -0,0 +1,76 @@ + + + + diff --git a/pages/product/index.vue b/pages/product/index.vue new file mode 100644 index 0000000..04cc918 --- /dev/null +++ b/pages/product/index.vue @@ -0,0 +1,61 @@ + + + + diff --git a/pages/search/index.vue b/pages/search/index.vue index 5094b3f..fef1da5 100644 --- a/pages/search/index.vue +++ b/pages/search/index.vue @@ -61,7 +61,7 @@