Merge branch 'refs/heads/develop-mall' into jh-dev

src/views/mall/promotion/discountActivity/DiscountActivityForm.vue

@@ -128,7 +128,6 @@ const getSpuDetails = async (
     if (typeof products !== 'undefined') {
       const product = products.find((item) => item.skuId === sku.id)
       if (product) {
-        product.discountPercent = fenToYuan(product.discountPercent) as any
         product.discountPrice = fenToYuan(product.discountPrice) as any
       }
       config = product || config
@@ -179,6 +178,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+  console.log(1111)
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.getElFormRef().validate()
@@ -189,8 +189,8 @@ const submitForm = async () => {
     // 获取折扣商品配置
     const products = cloneDeep(spuAndSkuListRef.value.getSkuConfigs('productConfig'))
     products.forEach((item: DiscountActivityApi.DiscountProductVO) => {
-      item.discountPercent = convertToInteger(item.discountPercent)
-      item.discountPrice = convertToInteger(yuanToFen(item.discountPrice))
+      item.discountPercent = Number(item.discountPercent)
+      item.discountPrice = yuanToFen(item.discountPrice)
     })
     const data = cloneDeep(formRef.value.formModel) as DiscountActivityApi.DiscountActivityVO
     data.products = products