diff --git a/src/views/mall/product/brand/index.vue b/src/views/mall/product/brand/index.vue
index fab7a2ded..23d9abc93 100644
--- a/src/views/mall/product/brand/index.vue
+++ b/src/views/mall/product/brand/index.vue
@@ -59,7 +59,7 @@
-
+
diff --git a/src/views/mall/product/category/index.vue b/src/views/mall/product/category/index.vue
index ebe1d63f6..3bd232e79 100644
--- a/src/views/mall/product/category/index.vue
+++ b/src/views/mall/product/category/index.vue
@@ -38,7 +38,7 @@
-
+
diff --git a/src/views/mall/product/comment/index.vue b/src/views/mall/product/comment/index.vue
index 1b0745ba5..7c0737f57 100644
--- a/src/views/mall/product/comment/index.vue
+++ b/src/views/mall/product/comment/index.vue
@@ -115,7 +115,7 @@
:formatter="dateFormatter"
width="170"
/>
-
+
{
// 删除的二次确认
await message.delConfirm()
// 发起删除
- await PropertyApi.deleteProperty(id)
+ await PropertyApi.deletePropertyValue(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
diff --git a/src/views/mall/product/spu/components/index.ts b/src/views/mall/product/spu/components/index.ts
index e2cbe73da..edecbe896 100644
--- a/src/views/mall/product/spu/components/index.ts
+++ b/src/views/mall/product/spu/components/index.ts
@@ -24,7 +24,7 @@ interface RuleConfig {
}
/**
- * 获得商品的规格列表 - 商品相关的公共函数
+ * 获得商品的规格列表
*
* @param spu
* @return PropertyAndValues 规格列表
@@ -51,4 +51,4 @@ const getPropertyList = (spu: Spu): PropertyAndValues[] => {
return properties
}
-export { SkuList, PropertyAndValues, RuleConfig, getPropertyList }
+export { SkuList, getPropertyList, PropertyAndValues, RuleConfig }
diff --git a/src/views/mall/product/spu/form/BasicInfoForm.vue b/src/views/mall/product/spu/form/BasicInfoForm.vue
index 50fb8793a..b399d0f85 100644
--- a/src/views/mall/product/spu/form/BasicInfoForm.vue
+++ b/src/views/mall/product/spu/form/BasicInfoForm.vue
@@ -109,12 +109,7 @@
-
+
添加规格
@@ -125,12 +120,7 @@
-
+
@@ -185,11 +175,7 @@ import { propTypes } from '@/utils/propTypes'
import { checkSelectedNode, defaultProps, handleTree, treeToString } from '@/utils/tree'
import { createImageViewer } from '@/components/ImageViewer'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import {
- PropertyAndValues,
- RuleConfig,
- SkuList
-} from '@/views/mall/product/spu/components/index.ts'
+import { getPropertyList, SkuList } from '@/views/mall/product/spu/components/index.ts'
import ProductAttributes from './ProductAttributes.vue'
import ProductPropertyAddForm from './ProductPropertyAddForm.vue'
import { basicInfoSchema } from './spu.data'
@@ -200,30 +186,6 @@ import * as ExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
defineOptions({ name: 'ProductSpuBasicInfoForm' })
-// sku 相关属性校验规则
-const ruleConfig: RuleConfig[] = [
- {
- name: 'stock',
- rule: (arg) => arg >= 1,
- message: '商品库存必须大于等于 1 !!!'
- },
- {
- name: 'price',
- rule: (arg) => arg >= 0.01,
- message: '商品销售价格必须大于等于 0.01 !!!'
- },
- {
- name: 'marketPrice',
- rule: (arg) => arg >= 0.01,
- message: '商品市场价格必须大于等于 0.01 !!!'
- },
- {
- name: 'costPrice',
- rule: (arg) => arg >= 0.01,
- message: '商品成本价格必须大于等于 0.01 !!!'
- }
-]
-
// ====== 商品详情相关操作 ======
const { allSchemas } = useCrudSchemas(basicInfoSchema)
/** 商品图预览 */
@@ -241,34 +203,6 @@ const imagePreview = (args) => {
})
}
-/**
- * 获得商品的规格列表
- *
- * @param spu
- * @return PropertyAndValues 规格列表
- */
-const getPropertyList = (spu: Spu): PropertyAndValues[] => {
- // 直接拿返回的 skus 属性逆向生成出 propertyList
- const properties: PropertyAndValues[] = []
- // 只有是多规格才处理
- if (spu.specType) {
- spu.skus?.forEach((sku) => {
- sku.properties?.forEach(({ propertyId, propertyName, valueId, valueName }) => {
- // 添加属性
- if (!properties?.some((item) => item.id === propertyId)) {
- properties.push({ id: propertyId!, name: propertyName!, values: [] })
- }
- // 添加属性值
- const index = properties?.findIndex((item) => item.id === propertyId)
- if (!properties[index].values?.some((value) => value.id === valueId)) {
- properties[index].values?.push({ id: valueId!, name: valueName! })
- }
- })
- })
- }
- return properties
-}
-
// ====== end ======
const message = useMessage() // 消息弹窗
diff --git a/src/views/mall/product/spu/form/index.vue b/src/views/mall/product/spu/form/index.vue
index 526bb338f..1b5654cfa 100644
--- a/src/views/mall/product/spu/form/index.vue
+++ b/src/views/mall/product/spu/form/index.vue
@@ -189,7 +189,7 @@ const submitForm = async () => {
/** 关闭按钮 */
const close = () => {
delView(unref(currentRoute))
- push('/product/product-spu')
+ push({ name: 'ProductSpu' })
}
/** 初始化 */
onMounted(async () => {
diff --git a/src/views/mall/product/spu/index.vue b/src/views/mall/product/spu/index.vue
index 9ea06cd59..2ed6d3ada 100644
--- a/src/views/mall/product/spu/index.vue
+++ b/src/views/mall/product/spu/index.vue
@@ -170,6 +170,14 @@
>
详情
+
+ 修改
+
-
-
- 修改
-
{
formData.value = await AfterSaleApi.getAfterSale(id)
}
}
-/**
- * 同意售后
- */
+
+// TODO @puhui999:操作后,需要提示和刷新哈。
+/** 同意售后 */
const agree = () => {
message.confirm('是否同意售后?').then(() => {
AfterSaleApi.agree(formData.value.id)
})
}
-/**
- * 拒绝售后
- */
+
+/** 拒绝售后 */
const disagree = () => {
updateAuditReasonFormRef.value?.open(formData.value)
}
-/**
- * 确认收货
- */
+
+/** 确认收货 */
const receive = () => {
message.confirm('是否确认收货?').then(() => {
AfterSaleApi.receive(formData.value.id)
})
}
-/**
- * 拒绝收货
- */
+
+/** 拒绝收货 */
const refuse = () => {
message.confirm('是否拒绝收货?').then(() => {
AfterSaleApi.refuse(formData.value.id)
})
}
-/**
- * 确认退款
- */
+
+/** 确认退款 */
const refund = () => {
message.confirm('是否确认退款?').then(() => {
AfterSaleApi.refund(formData.value.id)
})
}
+
/** 图片预览 */
const imagePreview = (args) => {
const urlList = []
@@ -206,6 +203,7 @@ const imagePreview = (args) => {
urlList
})
}
+
onMounted(async () => {
await getDetail()
})