@pisell/private-materials 6.4.59 → 6.4.60

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

@@ -10,12 +10,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useMemoizedFn } from 'ahooks';
 import { useBookingTicket } from "./bookingTicket";
-import { useState, useRef } from 'react';
-import { useOsKey } from "../../context/OsKeyContext";
-import { getProductCache, setProductCache } from "../../utils/productCache";
-export var useProducts = function useProducts(notAvailableRef) {
+import { useState } from 'react';
+export var useProducts = function useProducts() {
   var bookingTicket = useBookingTicket();
-  var osKey = useOsKey();
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     products = _useState2[0],
@@ -24,63 +21,24 @@ export var useProducts = function useProducts(notAvailableRef) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var isFirstLoadRef = useRef(true);
-  var isFirstLoadDataRef = useRef(true);
   var getProducts = useMemoizedFn( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var cachedProducts, freshProducts, _notAvailableRef$curr;
+      var products;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            // 1. 如果是首次加载，尝试从缓存中获取数据
-            if (isFirstLoadRef.current && osKey) {
-              cachedProducts = getProductCache(osKey);
-              if (cachedProducts) {
-                // 先展示缓存数据
-                setProducts(cachedProducts);
-                setLoading(false);
-              }
-              isFirstLoadRef.current = false;
-            } else {
-              setLoading(true);
-            }
-
-            // 2. 无论是否有缓存，都调用接口获取最新数据
-            _context.prev = 1;
-            _context.next = 4;
+            setLoading(true);
+            _context.next = 3;
             return bookingTicket.loadProducts(params);
-          case 4:
-            freshProducts = _context.sent;
-            isFirstLoadDataRef.current = false;
-            // 3. 更新展示数据
-            setProducts(freshProducts);
-
-            // 4. 将新数据缓存到 storage
-            if (osKey) {
-              setProductCache(osKey, freshProducts);
-              console.log('[ProductCache] 已更新缓存');
-            }
-            _context.next = 16;
-            break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](1);
-            // 只有在第一次加载或之前有数据时才显示 notAvailable
-            if ((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) === 607100 && (isFirstLoadDataRef.current || products.length > 0)) {
-              (_notAvailableRef$curr = notAvailableRef.current) === null || _notAvailableRef$curr === void 0 || _notAvailableRef$curr.open();
-            }
+          case 3:
+            products = _context.sent;
+            setProducts(products);
             setLoading(false);
-            setProducts([]);
-            isFirstLoadDataRef.current = false;
-          case 16:
-            _context.prev = 16;
-            setLoading(false);
-            return _context.finish(16);
-          case 19:
+          case 6:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 10, 16, 19]]);
+      }, _callee);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);

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

@@ -3,16 +3,13 @@ import { locales } from "@pisell/utils";
 import { useBookingTicket } from "./bookingTicket";
 import { formatScanCustomer } from "../../utils";
 import { useToast } from '@pisell/materials';
-import { useActiveExecute } from "./useActiveExecute";
 var useScanCustomer = function useScanCustomer() {
   var bookingTicket = useBookingTicket();
   var scanRef = useRef(null);
   var Toast = useToast();
-  var _useActiveExecute = useActiveExecute(),
-    executeIfActive = _useActiveExecute.executeIfActive;
   var handleScanCustomer = function handleScanCustomer(callback) {
     console.log('handleScanCustomer>>>>>>>', callback);
-    scanRef.current = bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.scanCustomerListener(executeIfActive(function (data) {
+    scanRef.current = bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.scanCustomerListener(function (data) {
       console.log('scanCustomerListener>>>>>>>', data);
       if (data.status === 'failed') {
         Toast.fail(locales.getText('pisell2.text.scan-global-failed'));
@@ -20,7 +17,7 @@ var useScanCustomer = function useScanCustomer() {
       }
       var customer = formatScanCustomer(data);
       callback(customer);
-    }));
+    });
   };
   return {
     openScan: handleScanCustomer,

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

@@ -3,17 +3,12 @@ import { useBookingTicket } from "./bookingTicket";
 import { formatScanGlobal } from "../../utils";
 import { useToast } from '@pisell/materials';
 import { locales } from '@pisell/utils';
-import { useActiveExecute } from "./useActiveExecute";
 var useScanGlobal = function useScanGlobal() {
   var bookingTicket = useBookingTicket();
   var scanRef = useRef(null);
   var Toast = useToast();
-  var _useActiveExecute = useActiveExecute(),
-    executeIfActive = _useActiveExecute.executeIfActive;
   var handleScanGlobal = function handleScanGlobal(callback) {
-    var _bookingTicket$initPe;
-    bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$initPe = bookingTicket.initPeripheralsListener) === null || _bookingTicket$initPe === void 0 || _bookingTicket$initPe.call(bookingTicket);
-    scanRef.current = bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.scanGlobalListener(executeIfActive(function (data) {
+    scanRef.current = bookingTicket === null || bookingTicket === void 0 ? void 0 : bookingTicket.scanGlobalListener(function (data) {
       console.log('scanGlobalListener>>>>>>>', data);
       if (data.status === 'failed') {
         Toast.fail(locales.getText('pisell2.text.scan-global-failed'));
@@ -21,7 +16,7 @@ var useScanGlobal = function useScanGlobal() {
       }
       var result = formatScanGlobal(data);
       callback(result);
-    }));
+    });
   };
   return {
     openScan: handleScanGlobal,

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

@@ -1,14 +1,8 @@
-import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];
     bookingConfigParams: Record<string, any>;
     isShowMenuBar?: boolean;
-    isShowTimeBar?: boolean;
-    isShowFloatButtons?: boolean;
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
-    isActive?: boolean;
-    rulesHooks?: any;
 }
 declare const _default: (props: TicketBookingProps) => JSX.Element;
 export default _default;

package/es/components/ticketBooking/index.js

@@ -1,12 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }
@@ -18,12 +12,9 @@ import { cloneDeep } from 'lodash';
 import TicketBooking from "./components/ticketBooking/index";
 import { request } from "../../utils";
 import useEngineContext from "../../hooks/useEngineContext";
-import { getBookingTicketKey, getDefaultStartParam, getShopDiscountKey, rulesHooks } from "./utils";
+import { getDefaultStartParam } from "./utils";
 import localeTexts from "./locales";
 import MenuBar from "./components/menuBar";
-import { useLocalStorageState } from 'ahooks';
-import { OsKeyProvider } from "./context/OsKeyContext";
-import { IsActiveProvider } from "./context/IsActiveContext";
 import "./index.less";
 var initialState = {
   amountSymbol: '$',
@@ -146,60 +137,16 @@ var initialState = {
 export default (function (props) {
   var _context$appHelper, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5;
   var productExtensionType = props.productExtensionType,
-    propsBookingConfigParams = props.bookingConfigParams,
+    bookingConfigParams = props.bookingConfigParams,
     _props$isShowMenuBar = props.isShowMenuBar,
-    isShowMenuBar = _props$isShowMenuBar === void 0 ? true : _props$isShowMenuBar,
-    _props$isShowTimeBar = props.isShowTimeBar,
-    propsIsShowTimeBar = _props$isShowTimeBar === void 0 ? true : _props$isShowTimeBar,
-    _props$isShowFloatBut = props.isShowFloatButtons,
-    propsIsShowFloatButtons = _props$isShowFloatBut === void 0 ? true : _props$isShowFloatBut,
-    propsProductDisplayConfig = props.productDisplayConfig,
-    _props$isActive = props.isActive,
-    isActive = _props$isActive === void 0 ? true : _props$isActive,
-    propsRulesHooks = props.rulesHooks;
-  var _useLocalStorageState = useLocalStorageState('pisell-ticket-booking-nav-key', {
-      defaultValue: 'ticket'
-    }),
-    _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 2),
-    activeNavKey = _useLocalStorageState2[0],
-    setActiveNavKey = _useLocalStorageState2[1];
-
-  // 根据 activeNavKey 动态配置（仅在显示菜单栏时生效）
-  var bookingConfigParams = useMemo(function () {
-    if (isShowMenuBar && activeNavKey === 'food') {
-      return _objectSpread(_objectSpread({}, propsBookingConfigParams), {}, {
-        sub_type: 'food',
-        source_type: 'pos'
-      });
-    }
-    return propsBookingConfigParams;
-  }, [isShowMenuBar, activeNavKey, propsBookingConfigParams]);
-  var isShowTimeBar = useMemo(function () {
-    return isShowMenuBar && activeNavKey === 'food' ? false : propsIsShowTimeBar;
-  }, [isShowMenuBar, activeNavKey, propsIsShowTimeBar]);
-  var isShowFloatButtons = useMemo(function () {
-    return isShowMenuBar && activeNavKey === 'food' ? false : propsIsShowFloatButtons;
-  }, [isShowMenuBar, activeNavKey, propsIsShowFloatButtons]);
-
-  // 根据bookingConfigParams?.sub_type 动态配置osKey
-  // 多页面使用同一个组件时，需要根据不同的osKey来区分不同的页面
-  var osKey = useMemo(function () {
-    return bookingConfigParams === null || bookingConfigParams === void 0 ? void 0 : bookingConfigParams.sub_type;
-  }, [bookingConfigParams]);
-  var productDisplayConfig = useMemo(function () {
-    if (isShowMenuBar && activeNavKey === 'food') {
-      return 'sku-list-a5';
-    }
-    return propsProductDisplayConfig;
-  }, [isShowMenuBar, activeNavKey, propsProductDisplayConfig]);
+    isShowMenuBar = _props$isShowMenuBar === void 0 ? true : _props$isShowMenuBar;
   var storeRef = useRef(null);
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     pisellos = _context$appHelper$ut.pisellos,
     pisellosAllModule = _context$appHelper$ut.pisellosAllModule;
   var _ref = pisellosAllModule || {},
-    BookingTicket = _ref.BookingTicket,
-    ShopDiscountImpl = _ref.ShopDiscountImpl;
+    BookingTicket = _ref.BookingTicket;
   locales.init(localeTexts, ((_context$appHelper$ut2 = context.appHelper.utils) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getApp) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.locales) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut3.getLocale) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.call(_context$appHelper$ut3)) || ((_context$appHelper$ut5 = context.appHelper.utils) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.storage) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.get('umi_locale')) || 'en');
   useLayoutEffect(function () {
     request.setRequest(context.appHelper.utils.request);
@@ -210,43 +157,21 @@ export default (function (props) {
       productExtensionType: productExtensionType
     }));
     storeRef.current = store;
-  }, [bookingConfigParams, productExtensionType]);
+  }, []);
   useMemo(function () {
     if (BookingTicket) {
-      pisellos === null || pisellos === void 0 || pisellos.registerModule(new BookingTicket(getBookingTicketKey(osKey)), {
+      pisellos === null || pisellos === void 0 || pisellos.registerModule(new BookingTicket('bookingTicket'), {
         initialState: {},
         otherParams: {
-          cacheId: getBookingTicketKey(osKey),
+          cacheId: 'test-cache',
           platform: 'shop'
         }
       });
     }
-    if (ShopDiscountImpl) {
-      pisellos === null || pisellos === void 0 || pisellos.registerModule(new ShopDiscountImpl(getShopDiscountKey(osKey)), {
-        otherParams: {
-          platform: "shop",
-          rules: {
-            hooks: propsRulesHooks || rulesHooks
-          }
-        }
-      });
-    }
-  }, [osKey]);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-ticket-booking-wrapper"
-  }, isShowMenuBar && /*#__PURE__*/React.createElement(MenuBar, {
-    activeNavKey: activeNavKey,
-    onNavChange: setActiveNavKey
-  }), /*#__PURE__*/React.createElement(IsActiveProvider, {
-    isActive: isActive
-  }, /*#__PURE__*/React.createElement(OsKeyProvider, {
-    osKey: osKey
-  }, /*#__PURE__*/React.createElement(Provider, {
-    store: storeRef.current,
-    key: activeNavKey
-  }, /*#__PURE__*/React.createElement(TicketBooking, {
-    productDisplayConfig: productDisplayConfig,
-    isShowTimeBar: isShowTimeBar,
-    isShowFloatButtons: isShowFloatButtons
-  })))));
+  }, isShowMenuBar && /*#__PURE__*/React.createElement(MenuBar, null), /*#__PURE__*/React.createElement(Provider, {
+    store: storeRef.current
+  }, /*#__PURE__*/React.createElement(TicketBooking, null)));
 });

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

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;
@@ -59,32 +59,4 @@ export declare const formatScanGlobal: (data: ScanData) => {
     scanCode: string;
 } | null | undefined;
 export declare const createSimpleCacheItem: (item: any, e: any, state: any) => any;
-export declare const getBookingTicketKey: (osKey: string) => string;
-export declare const getShopDiscountKey: (osKey: string) => string;
-export declare const rulesHooks: {
-    getProduct(product: Record<string, any>): {
-        booking_id: any;
-        id: any;
-        _id: any;
-        price: any;
-        total: any;
-        discount_list: any;
-        origin_total: any;
-        num: any;
-        quantity: any;
-        vouchersApplicable: any;
-    };
-    setProduct(product: Record<string, any>, values: {
-        total: number;
-        discount_list: any[];
-        price: number;
-        quantity: number;
-        _id?: string;
-    }): {
-        _id: any;
-        discount_list: any[];
-        _extend: any;
-    };
-};
-export { getCache, setCache, clearCache, clearAllCache, clearAllCacheByOsKey, getProductCache, setProductCache, clearProductCache, clearAllProductCache, getBoardConfigCache, setBoardConfigCache, clearBoardConfigCache, } from './productCache';
-export type { CacheType } from './productCache';
+export {};

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

@@ -332,53 +332,4 @@ export var createSimpleCacheItem = function createSimpleCacheItem(item, e, state
     new: 1
   });
   return cacheItem;
-};
-
-// 获取bookingTicket的key
-export var getBookingTicketKey = function getBookingTicketKey(osKey) {
-  return "bookingTicket-".concat(osKey);
-};
-
-// 获取shopDiscount的key
-export var getShopDiscountKey = function getShopDiscountKey(osKey) {
-  return "shopDiscount-".concat(osKey);
-};
-export var rulesHooks = {
-  // 获取商品关键信息
-  getProduct: function getProduct(product) {
-    var detail = {
-      booking_id: product.booking_id,
-      id: product.id,
-      _id: product._id,
-      price: product.price,
-      total: product._extend.total,
-      discount_list: product.discount_list,
-      origin_total: product._extend.origin_total,
-      num: product._extend.quantity,
-      quantity: product._extend.quantity || 1,
-      vouchersApplicable: product.vouchersApplicable
-    };
-    return detail;
-  },
-  setProduct: function setProduct(product, values) {
-    var detail = _objectSpread(_objectSpread({}, product), {}, {
-      _id: values._id || product._id,
-      discount_list: values.discount_list,
-      _extend: _objectSpread(_objectSpread(_objectSpread({}, product._extend), 'total' in values ? {
-        total: values.total
-      } : {}), 'quantity' in values ? {
-        quantity: values.quantity
-      } : {})
-    });
-    return detail;
-  }
-};
-
-// 导出缓存工具函数
-export {
-// 通用缓存函数
-getCache, setCache, clearCache, clearAllCache, clearAllCacheByOsKey,
-// 产品缓存
-getProductCache, setProductCache, clearProductCache, clearAllProductCache,
-// BoardConfig 缓存
-getBoardConfigCache, setBoardConfigCache, clearBoardConfigCache } from "./productCache";
+};

package/es/index.d.ts

@@ -59,7 +59,5 @@ export { default as ProSkuDetailModal } from './pro/skuDetailModal';
 export { default as SaasLogin } from './plus/saasLogin';
 export { default as SaasRegister } from './plus/saasRegister';
 export { default as SaasCreateOrganization } from './plus/saasCreateOrganization';
-export { default as SkuCard } from './plus/productSelect/ProductCard/SkuCard';
 export { default as PinModal } from './components/pinModal';
 export { default as PinVerifyModal } from './components/pinVerifyModal';
-export { ResponsiveList as SkuList } from './components/list';

package/es/index.js

@@ -63,7 +63,5 @@ export { default as ProSkuDetailModal } from "./pro/skuDetailModal";
 export { default as SaasLogin } from "./plus/saasLogin";
 export { default as SaasRegister } from "./plus/saasRegister";
 export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
-export { default as SkuCard } from "./plus/productSelect/ProductCard/SkuCard";
 export { default as PinModal } from "./components/pinModal";
-export { default as PinVerifyModal } from "./components/pinVerifyModal";
-export { ResponsiveList as SkuList } from "./components/list";
+export { default as PinVerifyModal } from "./components/pinVerifyModal";

package/es/plus/productSelect/components/pisellPriceText/index.d.ts

@@ -7,8 +7,6 @@ interface IProps {
     style?: React.CSSProperties;
     prefix?: React.ReactElement;
     suffix?: React.ReactElement;
-    customPrefixText?: string;
-    customSuffixText?: string;
 }
 declare const index: (props: IProps) => JSX.Element;
 export default index;

package/es/plus/productSelect/components/pisellPriceText/index.js

@@ -12,16 +12,14 @@ import "./index.less";
 var index = function index(props) {
   var _context$appHelper$ut;
   var context = useEngineContext();
-  var value = props.value,
-    customPrefixText = props.customPrefixText,
-    customSuffixText = props.customSuffixText;
+  var value = props.value;
   var locale = ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.storage) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.get('umi_locale')) || 'en';
   var _useMemo = useMemo(function () {
       if (!props.isMini) return ['', ''];
-      if (!locale) return [customPrefixText || 'From', ''];
-      if (locale.toLowerCase().includes('zh')) return ['', customSuffixText || '起'];
-      return [customPrefixText || 'From', ''];
-    }, [locale, props.isMini, customPrefixText, customSuffixText]),
+      if (!locale) return ['From', ''];
+      if (locale.toLowerCase().includes('zh')) return ['', '起'];
+      return ['From', ''];
+    }, [locale, props.isMini]),
     _useMemo2 = _slicedToArray(_useMemo, 2),
     _prefix = _useMemo2[0],
     _suffix = _useMemo2[1];

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

@@ -49,8 +49,6 @@ var import_ahooks = require("ahooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_useScanManager = __toESM(require("../../../ticketBooking/hooks/pisellos/useScanManager"));
 var import_priceKeyboard = require("../../../../pro/priceKeyboard");
-var import_pisellos = require("../../../ticketBooking/hooks/pisellos");
-var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var createToastContent = (text) => /* @__PURE__ */ import_react.default.createElement("div", { className: "action-buttons-toast-content" }, text);
 var ActionButtons = ({
   state,
@@ -63,14 +61,11 @@ var ActionButtons = ({
   const [showPriceAdjustModal, setShowPriceAdjustModal] = (0, import_react.useState)(false);
   const [showCustomiseModal, setShowCustomiseModal] = (0, import_react.useState)(false);
   const [showVoucherModal, setShowVoucherModal] = (0, import_react.useState)(false);
-  const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const context = (0, import_useEngineContext.default)();
   const { getData, pisellosAllModule } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const Toast = (0, import_materials.useToast)();
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
-  const bookingTicket = (0, import_pisellos.useBookingTicket)();
   const { ScheduleModule } = pisellosAllModule;
-  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
     dispatch({
       type: "setClient",
@@ -85,7 +80,7 @@ var ActionButtons = ({
   });
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   (0, import_react.useEffect)(() => {
-    if (!bookingTicket) return;
+    if (!pisellOS) return;
     const handleCustomerSelected = () => {
       dispatch({
         type: "setState",
@@ -94,18 +89,17 @@ var ActionButtons = ({
         }
       });
     };
-    const wrappedHandleCustomerSelected = executeIfActive(handleCustomerSelected);
-    bookingTicket.effectsOn(
-      "onCustomerSelected",
-      wrappedHandleCustomerSelected
+    pisellOS.effects.on(
+      "bookingTicket:onCustomerSelected",
+      handleCustomerSelected
     );
     return () => {
-      bookingTicket.effectsOff(
-        "onCustomerSelected",
-        wrappedHandleCustomerSelected
+      pisellOS.effects.off(
+        "bookingTicket:onCustomerSelected",
+        handleCustomerSelected
       );
     };
-  }, [dispatch, bookingTicket]);
+  }, [dispatch, pisellOS]);
   const getDataFromHost = () => {
     try {
       const is_price_include_tax = getData("is_price_include_tax");
@@ -181,19 +175,18 @@ var ActionButtons = ({
   (0, import_react.useEffect)(() => {
     var _a2;
     const { pisellos } = ((_a2 = context.appHelper) == null ? void 0 : _a2.utils) || {};
-    if (!pisellos || !shopDiscount) return;
+    if (!pisellos) return;
     const onDiscountListChange = (discount) => {
       setDiscountList(discount);
     };
-    const wrappedHandler = executeIfActive(onDiscountListChange);
-    shopDiscount.effectsOn(
-      "onDiscountListChange",
-      wrappedHandler
+    pisellos.effects.on(
+      "shopDiscount:onDiscountListChange",
+      onDiscountListChange
     );
     return () => {
-      shopDiscount.effectsOff(
-        "onDiscountListChange",
-        wrappedHandler
+      pisellos.effects.off(
+        "shopDiscount:onDiscountListChange",
+        onDiscountListChange
       );
     };
   }, [(_f = context.appHelper) == null ? void 0 : _f.utils]);

package/lib/components/booking/components/footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -60,7 +60,7 @@ var import_materials = require("@pisell/materials");
 var import_useCustomer = require("../../../ticketBooking/hooks/pisellos/useCustomer");
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
-var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
+var import_hooks = require("../../../appointmentBooking/hooks");
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const { state, buttons, dispatch, source } = props;
@@ -1252,7 +1252,7 @@ var Footer = (props) => {
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
   });
-  const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
+  const shopDiscount = (0, import_hooks.useShopDiscount)();
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   const handleClearAllAndReset = () => {
     var _a2;