From 4410bdd93c199bd5a63a7cf8ab3e50d314e09f1e Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 19 May 2023 17:04:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E7=89=88=E9=81=97=E7=95=99=E7=9A=84=E5=90=84?= =?UTF-8?q?=E7=A7=8D=E5=B0=8Fbug=E5=85=B3=E9=94=AE=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B7=B2=E6=B7=BB=E5=8A=A0fix=E6=B3=A8=E9=87=8A=E3=80=82?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84TODO=E4=B9=9F=E5=B7=B2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0fix=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0c42b76a52ce9b29ec68b54d9b74deb4483108dd) --- src/api/mall/product/brand.ts | 5 + src/api/mall/product/spu.ts | 1 + src/utils/index.ts | 21 ++++ src/views/mall/product/spu/addForm.vue | 82 +++++++------ .../product/spu/components/BasicInfoForm.vue | 32 ++++- .../mall/product/spu/components/SkuList.vue | 114 +++++++++++++----- src/views/mall/product/spu/index.vue | 25 +++- 7 files changed, 205 insertions(+), 75 deletions(-) diff --git a/src/api/mall/product/brand.ts b/src/api/mall/product/brand.ts index dc8acc2a..94d53704 100644 --- a/src/api/mall/product/brand.ts +++ b/src/api/mall/product/brand.ts @@ -54,3 +54,8 @@ export const getBrand = (id: number) => { export const getBrandParam = (params: PageParam) => { return request.get({ url: '/product/brand/page', params }) } + +// 获得商品品牌精简信息列表 +export const getSimpleBrandList = () => { + return request.get({ url: '/product/brand/list-all-simple' }) +} diff --git a/src/api/mall/product/spu.ts b/src/api/mall/product/spu.ts index 7bc645e0..ace7e417 100644 --- a/src/api/mall/product/spu.ts +++ b/src/api/mall/product/spu.ts @@ -34,6 +34,7 @@ export interface SpuType { sliderPicUrls?: string[] // 商品轮播图 introduction?: string // 商品简介 deliveryTemplateId?: number | null // 运费模版 + brandId?: number | null // 商品品牌编号 specType?: boolean // 商品规格 subCommissionType?: boolean // 分销类型 skus: SkuType[] // sku数组 diff --git a/src/utils/index.ts b/src/utils/index.ts index d74bbe99..134bdf40 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -173,3 +173,24 @@ export const copyValueToTarget = (target, source) => { // 更新目标对象值 Object.assign(target, newObj) } + +/** + * 将一个整数转换为分数保留两位小数 + * @param num + */ +export const formatToFraction = (num: number | string | undefined): number => { + if (typeof num === 'undefined') return 0 + const parsedNumber = typeof num === 'string' ? parseFloat(num) : num + return parseFloat((parsedNumber / 100).toFixed(2)) +} + +/** + * 将一个分数转换为整数 + * @param num + */ +export const convertToInteger = (num: number | string | undefined): number => { + if (typeof num === 'undefined') return 0 + const parsedNumber = typeof num === 'string' ? parseFloat(num) : num + // TODO 分转元后还有小数则四舍五入 + return Math.round(parsedNumber * 100) +} diff --git a/src/views/mall/product/spu/addForm.vue b/src/views/mall/product/spu/addForm.vue index a968eefb..e081387d 100644 --- a/src/views/mall/product/spu/addForm.vue +++ b/src/views/mall/product/spu/addForm.vue @@ -38,6 +38,7 @@ import { BasicInfoForm, DescriptionForm, OtherSettingsForm } from './components' // 业务api import * as ProductSpuApi from '@/api/mall/product/spu' import * as PropertyApi from '@/api/mall/product/property' +import { convertToInteger, formatToFraction } from '@/utils' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -60,6 +61,7 @@ const formData = ref({ sliderPicUrls: [], // 商品轮播图 introduction: '', // 商品简介 deliveryTemplateId: 1, // 运费模版 + brandId: null, // 商品品牌 specType: false, // 商品规格 subCommissionType: false, // 分销类型 skus: [ @@ -94,14 +96,34 @@ const getDetail = async () => { formLoading.value = true try { const res = (await ProductSpuApi.getSpu(id)) as ProductSpuApi.SpuType + res.skus.forEach((item) => { + // 回显价格分转元 + item.price = formatToFraction(item.price) + item.marketPrice = formatToFraction(item.marketPrice) + item.costPrice = formatToFraction(item.costPrice) + item.subCommissionFirstPrice = formatToFraction(item.subCommissionFirstPrice) + item.subCommissionSecondPrice = formatToFraction(item.subCommissionSecondPrice) + }) formData.value = res - // 直接取第一个值就能得到所有属性的id - // TODO @puhui999：可以直接拿 propertyName 拼接处规格 id + 属性，可以看下商品 uniapp 详情的做法 - const propertyIds = res.skus[0]?.properties.map((item) => item.propertyId) - const PropertyS = await PropertyApi.getPropertyListAndValue({ propertyIds }) - await nextTick() - // 回显商品属性 - basicInfoRef.value.addAttribute(PropertyS) + // 只有是多规格才处理 + if (res.specType) { + // TODO @puhui999：可以直接拿 propertyName 拼接处规格 id + 属性，可以看下商品 uniapp 详情的做法 + // fix: 考虑到 sku 数量和通过属性算出来的sku不一致的情况 + const propertyIds = [] + res.skus.forEach((sku) => + sku.properties + ?.map((property) => property.propertyId) + .forEach((propertyId) => { + if (propertyIds.indexOf(propertyId) === -1) { + propertyIds.push(propertyId) + } + }) + ) + const properties = await PropertyApi.getPropertyListAndValue({ propertyIds }) + await nextTick() + // 回显商品属性 + basicInfoRef.value.addAttribute(properties) + } } finally { formLoading.value = false } @@ -119,10 +141,26 @@ const submitForm = async () => { await unref(descriptionRef)?.validate() await unref(otherSettingsRef)?.validate() const deepCopyFormData = cloneDeep(unref(formData.value)) // 深拷贝一份 fix:这样最终 server 端不满足，不需要恢复， - // 处理掉一些无关数据 + // TODO 兜底处理 sku 空数据详见 SkuList TODO + formData.value.skus.forEach((sku) => { + // 因为是空数据这里判断一下商品条码是否为空就行 + if (sku.barCode === '') { + const index = deepCopyFormData.skus.findIndex( + (item) => JSON.stringify(item.properties) === JSON.stringify(sku.properties) + ) + // 删除这条 sku + deepCopyFormData.skus.splice(index, 1) + } + }) deepCopyFormData.skus.forEach((item) => { // 给sku name赋值 item.name = deepCopyFormData.name + // sku相关价格元转分 + item.price = convertToInteger(item.price) + item.marketPrice = convertToInteger(item.marketPrice) + item.costPrice = convertToInteger(item.costPrice) + item.subCommissionFirstPrice = convertToInteger(item.subCommissionFirstPrice) + item.subCommissionSecondPrice = convertToInteger(item.subCommissionSecondPrice) }) // 处理轮播图列表 const newSliderPicUrls = [] @@ -148,34 +186,6 @@ const submitForm = async () => { } } -/** - * 重置表单 - * fix:先注释保留，如果后期没有使用到则移除 - */ -// const resetForm = async () => { -// formData.value = { -// name: '', // 商品名称 -// categoryId: 0, // 商品分类 -// keyword: '', // 关键字 -// unit: '', // 单位 -// picUrl: '', // 商品封面图 -// sliderPicUrls: [], // 商品轮播图 -// introduction: '', // 商品简介 -// deliveryTemplateId: 0, // 运费模版 -// selectRule: '', -// specType: false, // 商品规格 -// subCommissionType: false, // 分销类型 -// description: '', // 商品详情 -// sort: 1, // 商品排序 -// giveIntegral: 1, // 赠送积分 -// virtualSalesCount: 1, // 虚拟销量 -// recommendHot: false, // 是否热卖 -// recommendBenefit: false, // 是否优惠 -// recommendBest: false, // 是否精品 -// recommendNew: false, // 是否新品 -// recommendGood: false // 是否优品 -// } -// } /** 关闭按钮 */ const close = () => { delView(unref(currentRoute)) diff --git a/src/views/mall/product/spu/components/BasicInfoForm.vue b/src/views/mall/product/spu/components/BasicInfoForm.vue index 2219008e..d2c7bbe1 100644 --- a/src/views/mall/product/spu/components/BasicInfoForm.vue +++ b/src/views/mall/product/spu/components/BasicInfoForm.vue @@ -59,13 +59,23 @@ - + + 运费模板 - 运费模板 + + + + + @@ -108,14 +118,15 @@ diff --git a/src/views/mall/product/spu/components/SkuList.vue b/src/views/mall/product/spu/components/SkuList.vue index 914414ad..838e1f43 100644 --- a/src/views/mall/product/spu/components/SkuList.vue +++ b/src/views/mall/product/spu/components/SkuList.vue @@ -34,17 +34,29 @@ @@ -54,42 +66,54 @@ -