From 6d403f1611fbf7164191a4be59bcdaba977965e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 30 Sep 2024 00:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E9=A1=B5=E9=9D=A2=E5=8F=8A=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/oa/product/model/index.ts | 4 + api/shop/goodsCoupon/model/index.ts | 10 +- components/AppHeader.vue | 1 + nuxt.config.ts | 4 +- pages/product/checkout/index.vue | 219 ++++++++++++++++ pages/product/components/CardList.vue | 7 +- .../product/create/components/PageBanner.vue | 93 +++++++ pages/product/create/index.vue | 245 ++++++++++++++++++ pages/product/createWebsite/index.vue | 25 ++ pages/product/createWebsite/index2.vue | 25 ++ utils/common.ts | 4 +- 11 files changed, 624 insertions(+), 13 deletions(-) create mode 100644 pages/product/checkout/index.vue create mode 100644 pages/product/create/components/PageBanner.vue create mode 100644 pages/product/create/index.vue create mode 100644 pages/product/createWebsite/index.vue create mode 100644 pages/product/createWebsite/index2.vue diff --git a/api/oa/product/model/index.ts b/api/oa/product/model/index.ts index 066042c..064bd20 100644 --- a/api/oa/product/model/index.ts +++ b/api/oa/product/model/index.ts @@ -18,8 +18,12 @@ export interface Product { content?: string; // 父级分类ID parentId?: number; + // 父级栏目名称 + parentName?: string; // 产品分类ID categoryId?: number; + // 产品分类名称 + categoryName?: string; // 产品规格 0单规格 1多规格 specs?: number; // 货架 diff --git a/api/shop/goodsCoupon/model/index.ts b/api/shop/goodsCoupon/model/index.ts index 9c9f78d..109215d 100644 --- a/api/shop/goodsCoupon/model/index.ts +++ b/api/shop/goodsCoupon/model/index.ts @@ -4,14 +4,14 @@ import type { PageParam } from '@/api'; * 商品优惠券表 */ export interface GoodsCoupon { - // - id?: number; + // + id?: undefined, // 商品id - goodsId?: number; + goodsId?: undefined, // 优惠劵id - issueCouponId?: number; + issueCouponId?: undefined, // 排序(数字越小越靠前) - sortNumber?: number; + sortNumber?: undefined, // 状态, 0正常, 1冻结 status?: number; // 是否删除, 0否, 1是 diff --git a/components/AppHeader.vue b/components/AppHeader.vue index 2924762..ef32489 100644 --- a/components/AppHeader.vue +++ b/components/AppHeader.vue @@ -189,6 +189,7 @@ const reload = async () => { sysDomain.value = company.value?.data?.domain; localStorage.setItem('SysDomain', `${company.value?.data?.domain}`); } + } } diff --git a/nuxt.config.ts b/nuxt.config.ts index 9b8377c..0c9cc42 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -33,10 +33,10 @@ export default defineNuxtConfig({ public: { // 开发环境配置 // tenantId: '5', - apiServer: 'http://127.0.0.1:30000/api', + // apiServer: 'http://127.0.0.1:30000/api', // 生产环境 - // apiServer: 'https://common-api.websoft.top/api', + apiServer: 'https://common-api.websoft.top/api', globalTitle: '网宿软件', domain: 'websoft.top' }, diff --git a/pages/product/checkout/index.vue b/pages/product/checkout/index.vue new file mode 100644 index 0000000..65a2349 --- /dev/null +++ b/pages/product/checkout/index.vue @@ -0,0 +1,219 @@ + + + + diff --git a/pages/product/components/CardList.vue b/pages/product/components/CardList.vue index d0450c2..f7478f0 100644 --- a/pages/product/components/CardList.vue +++ b/pages/product/components/CardList.vue @@ -3,7 +3,7 @@