From a1b45f80bc72c57b1fd7cfef6b4f314629ed637d Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 3 Jun 2023 21:21:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20spu=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/remaining.ts      | 6 +++---
 src/views/mall/product/spu/index.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index f7e56fd0..bfa4b15c 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -355,7 +355,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
     },
     children: [
       {
-        path: 'productSpuAdd', // TODO @puhui999：最好拆成 add 和 edit 两个路由；添加商品；修改商品 fix
+        path: 'spu/add', // TODO @puhui999：最好拆成 add 和 edit 两个路由；添加商品；修改商品 fix
         component: () => import('@/views/mall/product/spu/addForm.vue'),
         name: 'ProductSpuAdd',
         meta: {
@@ -368,7 +368,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
         }
       },
       {
-        path: 'productSpuEdit/:spuId(\\d+)',
+        path: 'spu/edit/:spuId(\\d+)',
         component: () => import('@/views/mall/product/spu/addForm.vue'),
         name: 'productSpuEdit',
         meta: {
@@ -381,7 +381,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
         }
       },
       {
-        path: 'productSpuDetail/:spuId(\\d+)',
+        path: 'spu/detail/:spuId(\\d+)',
         component: () => import('@/views/mall/product/spu/addForm.vue'),
         name: 'productSpuDetail',
         meta: {
diff --git a/src/views/mall/product/spu/index.vue b/src/views/mall/product/spu/index.vue
index 47a9c8d5..4734f18c 100644
--- a/src/views/mall/product/spu/index.vue
+++ b/src/views/mall/product/spu/index.vue
@@ -397,18 +397,18 @@ const resetQuery = () => {
 const openForm = (id?: number) => {
   // 修改
   if (typeof id === 'number') {
-    push('/product/productSpuEdit/' + id)
+    push('/product/spu/edit/' + id)
     return
   }
   // 新增
-  push('/product/productSpuAdd')
+  push('/product/spu/add')
 }
 
 /**
  * 查看商品详情
  */
 const openDetail = (id?: number) => {
-  push('/product/productSpuDetail/' + id)
+  push('/product/spu/detail/' + id)
 }
 
 /** 导出按钮操作 */

From b89db1af55127fef5b558e2fdcd6f8401ccdc7df Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 6 Jun 2023 16:22:58 +0800
Subject: [PATCH 2/4] fix: review

---
 src/utils/dict.ts                                           | 1 +
 src/views/mall/product/spu/components/BasicInfoForm.vue     | 6 ++----
 ...ductAttributesAddForm.vue => ProductPropertyAddForm.vue} | 2 +-
 src/views/mall/product/spu/components/SkuList.vue           | 1 -
 src/views/mall/product/spu/components/index.ts              | 4 ++--
 src/views/mall/product/spu/components/spu.data.ts           | 1 +
 6 files changed, 7 insertions(+), 8 deletions(-)
 rename src/views/mall/product/spu/components/{ProductAttributesAddForm.vue => ProductPropertyAddForm.vue} (97%)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 73913b91..7f3f95f9 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -147,6 +147,7 @@ export enum DICT_TYPE {
   MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
 
   // ========== MALL - PROMOTION 模块 ==========
+  PRODUCT_UNIT = 'product_unit', // 商品单位
   PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
   PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围
   PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型
diff --git a/src/views/mall/product/spu/components/BasicInfoForm.vue b/src/views/mall/product/spu/components/BasicInfoForm.vue
index b8ae405c..c3ccf6b5 100644
--- a/src/views/mall/product/spu/components/BasicInfoForm.vue
+++ b/src/views/mall/product/spu/components/BasicInfoForm.vue
@@ -14,7 +14,6 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <!-- TODO @puhui999：只能选根节点 fix: 已完善-->
         <el-form-item label="商品分类" prop="categoryId">
           <el-tree-select
             v-model="formData.categoryId"
@@ -166,8 +165,7 @@
   </Descriptions>
 
   <!-- 商品属性添加 Form 表单 -->
-  <!-- TODO @puhui999: ProductPropertyAddForm 是不是更合适呀 -->
-  <ProductAttributesAddForm ref="attributesAddFormRef" :propertyList="propertyList" />
+  <ProductPropertyAddForm ref="attributesAddFormRef" :propertyList="propertyList" />
 </template>
 <script lang="ts" name="ProductSpuBasicInfoForm" setup>
 import { PropType } from 'vue'
@@ -178,7 +176,7 @@ import { checkSelectedNode, defaultProps, handleTree, treeToString } from '@/uti
 import { createImageViewer } from '@/components/ImageViewer'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { UploadImg, UploadImgs } from '@/components/UploadFile'
-import { ProductAttributes, ProductAttributesAddForm, SkuList } from './index'
+import { ProductAttributes, ProductPropertyAddForm, SkuList } from './index'
 import { basicInfoSchema } from './spu.data'
 import type { Spu } from '@/api/mall/product/spu'
 import * as ProductCategoryApi from '@/api/mall/product/category'
diff --git a/src/views/mall/product/spu/components/ProductAttributesAddForm.vue b/src/views/mall/product/spu/components/ProductPropertyAddForm.vue
similarity index 97%
rename from src/views/mall/product/spu/components/ProductAttributesAddForm.vue
rename to src/views/mall/product/spu/components/ProductPropertyAddForm.vue
index 2de843f6..978ebe71 100644
--- a/src/views/mall/product/spu/components/ProductAttributesAddForm.vue
+++ b/src/views/mall/product/spu/components/ProductPropertyAddForm.vue
@@ -17,7 +17,7 @@
     </template>
   </Dialog>
 </template>
-<script lang="ts" name="ProductPropertyForm" setup>
+<script lang="ts" name="ProductPropertyAddForm" setup>
 import * as PropertyApi from '@/api/mall/product/property'
 
 const { t } = useI18n() // 国际化
diff --git a/src/views/mall/product/spu/components/SkuList.vue b/src/views/mall/product/spu/components/SkuList.vue
index 916746e3..4114bd09 100644
--- a/src/views/mall/product/spu/components/SkuList.vue
+++ b/src/views/mall/product/spu/components/SkuList.vue
@@ -23,7 +23,6 @@
         min-width="120"
       >
         <template #default="{ row }">
-          <!-- TODO puhui999：展示成蓝色，有点区分度哈 fix-->
           <span style="font-weight: bold; color: #40aaff">
             {{ row.properties[index]?.valueName }}
           </span>
diff --git a/src/views/mall/product/spu/components/index.ts b/src/views/mall/product/spu/components/index.ts
index f908e7d3..549a9815 100644
--- a/src/views/mall/product/spu/components/index.ts
+++ b/src/views/mall/product/spu/components/index.ts
@@ -2,7 +2,7 @@ import BasicInfoForm from './BasicInfoForm.vue'
 import DescriptionForm from './DescriptionForm.vue'
 import OtherSettingsForm from './OtherSettingsForm.vue'
 import ProductAttributes from './ProductAttributes.vue'
-import ProductAttributesAddForm from './ProductAttributesAddForm.vue'
+import ProductPropertyAddForm from './ProductPropertyAddForm.vue'
 import SkuList from './SkuList.vue'
 
 export {
@@ -10,6 +10,6 @@ export {
   DescriptionForm,
   OtherSettingsForm,
   ProductAttributes,
-  ProductAttributesAddForm,
+  ProductPropertyAddForm,
   SkuList
 }
diff --git a/src/views/mall/product/spu/components/spu.data.ts b/src/views/mall/product/spu/components/spu.data.ts
index befb6e8a..2f024d5b 100644
--- a/src/views/mall/product/spu/components/spu.data.ts
+++ b/src/views/mall/product/spu/components/spu.data.ts
@@ -1,6 +1,7 @@
 import { CrudSchema } from '@/hooks/web/useCrudSchemas'
 
 // TODO @puhui999：如果只要 detail，可以不用 CrudSchema，只要描述的 Schema
+// fix: useCrudSchemas 中没有单独处理的情况且只要 detail 的情况只要 spu 这里有使用 如果改动得添加/修改代码
 export const basicInfoSchema = reactive<CrudSchema[]>([
   {
     label: '商品名称',

From 20f3f7267023b21fc28541ed7a0f35f3a0d3e832 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 7 Jun 2023 08:59:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=95=B0=E7=BB=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=3F=20=E5=8F=AF=E9=80=89=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=AC=A6=EF=BC=8C=E9=81=BF=E5=85=8D=E5=B1=9E=E6=80=A7=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BA=20null=20=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/product/spu/addForm.vue             |  2 +-
 .../mall/product/spu/components/BasicInfoForm.vue  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/mall/product/spu/addForm.vue b/src/views/mall/product/spu/addForm.vue
index 2d5a3528..7d91d857 100644
--- a/src/views/mall/product/spu/addForm.vue
+++ b/src/views/mall/product/spu/addForm.vue
@@ -104,7 +104,7 @@ const getDetail = async () => {
     formLoading.value = true
     try {
       const res = (await ProductSpuApi.getSpu(id)) as ProductSpuApi.Spu
-      res.skus!.forEach((item) => {
+      res.skus?.forEach((item) => {
         // 回显价格分转元
         item.price = formatToFraction(item.price)
         item.marketPrice = formatToFraction(item.marketPrice)
diff --git a/src/views/mall/product/spu/components/BasicInfoForm.vue b/src/views/mall/product/spu/components/BasicInfoForm.vue
index c3ccf6b5..7b122151 100644
--- a/src/views/mall/product/spu/components/BasicInfoForm.vue
+++ b/src/views/mall/product/spu/components/BasicInfoForm.vue
@@ -256,7 +256,7 @@ watch(
       return
     }
     copyValueToTarget(formData, data)
-    formData.sliderPicUrls = data['sliderPicUrls'].map((item) => ({
+    formData.sliderPicUrls = data['sliderPicUrls']?.map((item) => ({
       url: item
     }))
     // 只有是多规格才处理
@@ -265,16 +265,16 @@ watch(
     }
     //  直接拿返回的 skus 属性逆向生成出 propertyList
     const properties = []
-    formData.skus.forEach((sku) => {
-      sku.properties.forEach(({ propertyId, propertyName, valueId, valueName }) => {
+    formData.skus?.forEach((sku) => {
+      sku.properties?.forEach(({ propertyId, propertyName, valueId, valueName }) => {
         // 添加属性
-        if (!properties.some((item) => item.id === propertyId)) {
+        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 })
+        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 })
         }
       })
     })

From d31ade7a5fccc98db7e90e41a31564205b393056 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 7 Jun 2023 18:31:28 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=20SPU=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=B7=AF=E7=94=B1=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/remaining.ts      | 6 +++---
 src/views/mall/product/spu/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index bfa4b15c..b7932858 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -355,7 +355,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
     },
     children: [
       {
-        path: 'spu/add', // TODO @puhui999：最好拆成 add 和 edit 两个路由；添加商品；修改商品 fix
+        path: 'spu/add',
         component: () => import('@/views/mall/product/spu/addForm.vue'),
         name: 'ProductSpuAdd',
         meta: {
@@ -370,7 +370,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'spu/edit/:spuId(\\d+)',
         component: () => import('@/views/mall/product/spu/addForm.vue'),
-        name: 'productSpuEdit',
+        name: 'ProductSpuEdit',
         meta: {
           noCache: true,
           hidden: true,
@@ -383,7 +383,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'spu/detail/:spuId(\\d+)',
         component: () => import('@/views/mall/product/spu/addForm.vue'),
-        name: 'productSpuDetail',
+        name: 'ProductSpuDetail',
         meta: {
           noCache: true,
           hidden: true,
diff --git a/src/views/mall/product/spu/index.vue b/src/views/mall/product/spu/index.vue
index 829a15fb..76cb1166 100644
--- a/src/views/mall/product/spu/index.vue
+++ b/src/views/mall/product/spu/index.vue
@@ -400,7 +400,7 @@ const openForm = (id?: number) => {
     return
   }
   // 新增
-  push('/product/spu/add')
+  push({ name: 'ProductSpuAdd' })
 }
 
 /**