From ab1685a74100243797611c0a4e2c2f6cb9a6380b Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 26 Apr 2023 17:53:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/product/management/type/index.ts       |  2 +-
 src/views/mall/product/management/addForm.vue       |  2 +-
 .../product/management/components/BasicInfoForm.vue | 13 ++++++++++---
 .../management/components/OtherSettingsForm.vue     |  6 +++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/api/mall/product/management/type/index.ts b/src/api/mall/product/management/type/index.ts
index 3d372c45..a1224d48 100644
--- a/src/api/mall/product/management/type/index.ts
+++ b/src/api/mall/product/management/type/index.ts
@@ -1,6 +1,6 @@
 export interface SpuType {
   name?: string // 商品名称
-  categoryId?: number // 商品分类
+  categoryId?: number | undefined // 商品分类
   keyword?: string // 关键字
   unit?: string // 单位
   picUrl?: string // 商品封面图
diff --git a/src/views/mall/product/management/addForm.vue b/src/views/mall/product/management/addForm.vue
index f915b204..9ef24f69 100644
--- a/src/views/mall/product/management/addForm.vue
+++ b/src/views/mall/product/management/addForm.vue
@@ -49,7 +49,7 @@ const DescriptionRef = ref<ComponentRef<typeof DescriptionForm>>() // 商品详
 const OtherSettingsRef = ref<ComponentRef<typeof OtherSettingsForm>>() // 其他设置Ref
 const formData = ref<SpuType>({
   name: '', // 商品名称
-  categoryId: 0, // 商品分类
+  categoryId: undefined, // 商品分类
   keyword: '', // 关键字
   unit: '', // 单位
   picUrl: '', // 商品封面图
diff --git a/src/views/mall/product/management/components/BasicInfoForm.vue b/src/views/mall/product/management/components/BasicInfoForm.vue
index 8074e67b..94fe1e10 100644
--- a/src/views/mall/product/management/components/BasicInfoForm.vue
+++ b/src/views/mall/product/management/components/BasicInfoForm.vue
@@ -10,7 +10,7 @@
         <el-form-item label="商品分类" prop="categoryId">
           <el-tree-select
             v-model="formData.categoryId"
-            :data="[]"
+            :data="categoryList"
             :props="defaultProps"
             check-strictly
             node-key="id"
@@ -101,10 +101,11 @@
 </template>
 <script lang="ts" name="ProductManagementBasicInfoForm" setup>
 import { PropType } from 'vue'
-import { defaultProps } from '@/utils/tree'
 import type { SpuType } from '@/api/mall/product/management/type'
 import { UploadImg, UploadImgs } from '@/components/UploadFile'
 import { copyValueToTarget } from '@/utils/object'
+import * as ProductCategoryApi from '@/api/mall/product/category'
+import { defaultProps, handleTree } from '@/utils/tree'
 
 const message = useMessage() // 消息弹窗
 const props = defineProps({
@@ -117,7 +118,7 @@ const props = defineProps({
 const ProductManagementBasicInfoRef = ref() // 表单Ref
 const formData = ref<SpuType>({
   name: '', // 商品名称
-  categoryId: 155415, // 商品分类
+  categoryId: undefined, // 商品分类
   keyword: '', // 关键字
   unit: '', // 单位
   picUrl: '', // 商品封面图
@@ -186,4 +187,10 @@ const changeSubCommissionType = (subCommissionType) => {
 const confirm = () => {}
 // 添加规格
 const addRule = () => {}
+const categoryList = ref() // 分类树
+onMounted(async () => {
+  // 获得分类树
+  const data = await ProductCategoryApi.getCategoryList({})
+  categoryList.value = handleTree(data, 'id', 'parentId')
+})
 </script>
diff --git a/src/views/mall/product/management/components/OtherSettingsForm.vue b/src/views/mall/product/management/components/OtherSettingsForm.vue
index 155a0aba..63fdb22a 100644
--- a/src/views/mall/product/management/components/OtherSettingsForm.vue
+++ b/src/views/mall/product/management/components/OtherSettingsForm.vue
@@ -92,9 +92,9 @@ const onChangeGroup = () => {
 const OtherSettingsFormRef = ref() // 表单Ref
 // 表单数据
 const formData = ref<SpuType>({
-  sort: 12, // 商品排序
-  giveIntegral: 666, // 赠送积分
-  virtualSalesCount: 565656, // 虚拟销量
+  sort: 1, // 商品排序
+  giveIntegral: 1, // 赠送积分
+  virtualSalesCount: 1, // 虚拟销量
   recommendHot: false, // 是否热卖
   recommendBenefit: false, // 是否优惠
   recommendBest: false, // 是否精品