From 6d68c17970dbf0dd012f4356e77f14f6228a8dbf Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 25 Mar 2025 14:47:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=8C=E5=8F=B0=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=8F=B0=E6=A1=8C=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E8=B4=B9=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/carts.ts       | 20 +++++++++++---------
 src/views/tool/Instead/index.vue |  3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts
index ab45e73..dd75209 100644
--- a/src/store/modules/carts.ts
+++ b/src/store/modules/carts.ts
@@ -129,8 +129,11 @@ export const useCartsStore = defineStore("carts", () => {
   })
   //返回打包数量（称重商品打包数量最大为1）
   function returnCartPackNumber(cur: any) {
-    let pack_number = (dinnerType.value == 'take-out' ? cur.number : cur.pack_number * 1)
+    const maxReturnNum = cur.number - (cur.returnNum || 0);
+    let pack_number = (dinnerType.value == 'take-out' ? cur.number : cur.pack_number * 1);
     pack_number = (cur.product_type == 'weight' && pack_number > 1) ? 1 : pack_number;
+    pack_number = Math.min(maxReturnNum, pack_number);
+    pack_number = pack_number <= 0 ? 0 : pack_number
     return pack_number * 1
   }
   //打包数量
@@ -238,7 +241,7 @@ export const useCartsStore = defineStore("carts", () => {
       const price = (cur.discount_sale_amount * 1 || cur.salePrice || 0)
       return acc + cur.number * (discount_sale_amount || (useVipPrice.value ? memberPrice : price))
     }, 0)
-    return (money + packFee.value + oldOrderMoney.value * 1).toFixed(2)
+    return (money + packFee.value * 1 + oldOrderMoney.value * 1).toFixed(2)
   })
   //只算商品的总价
   const goodsTotal = computed(() => {
@@ -255,7 +258,7 @@ export const useCartsStore = defineStore("carts", () => {
     const cartNumber = list.value.reduce((acc: number, cur: any) => {
       return acc + cur.number * 1
     }, 0)
-    const giftNumber = list.value.reduce((acc: number, cur: any) => {
+    const giftNumber = giftList.value.reduce((acc: number, cur: any) => {
       return acc + cur.number * 1
     }, 0)
     let oldNumber = 0
@@ -299,11 +302,8 @@ export const useCartsStore = defineStore("carts", () => {
       })
       return
     }
-    if (cart.is_gift) {
-      isSelGift.value = true
-    } else {
-      isSelGift.value = false
-    }
+    selPlaceNum.value = -1;
+    isOldOrder.value = false;
 
     if (cart.is_gift) {
       isSelGift.value = true
@@ -314,6 +314,7 @@ export const useCartsStore = defineStore("carts", () => {
       isSelGift.value = false
       selListIndex.value = list.value.findIndex((item: CartsState) => item.id === cart.id);
     }
+
   }
 
 
@@ -518,7 +519,8 @@ export const useCartsStore = defineStore("carts", () => {
           product_name: v.productName,
           sku_name: v.skuName,
           sku_id: v.skuId,
-          product_type: v.productType
+          product_type: v.productType,
+          packFee: v.packAmount,
         }
       })
     }
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index a89d5cc..8364ef6 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -734,7 +734,7 @@ function init() {
   getTableList();
   getCategoryList();
   changeCartsDinerType();
-  carts.init({ table_code: table.tableCode }, oldOrder.value);
+  carts.init({ table_code: table.value.tableCode }, oldOrder.value);
 }
 
 onBeforeRouteLeave(() => {
@@ -794,6 +794,7 @@ onMounted(async () => {
       table.value = tableRes || {};
     }
   }
+  console.log(table.value);
   init();
 });