Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into ymf

src/store/modules/carts.ts

@@ -80,7 +80,8 @@ export const useCartsStore = defineStore("carts", () => {
         : undefined,
       skuData,
       is_time_discount: item.isTimeDiscount,
-      isTimeDiscount: item.isTimeDiscount
+      isTimeDiscount: item.isTimeDiscount,
+      salePrice: item.limitDiscountPrice
     };
   };
 
@@ -311,7 +312,7 @@ export const useCartsStore = defineStore("carts", () => {
     userPoints: userPoints.value,
     isMember: useVipPrice.value,
     memberDiscountRate: shopUser.userInfo.memberDiscountRate || 1,
-    fullReductionActivities: fullReductionActivities.value,
+    fullReductionActivities: [fullReductionActivities.value],
     currentDinnerType: dinnerType.value,
     limitTimeDiscount: limitDiscountRes.value,
     shopUserInfo: vipUser.value,
@@ -915,7 +916,8 @@ export const useCartsStore = defineStore("carts", () => {
     coupons,
     setCoupons,
     payParamsInit,
-    limitDiscountRes
+    limitDiscountRes,
+    getAllGoodsList
   };
 });