@pisell/private-materials 6.5.13 → 6.5.15

package/es/components/appointmentBooking/components/Header/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const AppointmentBooking: () => JSX.Element;
 export default AppointmentBooking;

package/es/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

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

@@ -31,8 +31,9 @@ import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
-import { useShopDiscount } from "../../../appointmentBooking/hooks";
 import { DiscountKeyboard } from "../../../../pro/priceKeyboard";
+import { useActiveExecute, useBookingTicket } from "../../../ticketBooking/hooks/pisellos";
+import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -62,14 +63,17 @@ var ActionButtons = function ActionButtons(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     showVoucherModal = _useState8[0],
     setShowVoucherModal = _useState8[1];
-  var shopDiscount = useShopDiscount();
+  var _useActiveExecute = useActiveExecute(),
+    executeIfActive = _useActiveExecute.executeIfActive;
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     getData = _context$appHelper$ut.getData,
     pisellosAllModule = _context$appHelper$ut.pisellosAllModule;
   var Toast = useToast();
   var pisellOS = usePisellOS();
+  var bookingTicket = useBookingTicket();
   var ScheduleModule = pisellosAllModule.ScheduleModule;
+  var shopDiscount = useShopDiscountModule();
 
   // 将选中的客户数据传递给状态管理
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
@@ -90,7 +94,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 监听客户选择变化，清空手动折扣
   useEffect(function () {
-    if (!pisellOS) return;
+    if (!bookingTicket) return;
     var handleCustomerSelected = function handleCustomerSelected() {
       // 当客户选择改变时，清空 shop_discount
       dispatch({
@@ -100,15 +104,16 @@ var ActionButtons = function ActionButtons(_ref) {
         }
       });
     };
+    var wrappedHandleCustomerSelected = executeIfActive(handleCustomerSelected);
 
     // 监听客户选择事件
-    pisellOS.effects.on('bookingTicket:onCustomerSelected', handleCustomerSelected);
+    bookingTicket.effectsOn('onCustomerSelected', wrappedHandleCustomerSelected);
 
     // 清理函数
     return function () {
-      pisellOS.effects.off('bookingTicket:onCustomerSelected', handleCustomerSelected);
+      bookingTicket.effectsOff('onCustomerSelected', wrappedHandleCustomerSelected);
     };
-  }, [dispatch, pisellOS]);
+  }, [dispatch, bookingTicket]);
 
   // 同步获取金额计算所需配置
   var getDataFromHost = function getDataFromHost() {
@@ -224,13 +229,14 @@ var ActionButtons = function ActionButtons(_ref) {
     var _context$appHelper2;
     var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {},
       pisellos = _ref2.pisellos;
-    if (!pisellos) return;
+    if (!pisellos || !shopDiscount) return;
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDiscountList(discount);
     };
-    pisellos.effects.on('shopDiscount:onDiscountListChange', onDiscountListChange);
+    var wrappedHandler = executeIfActive(onDiscountListChange);
+    shopDiscount.effectsOn('onDiscountListChange', wrappedHandler);
     return function () {
-      pisellos.effects.off('shopDiscount:onDiscountListChange', onDiscountListChange);
+      shopDiscount.effectsOff('onDiscountListChange', wrappedHandler);
     };
   }, [(_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.utils]);
 

package/es/components/booking/components/collapsibleList/utils.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/es/components/booking/components/emptyBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/es/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

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

@@ -285,7 +285,7 @@ var getTax = function getTax(state, options) {
   if (!isEdit) {
     var _state$bookingDetail2;
     return {
-      tax: Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.tax_fee)
+      tax: Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.tax_fee) || 0
     };
   }
   var totalOriginTax = new Decimal(0);
@@ -450,7 +450,9 @@ var getSurcharge = function getSurcharge(state, options) {
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.surcharge)) {
       var _state$bookingDetail3;
-      return (((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.surcharge) || []).map(function (d, index) {
+      return (((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.surcharge) || []).filter(function (d) {
+        return Number(d.amount) > 0;
+      }).map(function (d, index) {
         return {
           key: "custom_surcharge_".concat(index),
           label: d.name[state.locale || 'en'] || d.name['en'] || d.name['original'],
@@ -578,6 +580,9 @@ var getSurcharge = function getSurcharge(state, options) {
       finalAmount = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
     }
     var name = surchargeConfig.name || {};
+    if (Number(finalAmount) <= 0) {
+      continue;
+    }
     surchargeWithAmount.push({
       key: "custom_surcharge_".concat(i),
       label: name[state.locale || 'en'] || name['en'] || name['original'],

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

@@ -46,7 +46,7 @@ import { Iconfont } from '@pisell/materials';
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useDebounceFn, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
-import { useShopDiscount } from "../../../appointmentBooking/hooks";
+import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 
 /**
  * @title: 底部
@@ -1734,7 +1734,7 @@ var Footer = function Footer(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
-  var shopDiscount = useShopDiscount();
+  var shopDiscount = useShopDiscountModule();
   var _useScanManager2 = useScanManager(),
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车

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

@@ -15,6 +15,7 @@ import { isArr, locales, sendWarningLog, getUniqueId } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
+import Decimal from 'decimal.js';
 var formatNote = function formatNote(data) {
   var _data$notes;
   return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
@@ -100,6 +101,10 @@ export var formatProductBundle = function formatProductBundle(bundle) {
     }
   } catch (error) {}
   return bundle.map(function (d) {
+    var option = formatProductOption(d.option);
+    var option_price = option.reduce(function (temp, item) {
+      return temp + Number(item.num) * item.custom_add_price;
+    }, 0);
     return {
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
@@ -112,7 +117,9 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       // checkout 2.0 新增
       "price_type": d === null || d === void 0 ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "option": formatProductOption(d.option)
+      "custom_price": new Decimal(d === null || d === void 0 ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
+      "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
+      "option": option
     };
   });
 };

package/es/components/booking/components/formItemChildrenWrap/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

package/es/components/booking/components/reloadResourceModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

package/es/components/booking/components/voucher/index.js

@@ -28,8 +28,9 @@ import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
 import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
 import { getServiceAddons } from "./utils";
-import { useCustomer } from "../../../ticketBooking/hooks/pisellos";
+import { useActiveExecute, useCustomer } from "../../../ticketBooking/hooks/pisellos";
 import { getClientVariantClose } from "../../info/clientVariant/utils";
+import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -66,7 +67,9 @@ var VoucherCard = function VoucherCard(props) {
   var serviceValueRef = useRef(state.service.value);
   var addonsValueRef = useRef(state.addons.value);
   var isBooking4Shop = useIsBooking4Shop(state);
-  var shopDiscount = pisellos.getModule('shopDiscount');
+  var shopDiscount = useShopDiscountModule();
+  var _useActiveExecute = useActiveExecute(),
+    executeIfActive = _useActiveExecute.executeIfActive;
   services = state.service;
 
   // 将选中的客户数据传递给状态管理
@@ -95,7 +98,7 @@ var VoucherCard = function VoucherCard(props) {
 
   // 设置productList
   useEffect(function () {
-    if (isBooking4Shop) {
+    if (isBooking4Shop && shopDiscount) {
       shopDiscount.setProductList([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
     }
   }, [state.service.value, state.addons.value, isBooking4Shop]);
@@ -122,9 +125,10 @@ var VoucherCard = function VoucherCard(props) {
     onScanCode(e.detail.code);
   });
   useEffect(function () {
-    window.addEventListener('onScanWallPassCode', onScanWallPassCode);
+    var wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
+    window.addEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
     return function () {
-      window.removeEventListener('onScanWallPassCode', onScanWallPassCode);
+      window.removeEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
     };
   }, []);
   var addonsMemo = useMemo(function () {
@@ -174,12 +178,11 @@ var VoucherCard = function VoucherCard(props) {
     run();
   }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
   useEffect(function () {
-    if (pisellos) {
-      var _pisellos$effects;
-      pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on("shopDiscount:onSelectedDiscountListChange", fn);
+    if (shopDiscount) {
+      var wrappedHandler = executeIfActive(fn);
+      shopDiscount === null || shopDiscount === void 0 || shopDiscount.effectsOn("onSelectedDiscountListChange", wrappedHandler);
       return function () {
-        var _pisellos$effects2;
-        pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off("shopDiscount:onSelectedDiscountListChange", fn);
+        shopDiscount === null || shopDiscount === void 0 || shopDiscount.effectsOff("onSelectedDiscountListChange", wrappedHandler);
       };
     }
   }, []);
@@ -195,7 +198,7 @@ var VoucherCard = function VoucherCard(props) {
 
   // 监听customer变化
   useEffect(function () {
-    if (!isBooking4Shop) return;
+    if (!isBooking4Shop || !shopDiscount) return;
     var onScanCustomerChange = function onScanCustomerChange(customer) {
       var clientVariantClose = getClientVariantClose();
       if (clientVariantClose) {
@@ -206,14 +209,17 @@ var VoucherCard = function VoucherCard(props) {
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDisCountList(discount);
     };
-    pisellos.effects.on(ShopDiscountHooks.onScanCustomerChange, onScanCustomerChange);
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-    pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
+    var wrappedOnScanCustomerChangeHandler = executeIfActive(onScanCustomerChange);
+    var wrappedOnDiscountListChangeHandler = executeIfActive(onDiscountListChange);
+    var wrappedFn = executeIfActive(fn);
+    shopDiscount.effectsOn('onScanCustomerChange', wrappedOnScanCustomerChangeHandler);
+    shopDiscount.effectsOn('onLoadPrepareCalcResult', wrappedFn);
+    shopDiscount.effectsOn('onDiscountListChange', wrappedOnDiscountListChangeHandler);
     return function () {
       shopDiscount.clear();
-      pisellos.effects.off(ShopDiscountHooks.onScanCustomerChange, onScanCustomerChange);
-      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
+      shopDiscount.effectsOff('onScanCustomerChange', wrappedOnScanCustomerChangeHandler);
+      shopDiscount.effectsOff('onLoadPrepareCalcResult', wrappedFn);
+      shopDiscount.effectsOff('onDiscountListChange', wrappedOnDiscountListChangeHandler);
     };
   }, [state.bookingId, isBooking4Shop, fn]);
   var productListToValue = useMemoizedFn(function (list, edit) {
@@ -282,7 +288,6 @@ var VoucherCard = function VoucherCard(props) {
   }();
   var availableData = useMemo(function () {
     if (!isBooking4Shop) return [];
-    var shopDiscount = pisellos.getModule('shopDiscount');
     return discountList.filter(function (item) {
       return !!item.isAvailable;
     }).map(function (discount) {
@@ -325,7 +330,6 @@ var VoucherCard = function VoucherCard(props) {
     dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
     mixedSort: mixedSort,
     onChange: function onChange(val) {
-      var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({
         discountId: val.id,
         isSelected: val.isSelected

package/es/components/booking/deposit/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

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

@@ -9,7 +9,7 @@ import useSendModal from "./sendModal/useSendModal";
 import SendModal from "./sendModal";
 import { locales } from '@pisell/utils';
 var Footer = function Footer(_ref) {
-  var _state$form2, _state$client6, _state$form3, _state$client7;
+  var _state$client6, _state$form, _state$client7;
   var state = _ref.state,
     reload = _ref.reload;
   var _useSendModal = useSendModal(state === null || state === void 0 ? void 0 : state.bookingId),
@@ -37,14 +37,6 @@ var Footer = function Footer(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-
-  // 是否都填写完成
-  var isAllCompleted = useMemo(function () {
-    var _state$form;
-    return Object.values((state === null || state === void 0 || (_state$form = state.form) === null || _state$form === void 0 ? void 0 : _state$form.value) || {}).every(function (item) {
-      return item.length > 0;
-    });
-  }, [state === null || state === void 0 || (_state$form2 = state.form) === null || _state$form2 === void 0 ? void 0 : _state$form2.value]);
   var defaultValues = useMemo(function () {
     var _state$client, _state$client2, _state$client3, _state$client4, _state$client5;
     return {
@@ -57,7 +49,7 @@ var Footer = function Footer(_ref) {
       }
     };
   }, [(_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : _state$client6.value]);
-  if (!state.bookingId || !(state !== null && state !== void 0 && (_state$form3 = state.form) !== null && _state$form3 !== void 0 && _state$form3.forms.length)) {
+  if (!state.bookingId || !(state !== null && state !== void 0 && (_state$form = state.form) !== null && _state$form !== void 0 && _state$form.forms.length)) {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {
@@ -72,9 +64,8 @@ var Footer = function Footer(_ref) {
     size: "large",
     block: true,
     type: "primary",
-    onClick: handleOpen,
-    disabled: isAllCompleted
-  }, !isAllCompleted ? locales.getText('pisell2.text.send-form-reminder') : locales.getText('pisell2.text.send-form-reminder-completed')), /*#__PURE__*/React.createElement(SendModal, {
+    onClick: handleOpen
+  }, locales.getText('pisell2.text.send-form-reminder')), /*#__PURE__*/React.createElement(SendModal, {
     refreshKey: (_state$client7 = state.client) === null || _state$client7 === void 0 || (_state$client7 = _state$client7.value) === null || _state$client7 === void 0 ? void 0 : _state$client7.id,
     open: open,
     onCancel: function onCancel() {

package/es/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/es/components/booking/forms/table/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/es/components/booking/info/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/es/components/booking/info/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/es/components/booking/info/header/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const header: ({ state, dispatch }: any) => JSX.Element;
 export default header;

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/es/components/booking/info/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/es/components/booking/info/notes/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Notes: () => JSX.Element | null;
 export default Notes;

package/es/components/booking/info/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

package/es/components/booking/info/service/like/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/es/components/booking/info/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/es/components/booking/info/service2/utils.d.ts

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/es/components/booking/info2/cartClientCard/index.js

@@ -29,6 +29,7 @@ import useTranslationOriginal from "../../../../hooks/useTranslationOriginal";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { Context } from "../../info/model";
 import "./index.less";
+import { useIsActive } from "../../../ticketBooking/context/IsActiveContext";
 
 // 导出类型
 
@@ -60,6 +61,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     keyword = _useState8[0],
     setKeyword = _useState8[1];
   var keywordRef = useRef('');
+  var isActive = useIsActive();
   keywordRef.current = keyword;
   var Toast = useToast();
   var _useScanCustomer = useScanCustomer(),
@@ -315,13 +317,15 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setPendingCustomer(null);
   };
   useMemo(function () {
-    setHandleSetClient(handleSetClient);
-  }, []);
+    if (isActive) {
+      setHandleSetClient(handleSetClient);
+    }
+  }, [isActive]);
   useEffect(function () {
     return function () {
       setHandleSetClient(null);
     };
-  }, []);
+  }, [isActive]);
   var tags = useMemo(function () {
     var _latest_wallet_detail;
     if (!selectedCustomer) return;

package/es/components/booking/info2/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

package/es/components/booking/info2/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/es/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/es/components/booking/materiels/duration/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/es/components/booking/materiels/holder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/es/components/booking/materiels/startTime/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/es/components/booking/utils.js

@@ -600,7 +600,7 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
 
 // 获取最后一个服务商品
 export var getLastServer = function getLastServer(list) {
-  return list[list.length - 1];
+  return list === null || list === void 0 ? void 0 : list[0];
 };
 export var getCacheParams = function getCacheParams() {
   // 从缓存里读默认参数,  如果有 则需要默认选中某些参数,  添加完商品后则删除