diff --git a/src/components/SelectGoodsCategory/index.vue b/src/components/SelectGoodsCategory/index.vue index c11aa46..6b5d577 100644 --- a/src/components/SelectGoodsCategory/index.vue +++ b/src/components/SelectGoodsCategory/index.vue @@ -17,7 +17,6 @@ import { listGoodsCategory } from '@/api/shop/goodsCategory'; import { toTreeData } from 'ele-admin-pro/es'; import { GoodsCategory } from '@/api/shop/goodsCategory/model'; - import { FileRecordParam } from '@/api/system/file/model'; const props = withDefaults( defineProps<{ @@ -114,6 +113,7 @@ watch( () => props.options, () => { + console.log(props.merchantId); if (props.merchantId) { where.merchantId = props.merchantId; } diff --git a/src/components/SelectSpec/index.vue b/src/components/SelectSpec/index.vue index bd3421c..8018743 100644 --- a/src/components/SelectSpec/index.vue +++ b/src/components/SelectSpec/index.vue @@ -40,7 +40,7 @@ ); const emit = defineEmits<{ - (e: 'done', Merchant): void; + (e: 'done', Spec): void; (e: 'clear'): void; }>(); diff --git a/src/views/shop/goods/components/goodsEdit.vue b/src/views/shop/goods/components/goodsEdit.vue index fa83eb6..828a587 100644 --- a/src/views/shop/goods/components/goodsEdit.vue +++ b/src/views/shop/goods/components/goodsEdit.vue @@ -608,7 +608,7 @@ const goodsId = props.data?.goodsId; if(goodsId){ listGoodsSpec({goodsId}).then(data => { - console.log(data[0].specValue); + const specValue = data[0].specValue; if(specValue){ spec.value = JSON.parse(specValue).map( d => {