From 8f42a5e3b57bea3cd128c4059b85637e479b925a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E7=90=B3=E7=BA=A2?= <1921957171@qq.com>
Date: Tue, 10 Sep 2024 16:59:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/product/spu/components/SkuList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/mall/product/spu/components/SkuList.vue b/src/views/mall/product/spu/components/SkuList.vue
index 25475cf8c..9a237495c 100644
--- a/src/views/mall/product/spu/components/SkuList.vue
+++ b/src/views/mall/product/spu/components/SkuList.vue
@@ -180,17 +180,17 @@
     </el-table-column>
     <el-table-column align="center" label="销售价(元)" min-width="80">
       <template #default="{ row }">
-        {{ formatToFraction(row.price) }}
+        {{ row.price }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="市场价(元)" min-width="80">
       <template #default="{ row }">
-        {{ formatToFraction(row.marketPrice) }}
+        {{ row.marketPrice }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="成本价(元)" min-width="80">
       <template #default="{ row }">
-        {{ formatToFraction(row.costPrice) }}
+        {{ row.costPrice }}
       </template>
     </el-table-column>
     <el-table-column align="center" label="库存" min-width="80">

From 5f4a5324b4185cbb790d66052aea826d249b1932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E7=90=B3=E7=BA=A2?= <1921957171@qq.com>
Date: Wed, 11 Sep 2024 15:37:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=E5=8F=AA=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=9B=B4=E6=8E=A5=E9=A2=86=E5=8F=96=20=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/promotion/coupon/components/CouponSelect.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/mall/promotion/coupon/components/CouponSelect.vue b/src/views/mall/promotion/coupon/components/CouponSelect.vue
index c7dc3b865..43f667c81 100644
--- a/src/views/mall/promotion/coupon/components/CouponSelect.vue
+++ b/src/views/mall/promotion/coupon/components/CouponSelect.vue
@@ -173,7 +173,8 @@ const queryParams = reactive({
   status: null,
   discountType: null,
   type: null,
-  createTime: []
+  createTime: [],
+  canTakeTypes:[1]//只获得直接领取的券
 })
 const queryFormRef = ref() // 搜索的表单
 const selectedCouponList = ref<CouponTemplateApi.CouponTemplateVO[]>([]) // 选择的数据