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 @@