From 1553c31e0bbd9d6f569237083ab718b0277a2048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=97=B4=E8=B4=A7?= <252048765@qq.com>
Date: Sat, 31 Aug 2024 12:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E9=99=90=E6=97=B6=E6=BB=A1=E5=87=8F?=
 =?UTF-8?q?=E7=9A=84=E9=87=91=E9=A2=9D=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=B8=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promotion/discountActivity/DiscountActivityForm.vue     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/mall/promotion/discountActivity/DiscountActivityForm.vue b/src/views/mall/promotion/discountActivity/DiscountActivityForm.vue
index 1f7cd6bdc..399edfff2 100644
--- a/src/views/mall/promotion/discountActivity/DiscountActivityForm.vue
+++ b/src/views/mall/promotion/discountActivity/DiscountActivityForm.vue
@@ -45,7 +45,7 @@ import { cloneDeep } from 'lodash-es'
 import * as DiscountActivityApi from '@/api/mall/promotion/discount/discountActivity'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import { getPropertyList, RuleConfig } from '@/views/mall/product/spu/components'
-import { formatToFraction } from '@/utils'
+import { yuanToFen, fenToYuan } from '@/utils'
 
 defineOptions({ name: 'PromotionDiscountActivityForm' })
 
@@ -105,6 +105,9 @@ const getSpuDetails = async (
     }
     if (typeof products !== 'undefined') {
       const product = products.find((item) => item.skuId === sku.id)
+      if(product?.discountPrice){
+        product.discountPrice = Number(fenToYuan(product.discountPrice))
+      }
       config = product || config
     }
     sku.productConfig = config
@@ -174,6 +177,7 @@ const submitForm = async () => {
       } else {
         discountInvalid = true
       }
+      item.discountPrice = yuanToFen(item.discountPrice)
     })
     if (discountInvalid) {
       message.error('优惠金额和折扣百分比需要填写一个')