diff --git a/package-lock.json b/package-lock.json index c2dda28e..bf2bf168 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.36.0", "camunda-bpmn-moddle": "^7.0.1", + "compressorjs": "^1.2.1", "cropperjs": "^1.6.1", "crypto-js": "^4.2.0", "dayjs": "^1.11.10", @@ -7298,6 +7299,12 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "dev": true }, + "node_modules/blueimp-canvas-to-blob": { + "version": "3.29.0", + "resolved": "https://registry.npmmirror.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.29.0.tgz", + "integrity": "sha512-0pcSSGxC0QxT+yVkivxIqW0Y4VlO2XSDPofBAqoJ1qJxgH9eiUDLv50Rixij2cDuEfx4M6DpD9UGZpRhT5Q8qg==", + "license": "MIT" + }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz", @@ -8020,6 +8027,16 @@ "resolved": "https://registry.npmmirror.com/component-event/-/component-event-0.2.1.tgz", "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw==" }, + "node_modules/compressorjs": { + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/compressorjs/-/compressorjs-1.2.1.tgz", + "integrity": "sha512-+geIjeRnPhQ+LLvvA7wxBQE5ddeLU7pJ3FsKFWirDw6veY3s9iLxAQEw7lXGHnhCJvBujEQWuNnGzZcvCvdkLQ==", + "license": "MIT", + "dependencies": { + "blueimp-canvas-to-blob": "^3.29.0", + "is-blob": "^2.1.0" + } + }, "node_modules/compute-scroll-into-view": { "version": "1.0.20", "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz", @@ -11515,6 +11532,18 @@ "node": ">=8" } }, + "node_modules/is-blob": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/is-blob/-/is-blob-2.1.0.tgz", + "integrity": "sha512-SZ/fTft5eUhQM6oF/ZaASFDEdbFVe89Imltn9uZr03wdKMcWNVYSMjQPFtg05QuNkt5l5c135ElvXEQG0rk4tw==", + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-boolean-object": { "version": "1.2.2", "resolved": "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz", diff --git a/package.json b/package.json index 3b67949d..b733d986 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.36.0", "camunda-bpmn-moddle": "^7.0.1", + "compressorjs": "^1.2.1", "cropperjs": "^1.6.1", "crypto-js": "^4.2.0", "dayjs": "^1.11.10", @@ -152,4 +153,4 @@ "node": ">= 16.0.0", "pnpm": ">=8.6.0" } -} \ No newline at end of file +} diff --git a/src/api/mall/product/spu.ts b/src/api/mall/product/spu.ts index 628053e7..7862f8b8 100644 --- a/src/api/mall/product/spu.ts +++ b/src/api/mall/product/spu.ts @@ -1,5 +1,4 @@ import request from '@/config/axios' -import { useUserStore } from '@/store/modules/user'; export interface Property { propertyId?: number // 属性编号 @@ -27,6 +26,7 @@ export interface Sku { cabinetChannel?: string // 货道或柜门编号 cabinetType?: string // 通道类型 purchaseBizType?: string + deviceId?: number } export interface GiveCouponTemplate { @@ -63,6 +63,7 @@ export interface Spu { createTime?: Date // 商品创建时间 status?: number // 商品状态 types?: number // 商品类型 + deviceId?: number // 设备号 } // 获得 Spu 列表 diff --git a/src/api/mall/trade/order/salesStatisticsdetails.ts b/src/api/mall/trade/order/salesStatisticsdetails.ts index e3e31c19..98cf1d2f 100644 --- a/src/api/mall/trade/order/salesStatisticsdetails.ts +++ b/src/api/mall/trade/order/salesStatisticsdetails.ts @@ -1,31 +1,29 @@ import request from '@/config/axios' +// request.get 返回的是 res.data,所以这里直接定义 data 的结构 export interface GetStatisticsDetailRes { - code: number; - data: { - list: { - id: number; - userId: number; - orderId: number; - spuId: number; - spuName: string; - skuId: number; - deviceId: string; - barCode: string; - cabinetChannel: string; - picUrl: string; - count: number; - price: number; - discountPrice: number; - payPrice: number; - orderPartPrice: number; - orderDividePrice: number; - afterSaleStatus: number; - no: string; - createTime: string; // 修改为正确的类型 - }[]; - total: number; - }; + list: { + id: number; + userId: number; + orderId: number; + spuId: number; + spuName: string; + skuId: number; + deviceId: string; + barCode: string; + cabinetChannel: string; + picUrl: string; + count: number; + price: number; + discountPrice: number; + payPrice: number; + orderPartPrice: number; + orderDividePrice: number; + afterSaleStatus: number; + no: string; + createTime: string; + }[]; + total: number; } // 查询参数接口 diff --git a/src/components/Crontab/src/Crontab.vue b/src/components/Crontab/src/Crontab.vue index 0914bb71..519e986e 100644 --- a/src/components/Crontab/src/Crontab.vue +++ b/src/components/Crontab/src/Crontab.vue @@ -535,6 +535,7 @@ const inputChange = () => { append-to-body destroy-on-close title="cron规则生成器" + :close-on-click-modal="false" >
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue index 9bf5b7ab..234b3a3f 100644 --- a/src/components/Dialog/src/Dialog.vue +++ b/src/components/Dialog/src/Dialog.vue @@ -60,7 +60,7 @@ const dialogStyle = computed(() => { - +