diff --git a/.vscode/settings.json b/.vscode/settings.json index cc1dae50..f145f386 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -87,7 +87,7 @@ "source.fixAll.stylelint": "explicit" }, "[vue]": { - "editor.defaultFormatter": "octref.vetur" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "i18n-ally.localesPaths": ["src/locales"], "i18n-ally.keystyle": "nested", diff --git a/src/api/mall/product/spu.ts b/src/api/mall/product/spu.ts index 55b3dc1c..8f58049f 100644 --- a/src/api/mall/product/spu.ts +++ b/src/api/mall/product/spu.ts @@ -26,6 +26,7 @@ export interface Sku { salesCount?: number // 商品销量 cabinetChannel?: string // 货道或柜门编号 cabinetType?: string // 通道类型 + purchaseBizType?:string } export interface GiveCouponTemplate { diff --git a/src/components/FormCreate/src/components/DictSelect.vue b/src/components/FormCreate/src/components/DictSelect.vue index 204746d1..1b8e5347 100644 --- a/src/components/FormCreate/src/components/DictSelect.vue +++ b/src/components/FormCreate/src/components/DictSelect.vue @@ -1,21 +1,21 @@