@pisell/private-materials 6.11.55 → 6.11.57

package/es/components/booking/components/footer/amount.js

@@ -863,6 +863,7 @@ var clearSurchargeFee = function clearSurchargeFee(state) {
         var _item$_extend$other7;
         var item = _step14.value;
         item._extend.surcharge_fee = 0;
+        item._extend.surcharge_rounding_remainder = undefined;
         item._extend.relation_surcharge_ids = [];
         var _iterator15 = _createForOfIteratorHelper(((_item$_extend$other7 = item._extend.other) === null || _item$_extend$other7 === void 0 ? void 0 : _item$_extend$other7.bundle) || []),
           _step15;
@@ -870,6 +871,7 @@ var clearSurchargeFee = function clearSurchargeFee(state) {
           for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
             var bundleItem = _step15.value;
             bundleItem.surcharge_fee = 0;
+            bundleItem.surcharge_rounding_remainder = undefined;
             bundleItem.relation_surcharge_ids = [];
           }
         } catch (err) {
@@ -883,6 +885,7 @@ var clearSurchargeFee = function clearSurchargeFee(state) {
           for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
             var relationDetail = _step16.value;
             relationDetail.surcharge_fee = 0;
+            relationDetail.surcharge_rounding_remainder = undefined;
             relationDetail.relation_surcharge_ids = [];
           }
         } catch (err) {
@@ -905,6 +908,7 @@ var clearSurchargeFee = function clearSurchargeFee(state) {
         var _item3$_extend$other;
         var _item3 = _step17.value;
         _item3._extend.surcharge_fee = 0;
+        _item3._extend.surcharge_rounding_remainder = undefined;
         _item3._extend.relation_surcharge_ids = [];
         var _iterator18 = _createForOfIteratorHelper(((_item3$_extend$other = _item3._extend.other) === null || _item3$_extend$other === void 0 ? void 0 : _item3$_extend$other.bundle) || []),
           _step18;
@@ -912,6 +916,7 @@ var clearSurchargeFee = function clearSurchargeFee(state) {
           for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
             var _bundleItem2 = _step18.value;
             _bundleItem2.surcharge_fee = 0;
+            _bundleItem2.surcharge_rounding_remainder = undefined;
             _bundleItem2.relation_surcharge_ids = [];
           }
         } catch (err) {

package/es/components/booking/hooks/usePromotion.js

@@ -1060,9 +1060,11 @@ var usePromotion = function usePromotion(state, dispatch, options) {
                     _giftInfo: _giftData
                   }, priceParams), {}, {
                     quantity: (giftData === null || giftData === void 0 ? void 0 : giftData.giftCount) || 1
-                  }),
-                  discount_list: formatDiscountLists(cacheItem, giftData === null || giftData === void 0 ? void 0 : giftData.strategyName)
+                  })
                 });
+
+                // 设置赠品折扣信息
+                product.discount_list = formatDiscountLists(product, giftData === null || giftData === void 0 ? void 0 : giftData.strategyName);
                 resolve(product);
               });
             }));

package/es/components/checkout/PaymentModal.js

@@ -1275,7 +1275,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   };
   var handleSendCustomerPaymentLink = /*#__PURE__*/function () {
     var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(data) {
-      var order, stateAmount, isCurrentOrderSynced, res;
+      var order, stateAmount, res;
       return _regeneratorRuntime().wrap(function _callee13$(_context13) {
         while (1) switch (_context13.prev = _context13.next) {
           case 0:
@@ -1290,20 +1290,15 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             _context13.next = 5;
             return checkoutModule.setDepositAmountAsync(stateAmount);
           case 5:
-            isCurrentOrderSynced = checkoutModule.isCurrentOrderSynced();
-            if (isCurrentOrderSynced) {
-              _context13.next = 9;
-              break;
-            }
-            _context13.next = 9;
+            _context13.next = 7;
             return checkoutModule.manualSyncOrderAsync();
-          case 9:
-            _context13.next = 11;
+          case 7:
+            _context13.next = 9;
             return checkoutModule.sendCustomerPayLinkAsync({
               emails: data.emails,
               order_ids: [checkoutModule.getCurrentOrderId()]
             });
-          case 11:
+          case 9:
             res = _context13.sent;
             // 支付链接发送成功 转 toC，这边可以关掉了
             if (res.success) {
@@ -1312,7 +1307,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             } else {
               Toast === null || Toast === void 0 || Toast.error(res.message || locales.getText('pisell2.checkout.send-payment-link.error'));
             }
-          case 13:
+          case 11:
           case "end":
             return _context13.stop();
         }

package/es/components/list/hooks/useListState.js

@@ -10,7 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { useReducer, useCallback, useEffect, useRef } from 'react';
+import { useReducer, useCallback, useEffect } from 'react';
 
 // 状态接口
 
@@ -61,31 +61,19 @@ export var useListState = function useListState(_ref) {
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
-
-  // 用 ref 追踪最新的 activeTab，避免将 state.activeTab 加入 useEffect 依赖导致循环触发
-  var activeTabRef = useRef(initialState.activeTab);
-  activeTabRef.current = state.activeTab;
   useEffect(function () {
-    debugger;
     if (!isTreeTab) {
       setActiveTab(['0']);
       return;
     }
     if (tabStyle === 'switch' && tabItems.length > 0) {
       var _tabItems$;
-      // 取当前 activeTab 的首层 key 判断是否仍存在于新的 tabItems 中
-      var currentActive = activeTabRef.current;
-      var currentActiveKey = Array.isArray(currentActive) ? currentActive[0] : currentActive;
-      var isCurrentTabStillValid = currentActiveKey && tabItems.some(function (tab) {
-        return tab.key == currentActiveKey;
-      });
-      if (isCurrentTabStillValid) {
-        return;
-      }
       var defaultTab = [tabItems[0].key];
       if (((_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 || (_tabItems$ = _tabItems$.children) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.length) > 0) {
         defaultTab.push('0');
       }
+      // setActiveTab(defaultTab);
+      // const defaultTab = PisellTabbar.getDefaultActiveKey(tabItems, 'id');
       setActiveTab(defaultTab);
     }
   }, [tabItems, isTreeTab]);

package/es/components/shoppingCart/components/Cart/Product.js

@@ -28,7 +28,9 @@ var Product = function Product(props) {
     lists = props.lists,
     _props$isAdd = props.isAdd,
     isAdd = _props$isAdd === void 0 ? true : _props$isAdd,
-    openPromotionModal = props.openPromotionModal;
+    openPromotionModal = props.openPromotionModal,
+    _props$isShowPromotio = props.isShowPromotionAlert,
+    isShowPromotionAlert = _props$isShowPromotio === void 0 ? false : _props$isShowPromotio;
   var _useContext = useContext(),
     state = _useContext.state,
     _onAction = _useContext.onAction,
@@ -203,7 +205,10 @@ var Product = function Product(props) {
   return useMemo(function () {
     console.log('render cart', lists);
     return /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__shopping-cart-content"
+      className: "pisell-lowcode__shopping-cart-content",
+      style: {
+        paddingBottom: isShowPromotionAlert ? '66px' : 0
+      }
     }, clearCart, normalItems.map(renderProductItem), editItems.length > 0 && /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__shopping-cart-edit"
     }, /*#__PURE__*/React.createElement("div", {
@@ -232,6 +237,6 @@ var Product = function Product(props) {
         transition: 'max-height 0.3s ease'
       }
     }, editItems.map(renderProductItem))), !hideAddBtn && platform !== 'h5' && isAdd ? useAddService(id, 'more') : null);
-  }, [clearCart, editItems, normalItems, productParams, hideAddBtn, isAdd, platform, isEditExpanded]);
+  }, [clearCart, editItems, normalItems, productParams, hideAddBtn, isAdd, platform, isEditExpanded, isShowPromotionAlert]);
 };
 export default Product;

package/es/components/shoppingCart/components/Cart/index.js

@@ -75,6 +75,26 @@ var Cart = function Cart() {
     openModal = _usePromotionModal.openModal,
     MarketingModal = _usePromotionModal.MarketingModal;
 
+  /**
+   * @description: 是否显示营销提示
+   * @param {*} useMemo
+   * @return {*}
+   */
+  var _isShowPromotionAlert = useMemo(function () {
+    var _ref3 = cartInfo || {},
+      promotions = _ref3.promotions,
+      _ref3$isShowPromotion = _ref3.isShowPromotionAlert,
+      isShowPromotionAlert = _ref3$isShowPromotion === void 0 ? true : _ref3$isShowPromotion;
+    if (!isShowPromotionAlert || !(promotions !== null && promotions !== void 0 && promotions.length)) return false;
+
+    // 过滤只有买几送几的营销才显示
+    var _promotions = (promotions || []).filter(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.actionType) === 'X_ITEMS_FOR_Y_PRICE';
+    });
+    if (!(_promotions !== null && _promotions !== void 0 && _promotions.length)) return false;
+    return true;
+  }, [JSON.stringify(cartInfo)]);
+
   /**
    * @title: 折叠面板
    * @description:
@@ -95,14 +115,15 @@ var Cart = function Cart() {
           id: item === null || item === void 0 ? void 0 : item.key,
           lists: item === null || item === void 0 ? void 0 : item.products,
           isAdd: state.maxLength > _length,
-          openPromotionModal: openModal
+          openPromotionModal: openModal,
+          isShowPromotionAlert: _isShowPromotionAlert
         }) : /*#__PURE__*/React.createElement(Empty, {
           id: item === null || item === void 0 ? void 0 : item.key
         }),
         showArrow: platform === 'shop'
       });
     });
-  }, [carts, platform, openModal, state.maxLength]);
+  }, [carts, platform, openModal, state.maxLength, _isShowPromotionAlert]);
   var handleOpenPromotionModal = useMemoizedFn(function (item) {
     var _item$giftData, _currentItem, _currentItem2, _currentItem3, _item$giftData2;
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'gift';
@@ -133,8 +154,8 @@ var Cart = function Cart() {
         return _id && ((_currentItem4 = currentItem) === null || _currentItem4 === void 0 || (_currentItem4 = _currentItem4.sourceProductId) === null || _currentItem4 === void 0 ? void 0 : _currentItem4.includes(_id));
       });
       if (isMultiple) {
-        var _ref3;
-        selected = (_ref3 = selectedProducts || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (option) {
+        var _ref4;
+        selected = (_ref4 = selectedProducts || []) === null || _ref4 === void 0 ? void 0 : _ref4.map(function (option) {
           var _option$_extend;
           return {
             value: option === null || option === void 0 ? void 0 : option.id,
@@ -167,16 +188,13 @@ var Cart = function Cart() {
    * @return {*}
    */
   var promotionAlert = useMemo(function () {
-    var _ref5;
-    var _ref4 = cartInfo || {},
-      promotions = _ref4.promotions,
-      _ref4$isShowPromotion = _ref4.isShowPromotionAlert,
-      isShowPromotionAlert = _ref4$isShowPromotion === void 0 ? true : _ref4$isShowPromotion;
-    if (!isShowPromotionAlert) return null;
+    var _ref5 = cartInfo || {},
+      promotions = _ref5.promotions;
+    if (!_isShowPromotionAlert) return null;
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefixCls, "-promotion-alert")
-    }, /*#__PURE__*/React.createElement("div", null, (_ref5 = promotions || []) === null || _ref5 === void 0 ? void 0 : _ref5.map(function (item) {
-      return (item === null || item === void 0 ? void 0 : item.actionType) === 'X_ITEMS_FOR_Y_PRICE' ? /*#__PURE__*/React.createElement(PisellAlert, {
+    }, /*#__PURE__*/React.createElement("div", null, promotions === null || promotions === void 0 ? void 0 : promotions.map(function (item) {
+      return /*#__PURE__*/React.createElement(PisellAlert, {
         description: locales.getText('pisell2.text.shopping-cart.marketing.alert')(item === null || item === void 0 ? void 0 : item.needQuantity, translationOriginal === null || translationOriginal === void 0 ? void 0 : translationOriginal(item === null || item === void 0 ? void 0 : item.strategyName)),
         type: "error",
         action: /*#__PURE__*/React.createElement(Button, {
@@ -186,9 +204,9 @@ var Cart = function Cart() {
         }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.text.shopping-cart.marketing.browse.items')), /*#__PURE__*/React.createElement(Iconfont, {
           type: "pisell2-arrow-right"
         }))
-      }) : null;
+      });
     })));
-  }, [JSON.stringify(cartInfo)]);
+  }, [JSON.stringify(cartInfo), _isShowPromotionAlert]);
   return useMemo(function () {
     console.log('render cart 22222', state.prodcuts);
     return /*#__PURE__*/React.createElement("div", {
@@ -196,7 +214,8 @@ var Cart = function Cart() {
     }, isProductList ? /*#__PURE__*/React.createElement(Product, {
       id: undefined,
       lists: state === null || state === void 0 ? void 0 : state.products,
-      openPromotionModal: handleOpenPromotionModal
+      openPromotionModal: handleOpenPromotionModal,
+      isShowPromotionAlert: _isShowPromotionAlert
     }) : /*#__PURE__*/React.createElement(Collapse, _extends({
       items: cartsMap,
       showHeader: true,
@@ -210,6 +229,6 @@ var Cart = function Cart() {
         onActiveKey(key);
       }
     }, collapseParams)), promotionAlert, MarketingModal);
-  }, [isProductList, cartsMap, platform, collapseParams, state === null || state === void 0 ? void 0 : state.products, promotionAlert, MarketingModal, handleOpenPromotionModal]);
+  }, [isProductList, cartsMap, platform, collapseParams, state === null || state === void 0 ? void 0 : state.products, promotionAlert, MarketingModal, handleOpenPromotionModal, _isShowPromotionAlert]);
 };
 export default Cart;

package/es/components/shoppingCart/components/Cart/index.less

@@ -110,9 +110,10 @@
   //}
 
   &-promotion-alert {
-    margin-top: 16px;
+    flex-shrink: 0;
+    margin-top: 0 !important;
     z-index: 10;
-    position: sticky;
+    position: absolute !important;
     bottom: 0;
     background: transparent;
 

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

@@ -523,7 +523,7 @@ export var usePromotionModal = function usePromotionModal(options) {
       var selectedIds = Array.isArray(selected) ? selected.map(function (item) {
         return (item === null || item === void 0 ? void 0 : item.value) || item;
       }) : [selected];
-      var _selectedProduct = findSelectedProductsFromList(products, selectedIds);
+      var _selectedProduct = findSelectedProductsFromList(productsRef.current, selectedIds);
       if (!(_selectedProduct !== null && _selectedProduct !== void 0 && _selectedProduct.length)) return;
       var promotionInfo = (currentItem === null || currentItem === void 0 ? void 0 : currentItem.promotionInfo) || {};
       promotionInfo.lastEvaluatedGiftCount = (currentItem === null || currentItem === void 0 || (_currentItem$selected = currentItem.selectedProducts) === null || _currentItem$selected === void 0 || (_currentItem$selected = _currentItem$selected[0]) === null || _currentItem$selected === void 0 || (_currentItem$selected = _currentItem$selected._giftInfo) === null || _currentItem$selected === void 0 ? void 0 : _currentItem$selected.lastEvaluatedGiftCount) || 1;

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

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

package/es/components/shoppingCart/utils.js

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

package/es/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/es/components/ticketBooking/hooks/pisellos/useProducts.js

@@ -20,7 +20,6 @@ import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContex
 import dayjs from 'dayjs';
 import useLogger from "../../../../hooks/useLogger";
 import usePromotion from "../../../booking/hooks/usePromotion";
-import { getUniqueId } from "@pisell/utils";
 // 等待函数
 var sleep = function sleep(ms) {
   return new Promise(function (resolve) {
@@ -47,7 +46,6 @@ export var useProducts = function useProducts(notAvailableRef) {
   var logger = useLogger();
   var _usePromotion = usePromotion(),
     formatProductList = _usePromotion.formatProductList;
-  var useCurrentId = useRef(getUniqueId());
   var app = getApp();
 
   // 日程时间段列表 HH:mm格式
@@ -73,17 +71,7 @@ export var useProducts = function useProducts(notAvailableRef) {
               }
             });
             _context.next = 6;
-            return bookingTicket.loadProducts(params, {
-              callback: function callback(res) {
-                var _res$data;
-                console.log(res, '1234321');
-                if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.list) {
-                  var _res$data2;
-                  setProducts(formatProductList(res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list));
-                }
-              },
-              subscriberId: useCurrentId
-            });
+            return bookingTicket.loadProducts(params);
           case 6:
             _products = _context.sent;
             logger.addLog({
@@ -122,11 +110,6 @@ export var useProducts = function useProducts(notAvailableRef) {
       return _ref2.apply(this, arguments);
     };
   }());
-  useEffect(function () {
-    return function () {
-      bookingTicket.unsubscribeProductQuery(useCurrentId);
-    };
-  }, []);
 
   // 注册任务函数并在 scheduleTimePoints 改变时添加定时任务
   useEffect(function () {

package/lib/components/booking/components/footer/amount.js

@@ -511,13 +511,16 @@ var clearSurchargeFee = (state) => {
   if (Array.isArray(service == null ? void 0 : service.value)) {
     for (let item of service.value) {
       item._extend.surcharge_fee = 0;
+      item._extend.surcharge_rounding_remainder = void 0;
       item._extend.relation_surcharge_ids = [];
       for (let bundleItem of ((_a = item._extend.other) == null ? void 0 : _a.bundle) || []) {
         bundleItem.surcharge_fee = 0;
+        bundleItem.surcharge_rounding_remainder = void 0;
         bundleItem.relation_surcharge_ids = [];
       }
       for (let relationDetail of item._extend.relation_details || []) {
         relationDetail.surcharge_fee = 0;
+        relationDetail.surcharge_rounding_remainder = void 0;
         relationDetail.relation_surcharge_ids = [];
       }
     }
@@ -525,9 +528,11 @@ var clearSurchargeFee = (state) => {
   if (Array.isArray(addons == null ? void 0 : addons.value)) {
     for (let item of addons.value) {
       item._extend.surcharge_fee = 0;
+      item._extend.surcharge_rounding_remainder = void 0;
       item._extend.relation_surcharge_ids = [];
       for (let bundleItem of ((_b = item._extend.other) == null ? void 0 : _b.bundle) || []) {
         bundleItem.surcharge_fee = 0;
+        bundleItem.surcharge_rounding_remainder = void 0;
         bundleItem.relation_surcharge_ids = [];
       }
     }

package/lib/components/booking/hooks/usePromotion.js

@@ -578,7 +578,7 @@ var usePromotion = (state, dispatch, options) => {
                 origin_total: ((_b2 = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b2.price) || (cacheItem == null ? void 0 : cacheItem.price) || 0,
                 _initPrice: (cacheItem == null ? void 0 : cacheItem.price) || 0
               };
-              const product = {
+              let product = {
                 ...cacheItem,
                 ...priceParams,
                 _giftInfo: _giftData,
@@ -587,9 +587,9 @@ var usePromotion = (state, dispatch, options) => {
                   _giftInfo: _giftData,
                   ...priceParams,
                   quantity: (giftData == null ? void 0 : giftData.giftCount) || 1
-                },
-                discount_list: (0, import_utils2.formatDiscountLists)(cacheItem, giftData == null ? void 0 : giftData.strategyName)
+                }
               };
+              product.discount_list = (0, import_utils2.formatDiscountLists)(product, giftData == null ? void 0 : giftData.strategyName);
               resolve(product);
             });
           });

package/lib/components/checkout/PaymentModal.js

@@ -899,10 +899,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         const stateAmount = checkoutModule.getStateAmount();
         await checkoutModule.setDepositAmountAsync(stateAmount);
       }
-      const isCurrentOrderSynced = checkoutModule.isCurrentOrderSynced();
-      if (!isCurrentOrderSynced) {
-        await checkoutModule.manualSyncOrderAsync();
-      }
+      await checkoutModule.manualSyncOrderAsync();
       const res = await checkoutModule.sendCustomerPayLinkAsync({
         emails: data.emails,
         order_ids: [checkoutModule.getCurrentOrderId()]

package/lib/components/list/hooks/useListState.js

@@ -51,22 +51,13 @@ var useListState = ({
     isStickyActive: false
   };
   const [state, dispatch] = (0, import_react.useReducer)(listStateReducer, initialState);
-  const activeTabRef = (0, import_react.useRef)(initialState.activeTab);
-  activeTabRef.current = state.activeTab;
   (0, import_react.useEffect)(() => {
     var _a, _b;
-    debugger;
     if (!isTreeTab) {
       setActiveTab(["0"]);
       return;
     }
     if (tabStyle === "switch" && tabItems.length > 0) {
-      const currentActive = activeTabRef.current;
-      const currentActiveKey = Array.isArray(currentActive) ? currentActive[0] : currentActive;
-      const isCurrentTabStillValid = currentActiveKey && tabItems.some((tab) => tab.key == currentActiveKey);
-      if (isCurrentTabStillValid) {
-        return;
-      }
       const defaultTab = [tabItems[0].key];
       if (((_b = (_a = tabItems[0]) == null ? void 0 : _a.children) == null ? void 0 : _b.length) > 0) {
         defaultTab.push("0");

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -48,7 +48,8 @@ var Product = (props) => {
     id,
     lists,
     isAdd = true,
-    openPromotionModal
+    openPromotionModal,
+    isShowPromotionAlert = false
   } = props;
   const { state, onAction, onChange } = (0, import_useContext.useContext)();
   const {
@@ -195,7 +196,7 @@ var Product = (props) => {
   });
   return (0, import_react.useMemo)(() => {
     console.log("render cart", lists);
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content" }, clearCart, normalItems.map(renderProductItem), editItems.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-edit" }, /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content", style: { paddingBottom: isShowPromotionAlert ? "66px" : 0 } }, clearCart, normalItems.map(renderProductItem), editItems.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-edit" }, /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "pisell-lowcode__shopping-cart-edit-header",
@@ -226,6 +227,6 @@ var Product = (props) => {
       },
       editItems.map(renderProductItem)
     )), !hideAddBtn && platform !== "h5" && isAdd ? (0, import_useAddService.default)(id, "more") : null);
-  }, [clearCart, editItems, normalItems, productParams, hideAddBtn, isAdd, platform, isEditExpanded]);
+  }, [clearCart, editItems, normalItems, productParams, hideAddBtn, isAdd, platform, isEditExpanded, isShowPromotionAlert]);
 };
 var Product_default = Product;

package/lib/components/shoppingCart/components/Cart/index.js

@@ -50,13 +50,7 @@ import_utils.locales.init(import_locales.default, localStorage.getItem("umi_loca
 var prefixCls = "pisell-lowcode__shopping-cart";
 var Cart = () => {
   const { state, updateState, onActiveKey, onChange, externalState } = (0, import_useContext.useContext)();
-  const {
-    platform,
-    carts,
-    isProductList,
-    collapseParams,
-    cartInfo
-  } = state;
+  const { platform, carts, isProductList, collapseParams, cartInfo } = state;
   const translationOriginal = (0, import_useTranslationOriginal.default)();
   const { openModal, MarketingModal } = (0, import_usePromotionModal.usePromotionModal)({
     onConfirm: async (selectedProduct) => {
@@ -71,6 +65,15 @@ var Cart = () => {
       onChange(params, key);
     }
   });
+  const _isShowPromotionAlert = (0, import_react.useMemo)(() => {
+    const { promotions, isShowPromotionAlert = true } = cartInfo || {};
+    if (!isShowPromotionAlert || !(promotions == null ? void 0 : promotions.length)) return false;
+    const _promotions = (promotions || []).filter(
+      (item) => (item == null ? void 0 : item.actionType) === "X_ITEMS_FOR_Y_PRICE"
+    );
+    if (!(_promotions == null ? void 0 : _promotions.length)) return false;
+    return true;
+  }, [JSON.stringify(cartInfo)]);
   const cartsMap = (0, import_react.useMemo)(() => {
     return carts == null ? void 0 : carts.map((item) => {
       var _a, _b, _c;
@@ -86,13 +89,14 @@ var Cart = () => {
             id: item == null ? void 0 : item.key,
             lists: item == null ? void 0 : item.products,
             isAdd: state.maxLength > _length,
-            openPromotionModal: openModal
+            openPromotionModal: openModal,
+            isShowPromotionAlert: _isShowPromotionAlert
           }
         ) : /* @__PURE__ */ import_react.default.createElement(import_Empty.default, { id: item == null ? void 0 : item.key }),
         showArrow: platform === "shop"
       };
     });
-  }, [carts, platform, openModal, state.maxLength]);
+  }, [carts, platform, openModal, state.maxLength, _isShowPromotionAlert]);
   const handleOpenPromotionModal = (0, import_ahooks.useMemoizedFn)(
     (item, type = "gift") => {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i;
@@ -118,7 +122,9 @@ var Cart = () => {
         const services = ((_f = externalState == null ? void 0 : externalState.service) == null ? void 0 : _f.value) || [];
         selectedProducts = services == null ? void 0 : services.filter((option) => {
           var _a2, _b2;
-          const _id = (0, import_utils2.getPureSourceProductId)((_a2 = option == null ? void 0 : option._giftInfo) == null ? void 0 : _a2.sourceProductId);
+          const _id = (0, import_utils2.getPureSourceProductId)(
+            (_a2 = option == null ? void 0 : option._giftInfo) == null ? void 0 : _a2.sourceProductId
+          );
           return _id && ((_b2 = currentItem == null ? void 0 : currentItem.sourceProductId) == null ? void 0 : _b2.includes(_id));
         });
         if (isMultiple) {
@@ -150,34 +156,28 @@ var Cart = () => {
     }
   );
   const promotionAlert = (0, import_react.useMemo)(() => {
-    var _a;
-    const { promotions, isShowPromotionAlert = true } = cartInfo || {};
-    if (!isShowPromotionAlert) return null;
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-promotion-alert` }, /* @__PURE__ */ import_react.default.createElement("div", null, (_a = promotions || []) == null ? void 0 : _a.map(
-      (item) => (item == null ? void 0 : item.actionType) === "X_ITEMS_FOR_Y_PRICE" ? /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellAlert,
-        {
-          description: import_utils.locales.getText(
-            "pisell2.text.shopping-cart.marketing.alert"
-          )(
-            item == null ? void 0 : item.needQuantity,
-            translationOriginal == null ? void 0 : translationOriginal(item == null ? void 0 : item.strategyName)
-          ),
-          type: "error",
-          action: /* @__PURE__ */ import_react.default.createElement(
-            import_materials.Button,
-            {
-              onClick: () => handleOpenPromotionModal(item, "promotion")
-            },
-            /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText(
-              "pisell2.text.shopping-cart.marketing.browse.items"
-            )),
-            /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-arrow-right" })
-          )
-        }
-      ) : null
-    )));
-  }, [JSON.stringify(cartInfo)]);
+    const { promotions } = cartInfo || {};
+    if (!_isShowPromotionAlert) return null;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-promotion-alert` }, /* @__PURE__ */ import_react.default.createElement("div", null, promotions == null ? void 0 : promotions.map((item) => /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellAlert,
+      {
+        description: import_utils.locales.getText(
+          "pisell2.text.shopping-cart.marketing.alert"
+        )(item == null ? void 0 : item.needQuantity, translationOriginal == null ? void 0 : translationOriginal(item == null ? void 0 : item.strategyName)),
+        type: "error",
+        action: /* @__PURE__ */ import_react.default.createElement(
+          import_materials.Button,
+          {
+            onClick: () => handleOpenPromotionModal(item, "promotion")
+          },
+          /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText(
+            "pisell2.text.shopping-cart.marketing.browse.items"
+          )),
+          /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-arrow-right" })
+        )
+      }
+    ))));
+  }, [JSON.stringify(cartInfo), _isShowPromotionAlert]);
   return (0, import_react.useMemo)(() => {
     console.log("render cart 22222", state.prodcuts);
     return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__shopping-cart") }, isProductList ? /* @__PURE__ */ import_react.default.createElement(
@@ -185,7 +185,8 @@ var Cart = () => {
       {
         id: void 0,
         lists: state == null ? void 0 : state.products,
-        openPromotionModal: handleOpenPromotionModal
+        openPromotionModal: handleOpenPromotionModal,
+        isShowPromotionAlert: _isShowPromotionAlert
       }
     ) : /* @__PURE__ */ import_react.default.createElement(
       import_materials.Collapse,
@@ -210,7 +211,8 @@ var Cart = () => {
     state == null ? void 0 : state.products,
     promotionAlert,
     MarketingModal,
-    handleOpenPromotionModal
+    handleOpenPromotionModal,
+    _isShowPromotionAlert
   ]);
 };
 var Cart_default = Cart;

package/lib/components/shoppingCart/components/Cart/index.less

@@ -110,9 +110,10 @@
   //}
 
   &-promotion-alert {
-    margin-top: 16px;
+    flex-shrink: 0;
+    margin-top: 0 !important;
     z-index: 10;
-    position: sticky;
+    position: absolute !important;
     bottom: 0;
     background: transparent;