@pisell/private-materials 6.1.17 → 6.1.19

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -28,7 +28,7 @@ import { isBooking4Shop } from "../../../booking/info/utils";
 import { useService } from "../../../booking/info/service/serviceManager";
 import ProductSelect from "../../../productSelect";
 import "./index.less";
-import { addService, addServiceScroll, genServiceKey, getIsShowNumber } from "../../utils";
+import { addService, addServiceScroll, createSimpleCacheItem, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
 import NotAvailable from "../notAvailable";
 import dayjs from 'dayjs';
 import { useProducts } from "../../hooks/pisellos";
@@ -64,6 +64,21 @@ var AddSerivce = function AddSerivce(props) {
     getProducts = _useProducts.getProducts,
     products = _useProducts.products,
     loading = _useProducts.loading;
+
+  // 组件卸载时清理所有定时器
+  useEffect(function () {
+    return function () {
+      Object.values(debounceTimersRef.current).forEach(function (timer) {
+        if (timer) clearTimeout(timer);
+      });
+      debounceTimersRef.current = {};
+    };
+  }, []);
+
+  // 防抖相关的 refs
+  var pendingCacheValuesRef = useRef({});
+  var clickCountRef = useRef({});
+  var debounceTimersRef = useRef({});
   var menuList = useMemo(function () {
     var _state$bookingConfig;
     return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.menu_list_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.menu_list) || [];
@@ -194,6 +209,35 @@ var AddSerivce = function AddSerivce(props) {
       className: "add-toast-quantity"
     }, locales.getText('pisell2.ticket-booking.in-cart')(quantity || 1))));
   };
+  var executeCacheValues = useMemoizedFn(function (productId, originalCacheValues, item, originalCallback) {
+    var clickCount = clickCountRef.current[productId] || 1;
+
+    // 更新 quantity 为累积的点击次数
+    var finalCacheValues = _objectSpread(_objectSpread({}, originalCacheValues), {}, {
+      quantity: clickCount
+    });
+
+    // 清理当前商品的缓存数据
+    delete pendingCacheValuesRef.current[productId];
+    delete clickCountRef.current[productId];
+    delete debounceTimersRef.current[productId];
+
+    // 执行原始的回调函数
+    originalCallback(finalCacheValues, '', item, true);
+  });
+
+  // 为每个商品单独创建防抖函数
+  var debouncedExecuteCacheValues = useMemoizedFn(function (productId, cacheValues, item, callback) {
+    // 清除该商品的旧定时器
+    if (debounceTimersRef.current[productId]) {
+      clearTimeout(debounceTimersRef.current[productId]);
+    }
+
+    // 创建新的防抖定时器
+    debounceTimersRef.current[productId] = setTimeout(function () {
+      executeCacheValues(productId, cacheValues, item, callback);
+    }, 0);
+  });
   var handleSelectProduct = useMemoizedFn(function (item) {
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'select';
     console.log('handleSelectProduct');
@@ -220,8 +264,7 @@ var AddSerivce = function AddSerivce(props) {
       setCurrentProduct(item);
     } else {
       setCurrentProduct(null);
-      console.log('进入else isSession');
-      if (!isSession) {
+      if (!isSession && isNormalProductByDurationSchedule(item)) {
         cacheValues = {
           bundle: [],
           key: item.id,
@@ -231,26 +274,25 @@ var AddSerivce = function AddSerivce(props) {
           quantity: 1,
           rowKey: item.id,
           session: null,
-          unique: '08974625397'
+          unique: '08974625397',
+          _originalItem: item // 保存原始商品信息
         };
       }
     }
     var callback = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e, extension_type, detail) {
-        var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _Toast$success2, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData;
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e, extension_type, detail, notShowToast) {
+        var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              console.timeEnd('打开弹窗');
-              console.log('点击了加入购物车 ---弹窗', e);
               setCurrentProduct(null);
               // 防止选择商品弹窗多次触发callback
               if (!lock) {
-                _context.next = 5;
+                _context.next = 3;
                 break;
               }
               return _context.abrupt("return");
-            case 5:
+            case 3:
               lock = true;
 
               // 2秒后解除
@@ -258,23 +300,23 @@ var AddSerivce = function AddSerivce(props) {
                 lock = false;
               }, 2000);
               if (isBooking4) {
-                _context.next = 13;
+                _context.next = 11;
                 break;
               }
-              _context.next = 10;
+              _context.next = 8;
               return createBookingData({
                 product: _objectSpread(_objectSpread({}, detail || item), {}, {
                   _params: e
                 })
               });
-            case 10:
+            case 8:
               data = _context.sent;
               // 创建预约
               createBooking({
                 booking: data
               });
               return _context.abrupt("return");
-            case 13:
+            case 11:
               // info2 addService 逻辑
               _detail = detail || item;
               other = JSON.parse(JSON.stringify(e));
@@ -318,13 +360,9 @@ var AddSerivce = function AddSerivce(props) {
                 cacheItem.autoClose = false;
                 cacheItem._serviceKey = genServiceKey(cacheItem);
                 _addService2 = addService(_toConsumableArray(state.service.value), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity;
-                Toast === null || Toast === void 0 || (_Toast$success2 = Toast.success) === null || _Toast$success2 === void 0 || _Toast$success2.call(Toast, /*#__PURE__*/React.createElement("div", {
-                  className: "add-toast-wrap"
-                }, /*#__PURE__*/React.createElement("div", {
-                  className: "add-toast-title"
-                }, cacheItem.title), /*#__PURE__*/React.createElement("div", {
-                  className: "add-toast-quantity"
-                }, locales.getText('pisell2.ticket-booking.in-cart')(quantity || 1))));
+                if (!notShowToast) {
+                  handleAddToast(cacheItem.title, quantity || 1);
+                }
                 addServiceScroll(e.rowKey, cacheItem);
                 try {
                   if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
@@ -382,23 +420,45 @@ var AddSerivce = function AddSerivce(props) {
                 });
                 onEdit === null || onEdit === void 0 || onEdit(cacheItem);
               }
-            case 26:
+            case 24:
             case "end":
               return _context.stop();
           }
         }, _callee);
       }));
-      return function callback(_x, _x2, _x3) {
+      return function callback(_x, _x2, _x3, _x4) {
         return _ref.apply(this, arguments);
       };
     }();
+
     // 如果不需要打开弹窗, 直接添加数据
     if (cacheValues) {
-      console.log('进入cacheValues');
-      callback(cacheValues, '', item);
+      var _state$service$value, _detail$_extend, _Toast$success2;
+      var productId = item.id.toString();
+
+      // 如果已经有pending的同商品，增加点击次数
+      if (pendingCacheValuesRef.current[productId]) {
+        clickCountRef.current[productId] = (clickCountRef.current[productId] || 1) + 1;
+      } else {
+        // 第一次点击，初始化数据
+        pendingCacheValuesRef.current[productId] = cacheValues;
+        clickCountRef.current[productId] = 1;
+      }
+      var cacheItem = createSimpleCacheItem(item, cacheValues, state);
+      var detail = (_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.find(function (val) {
+        return isSameProduct(val, cacheItem);
+      });
+      var originalQuantity = (detail === null || detail === void 0 || (_detail$_extend = detail._extend) === null || _detail$_extend === void 0 ? void 0 : _detail$_extend.quantity) || 0;
+      Toast === null || Toast === void 0 || (_Toast$success2 = Toast.success) === null || _Toast$success2 === void 0 || _Toast$success2.call(Toast, /*#__PURE__*/React.createElement("div", {
+        className: "add-toast-wrap"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "add-toast-title"
+      }, item.title), /*#__PURE__*/React.createElement("div", {
+        className: "add-toast-quantity"
+      }, locales.getText('pisell2.ticket-booking.in-cart')((clickCountRef.current[productId] || 1) + originalQuantity))));
+      debouncedExecuteCacheValues(productId, cacheValues, item, callback);
       return;
     }
-    console.time('打开弹窗');
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -47,6 +47,7 @@ import "./index.less";
 import { getBookingType } from "../bookingDataPanel/bookingList/utils";
 import { useCustomer } from "../../hooks/pisellos";
 import { useMemoizedFn } from "ahooks";
+import useScanManager from "../../hooks/pisellos/useScanManager";
 export var _formatBookingDetail = function _formatBookingDetail(data, modalState) {
   var _bookings$list, _bookings$list2;
   var customer_id = data.customer_id,
@@ -251,6 +252,8 @@ var TicketBooking = function TicketBooking() {
     openScan = _useScanGlobal.openScan,
     closeScan = _useScanGlobal.closeScan;
   var handleScan = useScanGlobalHandle();
+  var _useScanManager = useScanManager(),
+    enableAllScanListeners = _useScanManager.enableAllScanListeners;
   var changeCustomerToGlobalState = useMemoizedFn(function () {});
   var _useCustomer = useCustomer({
       changeCustomerToGlobalState: changeCustomerToGlobalState
@@ -303,11 +306,13 @@ var TicketBooking = function TicketBooking() {
       // 支付成功后清空状态
       _initFn(function () {});
       selectCustomer(null);
+      enableAllScanListeners();
     });
 
     // 作废预约
     interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || _interaction$utils2.mountFunction('booking', 'voidBooking', function (orderId) {
       voidAppointment(orderId);
+      enableAllScanListeners();
     });
     return function () {
       off === null || off === void 0 || off();

package/es/components/ticketBooking/hooks/pisellos/useCustomer.js

@@ -208,12 +208,15 @@ export var useCustomer = function useCustomer(props) {
 
   // 选择客户
   var selectCustomer = useMemoizedFn(function (customer) {
-    bookingTicket.setActiveCustomer(customer);
+    var _bookingTicket$setAct, _props$changeCustomer2;
+    bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$setAct = bookingTicket.setActiveCustomer) === null || _bookingTicket$setAct === void 0 || _bookingTicket$setAct.call(bookingTicket, customer);
+    (_props$changeCustomer2 = props.changeCustomerToGlobalState) === null || _props$changeCustomer2 === void 0 || _props$changeCustomer2.call(props, customer);
   });
 
   // 新增客户到第一个
   var addCustomerToFirst = useMemoizedFn(function (customer) {
-    bookingTicket.addCustomerToFirst(customer);
+    var _bookingTicket$addCus;
+    bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$addCus = bookingTicket.addCustomerToFirst) === null || _bookingTicket$addCus === void 0 || _bookingTicket$addCus.call(bookingTicket, customer);
   });
   return {
     // 客户列表

package/es/components/ticketBooking/hooks/pisellos/useScanManager.d.ts

@@ -0,0 +1,6 @@
+declare const useScanManager: () => {
+    disableAllScanListeners: () => void;
+    enableAllScanListeners: () => void;
+    clearAllScanListenersTaskQueue: () => void;
+};
+export default useScanManager;

package/es/components/ticketBooking/hooks/pisellos/useScanManager.js

@@ -0,0 +1,20 @@
+import { useBookingTicket } from "./bookingTicket";
+import { useMemoizedFn } from "ahooks";
+var useScanManager = function useScanManager() {
+  var bookingTicket = useBookingTicket();
+  var disableAllScanListeners = useMemoizedFn(function () {
+    bookingTicket.disableAllScanListeners();
+  });
+  var enableAllScanListeners = useMemoizedFn(function () {
+    bookingTicket.enableAllScanListeners();
+  });
+  var clearAllScanListenersTaskQueue = useMemoizedFn(function () {
+    bookingTicket.clearAllScanListenersTaskQueue();
+  });
+  return {
+    disableAllScanListeners: disableAllScanListeners,
+    enableAllScanListeners: enableAllScanListeners,
+    clearAllScanListenersTaskQueue: clearAllScanListenersTaskQueue
+  };
+};
+export default useScanManager;

package/es/components/ticketBooking/utils/index.d.ts

@@ -14,6 +14,7 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: any;
     quantity: number;
 } | undefined;
+export declare const isSameProduct: (a: any, b: any) => boolean;
 export declare const addService: (list: any[], addItem: any, state: any) => {
     list: any[];
     quantity: any;
@@ -57,4 +58,5 @@ export declare const formatScanGlobal: (data: ScanData) => {
     data: any;
     scanCode: string;
 } | null | undefined;
+export declare const createSimpleCacheItem: (item: any, e: any, state: any) => any;
 export {};

package/es/components/ticketBooking/utils/index.js

@@ -16,6 +16,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { isNormalProductByDurationSchedule } from "../../booking/info/service2/utils";
 import { isArr } from '@pisell/utils';
+import { getUniqueId } from "@pisell/utils";
 
 /** dayjs对象格式化为字符串时间 */
 export var formatDateToStr = function formatDateToStr(date) {
@@ -125,7 +126,7 @@ export var restoreProductOtherData = function restoreProductOtherData(data) {
 };
 
 // 是相同的商品
-var isSameProduct = function isSameProduct(a, b) {
+export var isSameProduct = function isSameProduct(a, b) {
   var _a$_extend2, _b$_extend2;
   if (isNormalProductByDurationSchedule(a) && isNormalProductByDurationSchedule(b)) {
     var _a$_extend, _b$_extend;
@@ -315,4 +316,20 @@ export var formatScanGlobal = function formatScanGlobal(data) {
       scanCode: scanCode
     };
   }
+};
+export var createSimpleCacheItem = function createSimpleCacheItem(item, e, state) {
+  var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
+    product_id: item.id,
+    _id: getUniqueId(),
+    _key: e.key,
+    _extend: {
+      start_date: state.date.value,
+      quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
+      price: item.price,
+      product_name: item.title,
+      other: e
+    },
+    new: 1
+  });
+  return cacheItem;
 };

package/es/pro/pisellNumberSelector/index.js

@@ -10,9 +10,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from 'react';
 import { Popover } from 'antd';
-import Delete from '@pisell/icon/src/Delete';
-import Plus from '@pisell/icon/src/Plus';
-import Minus from '@pisell/icon/src/Minus';
+import Delete from '@pisell/icon/es/Delete';
+import Plus from '@pisell/icon/es/Plus';
+import Minus from '@pisell/icon/es/Minus';
 // import { VirtualKeyboard } from '@pisell/materials';
 import NumberKeyBoard from "../numberKeyboard";
 import classNames from 'classnames';
@@ -45,6 +45,11 @@ var PisellNumberSelector = function PisellNumberSelector(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     inputValue = _useState4[0],
     setInputValue = _useState4[1];
+  var _useState5 = useState(value.toString()),
+    _useState6 = _slicedToArray(_useState5, 2),
+    tempValue = _useState6[0],
+    setTempValue = _useState6[1]; // 添加临时值状态
+
   var KeyboardItems = useMemo(function () {
     return [{
       value: 1,
@@ -128,22 +133,24 @@ var PisellNumberSelector = function PisellNumberSelector(_ref) {
   };
   var handleChange = function handleChange(e) {
     if (!e) {
-      onChange === null || onChange === void 0 || onChange(min);
+      setTempValue(min.toString());
       return;
     }
     if (e === 'delete') {
-      // setInputValue(inputValue.slice(0, -1));
-      onChange === null || onChange === void 0 || onChange(Number(inputValue.slice(0, -1)));
+      // 删除最后一位数字
+      var newTempValue = tempValue.slice(0, -1);
+      setTempValue(newTempValue || '0');
       return;
     } else if (e === 'verify') {
-      var newValue = parseInt(inputValue) || 0;
+      // 确认时提交暂存的值
+      var newValue = parseInt(tempValue) || 0;
       var clampedValue = Math.max(min, Math.min(max, newValue));
       onChange === null || onChange === void 0 || onChange(clampedValue);
       setOpen(false); // 手动关闭弹窗
       return;
     } else {
-      // 虚拟键盘现在会处理最大值限制，这里直接设置输入值
-      onChange === null || onChange === void 0 || onChange(Number(e));
+      // 更新暂存值，不直接触发onChange
+      setTempValue(e);
     }
   };
 
@@ -151,22 +158,43 @@ var PisellNumberSelector = function PisellNumberSelector(_ref) {
   var adjustPriceContent = useMemo(function () {
     if (!enablePriceAdjust) return null;
     return /*#__PURE__*/React.createElement(NumberKeyBoard, {
-      selectType: "dark",
-      value: value.toString(),
+      value: tempValue // 使用临时值
+      ,
       max: max,
       onChange: handleChange,
       onOk: function onOk() {
+        var newValue = parseInt(tempValue) || 0;
+        var clampedValue = Math.max(min, Math.min(max, newValue));
+        onChange === null || onChange === void 0 || onChange(clampedValue);
         setOpen(false);
       }
     });
-  }, [enablePriceAdjust, inputValue, KeyboardItems, max]);
+  }, [enablePriceAdjust, tempValue, max, handleChange]);
 
   // 点击数字的处理
   var handleNumberClick = function handleNumberClick() {
     if (disabled) return;
     if (enablePriceAdjust) {
       // Popover 会自动处理打开，我们只需要设置初始值
-      setInputValue(value.toString());
+      setTempValue(value.toString()); // 设置临时值为当前值
+    }
+  };
+
+  // 处理弹窗开关时的值同步
+  var handleOpenChange = function handleOpenChange(visible) {
+    setOpen(visible);
+    if (visible) {
+      // 打开时设置临时值为当前值
+      setTempValue(value.toString());
+    } else {
+      // 关闭时检查是否需要提交值
+      var tempNumber = parseInt(tempValue) || 0;
+      var clampedValue = Math.max(min, Math.min(max, tempNumber));
+      if (clampedValue !== value) {
+        onChange === null || onChange === void 0 || onChange(clampedValue);
+      }
+      // 重置临时值为当前值，确保下次打开时显示正确的值
+      setTempValue(value.toString());
     }
   };
 
@@ -193,22 +221,13 @@ var PisellNumberSelector = function PisellNumberSelector(_ref) {
     overlayInnerStyle: {
       padding: 0
     },
-    onOpenChange: function onOpenChange(visible) {
-      setOpen(visible);
-      if (visible) {
-        // 打开时设置初始输入值
-        setInputValue(value.toString());
-      } else {
-        // 关闭时重置输入值
-        setInputValue(value.toString());
-      }
-    },
     destroyTooltipOnHide: true,
     arrow: false,
     align: {
       offset: [0, 0]
     },
-    overlayClassName: "pisell-number-selector-popover"
+    overlayClassName: "pisell-number-selector-popover",
+    onOpenChange: handleOpenChange
   }, numberDisplayElement) : numberDisplayElement;
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-number-selector-new', className, _defineProperty(_defineProperty({}, "pisell-number-selector-".concat(size), size), 'pisell-number-selector-disabled', disabled))

package/es/pro/pisellPhoneKeyboard/index.js

@@ -15,7 +15,7 @@ import React, { useState, useMemo, useEffect } from 'react';
 import { VirtualKeyboard } from '@pisell/materials';
 import { Popover, Input } from 'antd';
 import "./index.less";
-import Delete from '@pisell/icon/src/Delete';
+import Delete from '@pisell/icon/es/Delete';
 import { locales } from '@pisell/utils';
 import localeTexts from "./locales";
 import { getLocale } from "../../utils/locales";

package/es/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -83,7 +83,7 @@ var DepositModal = (props) => {
       closable: true,
       bodyStyle: { padding: "24px", minHeight: "300px" },
       destroyOnClose: true,
-      title: (item == null ? void 0 : item.title) || (policy == null ? void 0 : policy.title) || "协议",
+      title: (item == null ? void 0 : item.title) || (policy == null ? void 0 : policy.title) || void 0,
       onCancel,
       mobileModalHeight: "auto",
       className: "policy-modal-wrap",

package/lib/components/booking/components/actionButtons/index.js

@@ -48,6 +48,7 @@ var import_index = require("./index.less");
 var import_useCustomer = require("../../../ticketBooking/hooks/pisellos/useCustomer");
 var import_ahooks = require("ahooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_useScanManager = __toESM(require("../../../ticketBooking/hooks/pisellos/useScanManager"));
 var createToastContent = (text) => /* @__PURE__ */ import_react.default.createElement("div", { className: "action-buttons-toast-content" }, text);
 var ActionButtons = ({
   state,
@@ -55,7 +56,7 @@ var ActionButtons = ({
   disabled = false,
   source
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const [showClearModal, setShowClearModal] = (0, import_react.useState)(false);
   const [showPriceAdjustModal, setShowPriceAdjustModal] = (0, import_react.useState)(false);
   const [showCustomiseModal, setShowCustomiseModal] = (0, import_react.useState)(false);
@@ -75,6 +76,7 @@ var ActionButtons = ({
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
   });
+  const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   (0, import_react.useEffect)(() => {
     if (!pisellOS) return;
     const handleCustomerSelected = () => {
@@ -114,21 +116,26 @@ var ActionButtons = ({
   }, [state, hasCartItems]);
   const [discountList, setDiscountList] = (0, import_react.useState)([]);
   const usedVouchersCount = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
     try {
+      if (!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
+        return 0;
+      }
       return discountList.filter((discount) => discount.isSelected).length;
     } catch (error) {
       console.error("计算已使用券数量失败:", error);
       return 0;
     }
-  }, [discountList]);
+  }, [discountList, (_e = state.service) == null ? void 0 : _e.value]);
   const shouldShowWarning = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
     try {
-      return discountList.length > 0 && !discountList.some((discount) => discount.isSelected) && discountList.some((discount) => discount.isManualSelect);
+      return ((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) > 0 && discountList.length > 0 && !discountList.some((discount) => discount.isSelected) && discountList.some((discount) => discount.isManualSelect);
     } catch (error) {
       console.error("判断警告状态失败:", error);
       return false;
     }
-  }, [discountList]);
+  }, [discountList, (_f = state.service) == null ? void 0 : _f.value]);
   (0, import_react.useEffect)(() => {
     var _a2;
     const { pisellos } = ((_a2 = context.appHelper) == null ? void 0 : _a2.utils) || {};
@@ -140,11 +147,12 @@ var ActionButtons = ({
     return () => {
       pisellos.effects.off("shopDiscount:onDiscountListChange", onDiscountListChange);
     };
-  }, [(_e = context.appHelper) == null ? void 0 : _e.utils]);
+  }, [(_g = context.appHelper) == null ? void 0 : _g.utils]);
   const handleClear = () => {
     setShowClearModal(true);
   };
   const handleClearItemsOnly = () => {
+    clearAllScanListenersTaskQueue();
     if (!hasCartItems) {
       Toast == null ? void 0 : Toast.info(createToastContent(import_utils.locales.getText("pisell2.clear-cart-modal.empty-cart-tip")));
       return;
@@ -171,6 +179,7 @@ var ActionButtons = ({
     Toast == null ? void 0 : Toast.success(createToastContent(import_utils.locales.getText("pisell2.action-buttons.clear-success")));
   };
   const handleClearAllAndReset = () => {
+    clearAllScanListenersTaskQueue();
     dispatch({
       type: "setService",
       payload: {
@@ -360,7 +369,7 @@ var ActionButtons = ({
       visible: showCustomiseModal,
       onClose: () => setShowCustomiseModal(false),
       onSave: handleCustomiseItemSave,
-      currencySymbol: ((_h = (_g = (_f = context.appHelper) == null ? void 0 : _f.utils) == null ? void 0 : _g.getSymbolic) == null ? void 0 : _h.call(_g)) || "$",
+      currencySymbol: ((_j = (_i = (_h = context.appHelper) == null ? void 0 : _h.utils) == null ? void 0 : _i.getSymbolic) == null ? void 0 : _j.call(_i)) || "$",
       disabled: isDisabledEdit
     }
   ), /* @__PURE__ */ import_react.default.createElement(

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

@@ -53,6 +53,7 @@ var import__ = require("../../../../index");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_utils4 = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
+var import_useScanManager = __toESM(require("../../../ticketBooking/hooks/pisellos/useScanManager"));
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { state, buttons, dispatch, source } = props;
@@ -65,6 +66,7 @@ var Footer = (props) => {
   const appointmentProductRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
   const { isTerminal, isWebPos, interaction, store, storage, businessUtils } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const { disableAllScanListeners } = (0, import_useScanManager.default)();
   (0, import_react.useEffect)(() => {
     store == null ? void 0 : store.dispatch({
       type: "global/_getMetadataMap",
@@ -218,6 +220,7 @@ var Footer = (props) => {
       return;
     }
     if (isTerminal == null ? void 0 : isTerminal()) {
+      disableAllScanListeners();
       return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
         module: "booking",
         key: "booking_checkout",

package/lib/components/booking/deposit/ClientItem/index.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
 var import_classnames = __toESM(require("classnames"));
-var import_User01 = __toESM(require("@pisell/icon/src/User01"));
+var import_User01 = __toESM(require("@pisell/icon/es/User01"));
 var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 var ClientItem = (props) => {

package/lib/components/booking/deposit/DepositItem/index.js

@@ -37,7 +37,7 @@ var import_antd = require("antd");
 var import_icons = require("@ant-design/icons");
 var import_utils = require("@pisell/utils");
 var import_ClientItem = __toESM(require("../ClientItem"));
-var import_Edit05 = __toESM(require("@pisell/icon/src/Edit05"));
+var import_Edit05 = __toESM(require("@pisell/icon/es/Edit05"));
 var import_index = require("./index.less");
 var statusTagColor = {
   unpaid: "#B2DDFF",

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

@@ -35,7 +35,7 @@ __export(useQuotation_exports, {
 module.exports = __toCommonJS(useQuotation_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("../utils");
-var import_useEngineContext = __toESM(require("../../../../es/hooks/useEngineContext"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_serve = require("../info/service/serve");