From c1ee82ee8a60559572c580de882735af1b4befcb Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 25 Nov 2025 16:46:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E5=AE=A2=E7=AB=8B?=
 =?UTF-8?q?=E5=87=8F=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/payCard/payCard.vue | 12 ++++++------
 src/store/goods.js                 | 16 +++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/payCard/payCard.vue b/src/components/payCard/payCard.vue
index d0a5a73..621717d 100644
--- a/src/components/payCard/payCard.vue
+++ b/src/components/payCard/payCard.vue
@@ -15,9 +15,9 @@
                 <div class="t2">
                     <span>商品原价:￥{{ goodsStore.cartInfo.costSummary.goodsRealAmount || 0 }}</span>
                     <span>餐位费:￥{{ formatDecimal(goodsStore.cartInfo.costSummary.seatFee || 0)
-                    }}</span>
+                        }}</span>
                     <span>打包费:￥{{ formatDecimal(goodsStore.cartInfo.costSummary.packFee || 0)
-                    }}</span>
+                        }}</span>
                     <span>优惠:￥{{ formatDecimal(goodsStore.cartInfo.costSummary.totalDiscountAmount || 0) }}</span>
                     <!-- <span v-if="goodsStore.cartInfo.costSummary.goodsDiscountAmount">
                         <span>折扣:{{ goodsStore.cartInfo.costSummary.goodsDiscountAmount }}</span>
@@ -123,8 +123,8 @@
             :total="Number(buyerTable.total)" v-model:current-page="buyerTable.page" @current-change="getBuyerList" />
     </el-dialog>
     <el-dialog v-model="showCoupon"
-        :title="`添加优惠（商品原价：￥${formatDecimal(goodsStore.cartInfo.costSummary.goodsRealAmount || 0)}）`" top="5vh" width="80%"
-        @open="couponDialogOpen">
+        :title="`添加优惠（商品原价：￥${formatDecimal(goodsStore.cartInfo.costSummary.goodsRealAmount || 0)}）`" top="5vh"
+        width="80%" @open="couponDialogOpen">
         <div class="coupom_dialog">
             <el-form ref="couponFormRef" :model="couponForm" label-width="100" label-position="left">
                 <el-form-item label="选择用户">
@@ -463,8 +463,8 @@ function upadatePayData() {
         userId: goodsStore.vipUserInfo.userId || '',
         allPack: goodsStore.allSelected,
         limitRate: goodsStore.limitDiscountRes,
-        newCustomerDiscountId: goodsStore.newCustomerDiscount !== null ? goodsStore.newCustomerDiscount.id : '', // 新客立减Id
-        newCustomerDiscountAmount: goodsStore.newCustomerDiscount !== null ? goodsStore.newCustomerDiscount.amount : 0, // 新客立减金额
+        newCustomerDiscountId: goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.id : goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.id : '', // 新客立减Id
+        newCustomerDiscountAmount: goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.amount : 0, // 新客立减金额
         vipDiscountAmount: goodsStore.cartInfo.costSummary.vipDiscountAmount, // 超级会员折扣
     }
 }
diff --git a/src/store/goods.js b/src/store/goods.js
index 526943b..7088418 100644
--- a/src/store/goods.js
+++ b/src/store/goods.js
@@ -82,8 +82,8 @@ export const useGoods = defineStore("goods", {
     cartOrderItem: "",
     pendingList: useStorage.get("pendingList") || [],
     fullReductionActivities: '', // 满减活动配置信息
-    limitDiscountRes: '', // 限时折扣
-    newCustomerDiscount: '' // 新客立减
+    limitDiscountRes: null, // 限时折扣
+    newUserDiscount: null // 新客立减
   }),
   actions: {
     // 选择会员
@@ -404,7 +404,7 @@ export const useGoods = defineStore("goods", {
 
         // 新客立减
         if (this.vipUserInfo.id) {
-          this.newCustomerDiscount = await getDiscountByUserId({
+          this.newUserDiscount = await getDiscountByUserId({
             shopId: store.shopInfo.id,
             shopUserId: this.vipUserInfo.id,
             orderId: this.orderListInfo.id || ''
@@ -858,7 +858,7 @@ export const useGoods = defineStore("goods", {
         pointsPerYuan: 0, // 积分换算规律
         maxDeductionAmount: 0, // 最大抵扣
         userPoints: 0, // 使用积分数量
-        newUserDiscount: 0, // 新客立减
+        newUserDiscount: this.newUserDiscount, // 新客立减
         fixedAmount: 0, // 商家减免
         backendCoupons: [], // 已选择的优惠券
       };
@@ -929,8 +929,10 @@ export const useGoods = defineStore("goods", {
         fixedAmount: options.fixedAmount,
       });
 
-      //新客立减
-      const newUserDiscount = ref(options.newUserDiscount);
+
+      console.log('this.newUserDiscount', this.newUserDiscount);
+
+
       // 订单额外配置
       const orderExtraConfig = computed(() => ({
         // 引用扩展后的商家减免配置
@@ -946,7 +948,7 @@ export const useGoods = defineStore("goods", {
         currentDinnerType: dinnerType.value,
         limitTimeDiscount: this.limitDiscountRes,
         shopUserInfo: this.vipUserInfo,
-        newUserDiscount: newUserDiscount.value,
+        newUserDiscount: this.newUserDiscount !== null ? this.newUserDiscount.amount : '', //新客立减
       }));
 
       // 营销活动列表