@pisell/private-materials 3.3.20 → 3.3.22

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -13,16 +13,15 @@ import ShoppingCart from "../../../../shoppingCart";
 import ContinueButton from "../ContinueButton";
 import { useAppointmentBooking } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
-import { useAppointmentBookingAccount, useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingLogin } from "../../../hooks";
+import { useAppointmentBookingAccount, useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingLogin, contextUtils } from "../../../hooks";
 import { formatHolder, formatCarts, formatCurrentUser, openForm } from "../../../utils";
 import VoucherCard from "../../Voucher";
 import Total from "./Total";
 import Deposit from "../../Deposit";
-import useEngineContext from "../../../../../hooks/useEngineContext";
 import { handleAddHolder } from "../utils";
 import "./index.less";
 var CartItem = function CartItem(_ref) {
-  var _context$appHelper, _businessUtils$getApp, _currentStep$step, _currentStep$step2;
+  var _businessUtils$getApp, _currentStep$step, _currentStep$step2;
   var onNext = _ref.onNext;
   var appointmentBooking = useAppointmentBooking();
   var _useAppointmentBookin = useAppointmentBookingContext(),
@@ -45,12 +44,22 @@ var CartItem = function CartItem(_ref) {
     bookingSubject = _useAppointmentBookin4.bookingSubject;
   var _useAppointmentBookin5 = useAppointmentBookingLogin(),
     isLogin = _useAppointmentBookin5.isLogin;
-  var context = useEngineContext();
-  var utils = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils;
+  var utils = contextUtils();
   var businessUtils = utils.businessUtils;
-  var currentUser = formatCurrentUser();
   var deposit = summary.deposit;
 
+  /**
+   * @title: 当前客户
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-05-14 14:59
+   */
+  var currentUser = useMemo(function () {
+    return formatCurrentUser(utils) || {};
+  }, []);
+
   /**
    * @title: 格式化购物车ids
    * @description:
@@ -188,13 +197,16 @@ var CartItem = function CartItem(_ref) {
       });
     }
   };
+  var products = useMemo(function () {
+    return formatCarts(carts, resources, utils, accountLists);
+  }, [carts, resources, accountLists]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "appointment-cart-item-wrap ".concat(isMobile() ? 'appointment-cart-mobile-item-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "content"
   }, /*#__PURE__*/React.createElement(ShoppingCart, {
     productParams: {
-      products: formatCarts(carts, resources, accountLists),
+      products: products,
       hideAddBtn: false,
       holders: holders,
       disabledEdit: isLastStep,

package/es/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -155,7 +155,8 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "image"
   }, /*#__PURE__*/React.createElement("img", {
-    src: "".concat(config === null || config === void 0 ? void 0 : config.awsStatic, "/checkout_confirm.png")
+    src: "".concat(config === null || config === void 0 ? void 0 : config.awsStatic, "/checkout_confirm.png"),
+    loading: "lazy"
   })), /*#__PURE__*/React.createElement("span", {
     className: "tips"
   }, locales.getText('pisell2.appointment.tips')), /*#__PURE__*/React.createElement("span", {

package/es/components/appointmentBooking/components/Content/index.js

@@ -40,7 +40,6 @@ var Layout = function Layout() {
     policyParams = _useAppointmentBookin.policyParams,
     closePolicy = _useAppointmentBookin.closePolicy;
   var _useAppointmentBookin2 = useAppointmentBookingSetting(),
-    getLoadAllSchedule = _useAppointmentBookin2.getLoadAllSchedule,
     isDateSelectedFirst = _useAppointmentBookin2.isDateSelectedFirst,
     isFormSubject = _useAppointmentBookin2.isFormSubject;
   var _useAppointmentBookin3 = useAppointmentBookingLogin(),

package/es/components/appointmentBooking/components/Date/index.js

@@ -52,7 +52,6 @@ var Date = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useAppointmentBookin2 = useAppointmentBookingSetting(),
     isDateSelectedFirst = _useAppointmentBookin2.isDateSelectedFirst,
     customPageId = _useAppointmentBookin2.customPageId,
-    getLoadAllSchedule = _useAppointmentBookin2.getLoadAllSchedule,
     channel = _useAppointmentBookin2.channel;
   var _useAppointmentBookin3 = useAppointmentBookingStep(),
     nextStep = _useAppointmentBookin3.nextStep;
@@ -282,10 +281,7 @@ var Date = /*#__PURE__*/forwardRef(function (props, ref) {
                 });
               }
               return day;
-            }); // 先选日期，加载schedule数据
-            // if (isDateSelectedFirst) {
-            //   getLoadAllSchedule();
-            // }
+            });
             setLoading(false);
             setDateMonthList(updatedDates);
             _context4.next = 23;

package/es/components/appointmentBooking/components/Form/index.js

@@ -14,7 +14,7 @@ import React, { useMemo, useRef, useState, useImperativeHandle, forwardRef, useE
 import useComponents from "../../../../hooks/useComponents";
 import { formatForms, formatCarts, updateLists, updateBookingFormStorage } from "../../utils";
 import { useAppointmentBookingContext } from "../../context";
-import { useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingStep } from "../../hooks";
+import { useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingStep, contextUtils } from "../../hooks";
 import PolicyModal from "../../deposit/components/PolicyModal";
 import "./index.less";
 var Form = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -54,6 +54,7 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     getOtherData = _useAppointmentBookin3.getOtherData;
   var _useAppointmentBookin4 = useAppointmentBookingStep(),
     nextStep = _useAppointmentBookin4.nextStep;
+  var utils = contextUtils();
   useImperativeHandle(ref, function () {
     return {
       next: function next() {
@@ -80,11 +81,11 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     var _resource = getResourceList();
     return (_resource === null || _resource === void 0 ? void 0 : _resource.resources) || [];
   }, []);
-  var newCarts = formatCarts(carts, resources);
   var forms = useMemo(function () {
+    var newCarts = formatCarts(carts, resources, utils);
     if (!(newCarts !== null && newCarts !== void 0 && newCarts.length) || !(resources !== null && resources !== void 0 && resources.length)) return [];
     return formatForms(newCarts) || [];
-  }, [newCarts, resources]);
+  }, [carts, resources]);
   useEffect(function () {
     var _forms$currentFormInd;
     if (!(forms !== null && forms !== void 0 && forms.length)) return;

package/es/components/appointmentBooking/components/Services/index.js

@@ -84,17 +84,27 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-                  var product, session, startDate, endDate, _data$origin, resources, activeStatus, index, description;
+                  var session, product, startDate, endDate, _data$origin, resources, activeStatus, index, description;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
+                        if (!(data !== null && data !== void 0 && data.isCancel)) {
+                          _context.next = 3;
+                          break;
+                        }
+                        if (type === 'session') {
+                          appointmentBooking.closeProductDetail();
+                          appointmentBooking.getAvailableDate();
+                        }
+                        return _context.abrupt("return");
+                      case 3:
+                        session = data === null || data === void 0 ? void 0 : data.session;
                         product = _objectSpread(_objectSpread({}, data), {}, {
                           options: (data === null || data === void 0 ? void 0 : data.option) || []
                         });
                         delete product.option;
-                        session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 11;
+                          _context.next = 14;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
@@ -111,28 +121,28 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                           startDate: startDate,
                           endDate: endDate
                         });
-                        _context.next = 19;
+                        _context.next = 22;
                         break;
-                      case 11:
+                      case 14:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (activeStatus) {
-                          _context.next = 15;
+                          _context.next = 18;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 15:
+                      case 18:
                         appointmentBooking.storeProduct(product);
                         // duration 类型的商品，要获取一下资源
                         if (!(type === 'duration')) {
-                          _context.next = 19;
+                          _context.next = 22;
                           break;
                         }
-                        _context.next = 19;
+                        _context.next = 22;
                         return appointmentBooking.getAvailableDate();
-                      case 19:
+                      case 22:
                         // 先选择日期流程
                         if (isDateSelectedFirst) {
                           index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2; //先选择日期流程：如果商品类型是duration的商品，则需要增加选择时间步骤
@@ -151,7 +161,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             removeStep('select-time');
                           }
                         }
-                      case 20:
+                      case 23:
                       case "end":
                         return _context.stop();
                     }

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

@@ -99,7 +99,6 @@ export declare const useAppointmentBookingSetting: () => {
     isFormSubject: boolean;
     customPageId: any;
     channel: any;
-    getLoadAllSchedule: () => void;
     bookingSubject: any;
     setOtherData: (key: string, val: any) => any;
     getOtherData: (key: string) => any;

package/es/components/appointmentBooking/hooks.js

@@ -372,7 +372,6 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
   var _ref12 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o2 = appointmentBooking.otherParams) === null || _appointmentBooking$o2 === void 0 ? void 0 : _appointmentBooking$o2.productModuleParams) || {},
     bookingSubject = _ref12.bookingSubject;
   var form_id = bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id;
-  var customer = getCustomer();
 
   // 获取账户列表数据
   var getAccountLists = /*#__PURE__*/function () {
@@ -423,17 +422,18 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
   var getHolders = /*#__PURE__*/function () {
     var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
       var _utils$getStore$getSt;
-      var shop_id, params, data, newData;
+      var shop_id, customer, params, data, newData;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             shop_id = (_utils$getStore$getSt = utils.getStore().getState()) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.shop) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.id;
+            customer = getCustomer(utils);
             if (!(!shop_id || !form_id || !(customer !== null && customer !== void 0 && customer.id))) {
-              _context8.next = 3;
+              _context8.next = 4;
               break;
             }
             return _context8.abrupt("return", []);
-          case 3:
+          case 4:
             params = {
               url: '/form/data/v1',
               query: {
@@ -442,9 +442,9 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
                 shop_id: shop_id
               }
             };
-            _context8.next = 6;
+            _context8.next = 7;
             return appointmentBooking.fetchHolderAccountsAsync(params);
-          case 6:
+          case 7:
             data = _context8.sent;
             newData = data === null || data === void 0 ? void 0 : data.map(function (item) {
               return {
@@ -453,7 +453,7 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
               };
             });
             return _context8.abrupt("return", newData || []);
-          case 9:
+          case 10:
           case "end":
             return _context8.stop();
         }
@@ -467,19 +467,20 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
   // 添加账户
   var addAccount = /*#__PURE__*/function () {
     var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(val, type) {
-      var result;
+      var customer, result;
       return _regeneratorRuntime().wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            _context9.next = 2;
+            customer = getCustomer(utils);
+            _context9.next = 3;
             return appointmentBooking.addAccount(val, {
               type: type,
               customerId: customer === null || customer === void 0 ? void 0 : customer.id
             });
-          case 2:
+          case 3:
             result = _context9.sent;
             return _context9.abrupt("return", result);
-          case 4:
+          case 5:
           case "end":
             return _context9.stop();
         }
@@ -731,12 +732,6 @@ export var useAppointmentBookingSetting = function useAppointmentBookingSetting(
     customPageId = _ref21.customPageId,
     channel = _ref21.channel;
 
-  // 加载日历接口
-  var getLoadAllSchedule = function getLoadAllSchedule() {
-    var res = appointmentBooking.loadAllSchedule();
-    console.log(res, 'loadAllSchedule');
-  };
-
   // 设置缓存
   var setOtherData = function setOtherData(key, val) {
     return appointmentBooking.setOtherData(key, val);
@@ -756,7 +751,6 @@ export var useAppointmentBookingSetting = function useAppointmentBookingSetting(
     isFormSubject: (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.type) === 'form',
     customPageId: customPageId,
     channel: channel,
-    getLoadAllSchedule: getLoadAllSchedule,
     bookingSubject: bookingSubject,
     setOtherData: setOtherData,
     getOtherData: getOtherData,

package/es/components/appointmentBooking/index.js

@@ -4,18 +4,15 @@ import useEngineContext from "../../hooks/useEngineContext";
 import { AppointmentBookingProvider } from "./context";
 import Content from "./components/Content";
 import localeTexts from "./locales";
-import { useAppointmentBooking } from "./hooks";
+import { useAppointmentBooking, contextUtils } from "./hooks";
 import { formatCurrentUser } from "./utils";
 import "./index.less";
 var AppointmentBooking = function AppointmentBooking() {
   var _context$engine;
   var context = useEngineContext();
   locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en');
+  var utils = contextUtils();
   var appointmentBooking = useAppointmentBooking();
-
-  // 初始化项目的时候，用于预加载 schedule 数据
-  appointmentBooking.loadAllSchedule();
-  var currentUser = formatCurrentUser();
   useEffect(function () {
     var _appointmentBooking$o;
     var _ref = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.productModuleParams) || {},
@@ -25,6 +22,7 @@ var AppointmentBooking = function AppointmentBooking() {
     if ((bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.type) === 'form') return;
     appointmentBooking.getAccounts().then(function (data) {
       if (!data.length) {
+        var currentUser = formatCurrentUser(utils);
         appointmentBooking.addAccounts([currentUser]);
       }
     });

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

@@ -28,7 +28,7 @@ export declare const formatCartsResources: (carts: any[], resources: any[], setP
  * @Author: WangHan
  * @Date: 2025-05-07 21:22
  */
-export declare const formatCarts: (data: any[], resources: any[], accountLists?: any) => any[];
+export declare const formatCarts: (data: any[], resources: any[], utils: any, accountLists?: any) => any[];
 /**
  * @title: 对资源进行排序
  * @description:
@@ -40,12 +40,12 @@ export declare const formatCarts: (data: any[], resources: any[], accountLists?:
  */
 export declare const sortResources: (resources: any[], resourceSort: any[]) => any[] | undefined;
 export declare const getMeAccount: (val: any[]) => any;
-export declare const getCustomer: () => any;
+export declare const getCustomer: (utils: any) => any;
 export declare const formatCustomer: (val: any) => {
     id: any;
     username: string;
 };
-export declare const formatCurrentUser: () => {
+export declare const formatCurrentUser: (utils: any) => {
     id: any;
     username: string;
 };

package/es/components/appointmentBooking/utils.js

@@ -12,8 +12,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { getUniqueId, locales } from "@pisell/utils";
 import { PisellToast } from '@pisell/materials';
-import useEngineContext from "../../hooks/useEngineContext";
-
 /**
  * @title: 格式化holder表数据
  * @description: 
@@ -102,11 +100,10 @@ export var formatCartsResources = function formatCartsResources(carts, resources
  * @Author: WangHan
  * @Date: 2025-05-07 21:22
  */
-export var formatCarts = function formatCarts(data, resources, accountLists) {
+export var formatCarts = function formatCarts(data, resources, utils, accountLists) {
   try {
     var _utils$storage;
-    var context = useEngineContext();
-    var utils = context.appHelper.utils || {};
+    if (!utils || !(data !== null && data !== void 0 && data.length)) return [];
     var locale = (utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('umi_locale')) || 'en-US';
     var symbol = (utils === null || utils === void 0 ? void 0 : utils.getSymbolic()) || '$';
     var newCarts = data === null || data === void 0 ? void 0 : data.map(function (d) {
@@ -182,14 +179,17 @@ export var getMeAccount = function getMeAccount(val) {
     return !(d !== null && d !== void 0 && d.isGuest);
   });
 };
-export var getCustomer = function getCustomer() {
-  var _utils$getStore$getSt, _userInfo;
-  var context = useEngineContext();
-  var utils = context.appHelper.utils || {};
-  var userInfo = (_utils$getStore$getSt = utils.getStore().getState()) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.userInfo;
-  var localUserInfo = JSON.parse(utils.storage.get('customer') || '{}');
-  userInfo = (_userInfo = userInfo) !== null && _userInfo !== void 0 && _userInfo.id ? userInfo : localUserInfo;
-  return userInfo;
+export var getCustomer = function getCustomer(utils) {
+  try {
+    var _utils$getStore$getSt, _userInfo;
+    if (!utils) return;
+    var userInfo = (_utils$getStore$getSt = utils.getStore().getState()) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.userInfo;
+    var localUserInfo = JSON.parse(utils.storage.get('customer') || '{}');
+    userInfo = (_userInfo = userInfo) !== null && _userInfo !== void 0 && _userInfo.id ? userInfo : localUserInfo;
+    return userInfo;
+  } catch (error) {
+    console.log("getCustomer ".concat(error));
+  }
 };
 export var formatCustomer = function formatCustomer(val) {
   var currentUserName = "".concat((val === null || val === void 0 ? void 0 : val.first_name) || '').concat(val !== null && val !== void 0 && val.last_name ? " ".concat(val === null || val === void 0 ? void 0 : val.last_name) : '');
@@ -199,8 +199,8 @@ export var formatCustomer = function formatCustomer(val) {
     username: currentUserName
   };
 };
-export var formatCurrentUser = function formatCurrentUser() {
-  var userInfo = getCustomer();
+export var formatCurrentUser = function formatCurrentUser(utils) {
+  var userInfo = getCustomer(utils);
   var customer = formatCustomer(userInfo);
   return customer;
 };

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

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

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

@@ -1,4 +1,3 @@
-/// <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/footer/index.d.ts

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

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

@@ -165,7 +165,7 @@ var checkResourcesFormat = function checkResourcesFormat(resources, service, isC
       children: (_resource$children = resource.children) !== null && _resource$children !== void 0 && _resource$children.length ? checkResourcesFormat(resource.children, service, true) : undefined,
       form_id: resource.form_id,
       relation_type: resource.relation_type || 'form',
-      relation_id: resource.relation_id || resource.id || 0,
+      relation_id: resource.relation_id || 0,
       capacity: resource.capacity,
       like_status: resource.like_status || 'common',
       metadata: resource.metadata || {}

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

@@ -39,7 +39,7 @@ var VoucherCard = function VoucherCard(props) {
   var context = useEngineContext();
   var state = props.state,
     dispatch = props.dispatch;
-  var _useState = useState(!state.bookingId),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showDetail = _useState2[0],
     setShowDetail = _useState2[1];
@@ -169,10 +169,12 @@ var VoucherCard = function VoucherCard(props) {
             val = _context.sent;
             console.log(val);
             if (val !== null && val !== void 0 && val.isAvailable) {
+              productRef.current = val.productList;
               dispatch({
                 type: 'setService',
                 payload: {
-                  value: val.productList
+                  value: val.productList,
+                  edit: true
                 }
               });
               setCode('');

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <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/index.d.ts

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

package/es/components/booking/info/service/Lists.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

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

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

package/es/components/booking/info/service/addService/index.js

@@ -251,7 +251,7 @@ var Info = function Info(props) {
               dayParams.customer_id = customerId;
             }
             _context2.next = 9;
-            return state.apis.getServices(_objectSpread(_objectSpread({
+            return state.apis.getServices(_objectSpread({
               skip: 1,
               num: 500,
               extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket'],
@@ -261,14 +261,9 @@ var Info = function Info(props) {
               with_schedule: 1,
               with_count: ['bundleGroup', 'optionGroup'],
               order_by_string: 'sort:desc',
-              status: 'published'
-            }, state.isBookingCreatePage ? {
+              status: 'published',
               schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date
-            } : {
-              _config: {
-                useCache: true
-              }
-            }), dayParams));
+            }, dayParams));
           case 9:
             data = _context2.sent;
             setLoading(false);
@@ -408,16 +403,17 @@ var Info = function Info(props) {
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
+  var currentDate = useMemo(function () {
+    return state.date.value.format('YYYY-MM-DD');
+  }, [state.date.value]);
   useUpdateEffect(function () {
     if (state.service.addModal) {
-      getServices();
+      getServices({
+        schedule_date: currentDate
+      });
       setSearch('');
     }
-  }, [state.service.addModal]);
-  var currentDate = useMemo(function () {
-    return state.date.value.format('YYYY-MM-DD');
-  }, [state.date.value]);
-  console.log(currentDate, 'currentDate');
+  }, [state.service.addModal, currentDate]);
   useEffect(function () {
     if (renderMode === 'current') {
       getServices({
@@ -427,9 +423,11 @@ var Info = function Info(props) {
   }, [renderMode, currentDate]);
   useEffect(function () {
     if (state.renderType === 'eventBooking' && state.modalOpen) {
-      getServices();
+      getServices({
+        schedule_date: currentDate
+      });
     }
-  }, [state.renderType, state.modalOpen]);
+  }, [state.renderType, state.modalOpen, currentDate]);
   var addButton = useMemo(function () {
     // 跨日预约不显示添加服务按钮
     if (isDay) {

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

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

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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

@@ -240,4 +240,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/info/service2/utils.js

@@ -348,6 +348,7 @@ export var updateServices = function updateServices(state, currentItem, type, ot
   // 更新holder
   if (type === 'change_holder') {
     products = handleChangeHolder(products, currentItem, other);
+    return products;
   }
   if (type === 'add_holder') {
     var _actions$handleAddHol;

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

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