@pisell/private-materials 6.11.55 → 6.11.57

package/lib/components/shoppingCart/hooks/usePromotionModal.js

@@ -374,7 +374,7 @@ var usePromotionModal = (options) => {
     try {
       const selectedIds = Array.isArray(selected) ? selected.map((item) => (item == null ? void 0 : item.value) || item) : [selected];
       const _selectedProduct = (0, import_utils4.findSelectedProductsFromList)(
-        products,
+        productsRef.current,
         selectedIds
       );
       if (!(_selectedProduct == null ? void 0 : _selectedProduct.length)) return;

package/lib/components/shoppingCart/type.d.ts

@@ -54,5 +54,6 @@ export interface ProductProps {
     isAdd?: boolean;
     openPromotionModal?: (products: any[]) => void;
     promotionProducts?: any[];
+    isShowPromotionAlert?: boolean;
 }
 export {};

package/lib/components/shoppingCart/utils.js

@@ -338,7 +338,9 @@ var updateProductInList = (props) => {
     let _products = (products || []).map((item) => {
       if (item.id === productId) {
         return {
-          ...cacheItem
+          ...cacheItem,
+          // 增加初始价格，用于赠品处理
+          _initPrice: item == null ? void 0 : item._initPrice
         };
       }
       return item;

package/lib/components/ticketBooking/components/ticketBooking/index.less

@@ -20,6 +20,7 @@
       padding-top: 10px;
       display: flex;
       flex-direction: column;
+      position: relative;
 
       .pisell-lowcode__booking-service-wrap {
         flex: 1;

package/lib/components/ticketBooking/hooks/pisellos/useProducts.js

@@ -39,7 +39,6 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_dayjs = __toESM(require("dayjs"));
 var import_useLogger = __toESM(require("../../../../hooks/useLogger"));
 var import_usePromotion = __toESM(require("../../../booking/hooks/usePromotion"));
-var import_utils = require("@pisell/utils");
 var useProducts = (notAvailableRef) => {
   var _a;
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
@@ -52,7 +51,6 @@ var useProducts = (notAvailableRef) => {
   const { getApp } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const logger = (0, import_useLogger.default)();
   const { formatProductList } = (0, import_usePromotion.default)();
-  const useCurrentId = (0, import_react.useRef)((0, import_utils.getUniqueId)());
   const app = getApp();
   const [scheduleTimePoints, setScheduleTimePoints] = (0, import_react.useState)([]);
   const scheduledTaskQueueIdRef = (0, import_react.useRef)("booking-schedule-products");
@@ -68,16 +66,7 @@ var useProducts = (notAvailableRef) => {
           params
         }
       });
-      const products2 = await bookingTicket.loadProducts(params, {
-        callback: (res) => {
-          var _a3, _b;
-          console.log(res, "1234321");
-          if ((_a3 = res == null ? void 0 : res.data) == null ? void 0 : _a3.list) {
-            setProducts(formatProductList((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.list));
-          }
-        },
-        subscriberId: useCurrentId
-      });
+      const products2 = await bookingTicket.loadProducts(params);
       logger.addLog({
         title: "useProducts: getProducts 返回",
         metadata: {
@@ -101,11 +90,6 @@ var useProducts = (notAvailableRef) => {
       isFirstLoadRef.current = false;
     }
   });
-  (0, import_react.useEffect)(() => {
-    return () => {
-      bookingTicket.unsubscribeProductQuery(useCurrentId);
-    };
-  }, []);
   (0, import_react.useEffect)(() => {
     var _a2, _b, _c;
     if (platform === "shop") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.55",
+  "version": "6.11.57",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -67,10 +67,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.11.17",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8"
+    "@pisell/date-picker": "3.0.8",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",