From 1c6739532a5ac6b0797038b810853b4989fab54a Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 15 Oct 2025 10:32:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=B2=E9=80=89=E5=88=B8=E5=88=B8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/order.vue | 25 +++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index 63b2f62..e46bcb2 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -88,7 +88,7 @@
               <el-table-column prop="name" label="券名称"></el-table-column>
               <el-table-column label="券类型" width="80">
                 <template v-slot="scope">
-                  {{ UTILS.returnCoupType(scope.row.type) }}
+                  {{ UTILS.returnCoupType(scope.row) }}
                 </template>
               </el-table-column>
               <el-table-column label="商品信息">
@@ -166,6 +166,12 @@
             }}
           </span>
         </div>
+        <div class="u-flex u-m-b-10 u-row-between">
+          <span class="title">满减活动</span>
+          <span class="u-m-l-10 value">
+            -￥{{ carts.orderCostSummary.fullReduction.actualAmount }}
+          </span>
+        </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">商品优惠券</span>
           <span class="u-m-l-10 value">-￥{{ productCouponDiscountAmount }}</span>
@@ -258,9 +264,7 @@ const refCoupon = ref();
 let quansSelArr = ref([]);
 function openCoupon() {
   //商品订单金额
-  const price = new BigNumber(carts.orderCostSummary.goodsOriginalAmount)
-    .minus(carts.orderCostSummary.goodsDiscountAmount)
-    .toFixed(2);
+  const price = carts.orderCostSummary.goodsRealAmount;
   refCoupon.value.open(price, props.orderInfo);
 }
 
@@ -310,6 +314,7 @@ function discountConfirm(e) {
 // 计算商家减免前金额（使用bignumber.js确保精度）
 function returnMerchantReductionDiscount() {
   const {
+    fullReduction, //满减活动
     goodsOriginalAmount, // 商品原价总和
     goodsDiscountAmount, // 商品折扣
     couponDeductionAmount, // 优惠券抵扣
@@ -330,6 +335,7 @@ function returnMerchantReductionDiscount() {
 
   // 按照原逻辑进行精确计算
   const total = originalAmount
+    .minus(fullReduction.actualAmount) // 减去满减活动抵扣金额
     .minus(discountAmount) // 减去商品折扣
     .minus(couponAmount) // 减去优惠券抵扣
     .minus(pointAmount) // 减去积分抵扣
@@ -368,15 +374,7 @@ const props = defineProps({
     default: () => {},
   },
 });
-const seatAmount = computed(() => {
-  if (shopUser.userInfo.isTableFee) {
-    return "0.00";
-  }
-  if (props.perpole >= 1) {
-    return (props.perpole * shopUser.userInfo.tableFee).toFixed(2);
-  }
-  return "0.00";
-});
+
 watch(
   () => props.user.id,
   (newval) => {
@@ -673,7 +671,6 @@ const totalPrice = computed(() => {
 //应付金额
 const currentpayMoney = computed(() => {
   return carts.orderCostSummary.finalPayAmount;
-  // return (totalMoney.value * 1 + carts.packFee * 1 + seatAmount.value * 1).toFixed(2);
 });
 watch(
   () => currentpayMoney.value,