fix: review

(cherry picked from commit b89db1af55)
This commit is contained in:
puhui999 2023-06-06 16:22:58 +08:00 committed by shizhong
parent 274d85010f
commit 2d88367e61
6 changed files with 7 additions and 8 deletions

View File

@ -147,6 +147,7 @@ export enum DICT_TYPE {
MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型 MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
// ========== MALL - PROMOTION 模块 ========== // ========== MALL - PROMOTION 模块 ==========
PRODUCT_UNIT = 'product_unit', // 商品单位
PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型 PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围 PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围
PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型 PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型

View File

@ -14,7 +14,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- TODO @puhui999只能选根节点 fix: 已完善-->
<el-form-item label="商品分类" prop="categoryId"> <el-form-item label="商品分类" prop="categoryId">
<el-tree-select <el-tree-select
v-model="formData.categoryId" v-model="formData.categoryId"
@ -166,8 +165,7 @@
</Descriptions> </Descriptions>
<!-- 商品属性添加 Form 表单 --> <!-- 商品属性添加 Form 表单 -->
<!-- TODO @puhui999: ProductPropertyAddForm 是不是更合适呀 --> <ProductPropertyAddForm ref="attributesAddFormRef" :propertyList="propertyList" />
<ProductAttributesAddForm ref="attributesAddFormRef" :propertyList="propertyList" />
</template> </template>
<script lang="ts" name="ProductSpuBasicInfoForm" setup> <script lang="ts" name="ProductSpuBasicInfoForm" setup>
import { PropType } from 'vue' import { PropType } from 'vue'
@ -178,7 +176,7 @@ import { checkSelectedNode, defaultProps, handleTree, treeToString } from '@/uti
import { createImageViewer } from '@/components/ImageViewer' import { createImageViewer } from '@/components/ImageViewer'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { UploadImg, UploadImgs } from '@/components/UploadFile' import { UploadImg, UploadImgs } from '@/components/UploadFile'
import { ProductAttributes, ProductAttributesAddForm, SkuList } from './index' import { ProductAttributes, ProductPropertyAddForm, SkuList } from './index'
import { basicInfoSchema } from './spu.data' import { basicInfoSchema } from './spu.data'
import type { Spu } from '@/api/mall/product/spu' import type { Spu } from '@/api/mall/product/spu'
import * as ProductCategoryApi from '@/api/mall/product/category' import * as ProductCategoryApi from '@/api/mall/product/category'

View File

@ -17,7 +17,7 @@
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script lang="ts" name="ProductPropertyForm" setup> <script lang="ts" name="ProductPropertyAddForm" setup>
import * as PropertyApi from '@/api/mall/product/property' import * as PropertyApi from '@/api/mall/product/property'
const { t } = useI18n() // const { t } = useI18n() //

View File

@ -23,7 +23,6 @@
min-width="120" min-width="120"
> >
<template #default="{ row }"> <template #default="{ row }">
<!-- TODO puhui999展示成蓝色有点区分度哈 fix-->
<span style="font-weight: bold; color: #40aaff"> <span style="font-weight: bold; color: #40aaff">
{{ row.properties[index]?.valueName }} {{ row.properties[index]?.valueName }}
</span> </span>

View File

@ -2,7 +2,7 @@ import BasicInfoForm from './BasicInfoForm.vue'
import DescriptionForm from './DescriptionForm.vue' import DescriptionForm from './DescriptionForm.vue'
import OtherSettingsForm from './OtherSettingsForm.vue' import OtherSettingsForm from './OtherSettingsForm.vue'
import ProductAttributes from './ProductAttributes.vue' import ProductAttributes from './ProductAttributes.vue'
import ProductAttributesAddForm from './ProductAttributesAddForm.vue' import ProductPropertyAddForm from './ProductPropertyAddForm.vue'
import SkuList from './SkuList.vue' import SkuList from './SkuList.vue'
export { export {
@ -10,6 +10,6 @@ export {
DescriptionForm, DescriptionForm,
OtherSettingsForm, OtherSettingsForm,
ProductAttributes, ProductAttributes,
ProductAttributesAddForm, ProductPropertyAddForm,
SkuList SkuList
} }

View File

@ -1,6 +1,7 @@
import { CrudSchema } from '@/hooks/web/useCrudSchemas' import { CrudSchema } from '@/hooks/web/useCrudSchemas'
// TODO @puhui999如果只要 detail可以不用 CrudSchema只要描述的 Schema // TODO @puhui999如果只要 detail可以不用 CrudSchema只要描述的 Schema
// fix: useCrudSchemas 中没有单独处理的情况且只要 detail 的情况只要 spu 这里有使用 如果改动得添加/修改代码
export const basicInfoSchema = reactive<CrudSchema[]>([ export const basicInfoSchema = reactive<CrudSchema[]>([
{ {
label: '商品名称', label: '商品名称',