@pisell/private-materials 3.3.20 → 3.3.22

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

@@ -171,7 +171,7 @@ var Info = function Info(props) {
             return _context2.abrupt("return");
           case 5:
             _context2.next = 7;
-            return state.apis.getServices(_objectSpread({
+            return state.apis.getServices({
               skip: 1,
               num: 500,
               extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'service_product', 'session_product', 'session_ticket'],
@@ -181,14 +181,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
-              }
-            }));
+            });
           case 7:
             data = _context2.sent;
             setLoading(false);
@@ -354,15 +349,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]);
+  }, [state.service.addModal, currentDate]);
   useEffect(function () {
     if (renderMode === 'current') {
       getServices({
@@ -372,9 +369,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 (state.isBookingCreatePage) {
       return /*#__PURE__*/React.createElement("div", {

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

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

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

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

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

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

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

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

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

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

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

@@ -163,10 +163,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/productExtension/fields/Forms/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface InfoProps {
     relation_id: any;
     action: any;

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

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

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

@@ -76,6 +76,7 @@ var TimeBar = function TimeBar(props) {
       flexShrink: 0
     }
   }, /*#__PURE__*/React.createElement(DatePicker, {
+    inputReadOnly: true,
     value: state === null || state === void 0 || (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value,
     format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
     onChange: props === null || props === void 0 ? void 0 : props.onDateChange,

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

@@ -43,11 +43,10 @@ var import_utils2 = require("../../../utils");
 var import_Voucher = __toESM(require("../../Voucher"));
 var import_Total = __toESM(require("./Total"));
 var import_Deposit = __toESM(require("../../Deposit"));
-var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_utils3 = require("../utils");
 var import_index = require("./index.less");
 var CartItem = ({ onNext }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
     carts,
@@ -62,11 +61,12 @@ var CartItem = ({ onNext }) => {
   const { getResourceList } = (0, import_hooks2.useAppointmentBookingResource)();
   const { isFormSubject, bookingSubject } = (0, import_hooks2.useAppointmentBookingSetting)();
   const { isLogin } = (0, import_hooks2.useAppointmentBookingLogin)();
-  const context = (0, import_useEngineContext.default)();
-  const utils = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const utils = (0, import_hooks2.contextUtils)();
   const { businessUtils } = utils;
-  const currentUser = (0, import_utils2.formatCurrentUser)();
   const { deposit } = summary;
+  const currentUser = (0, import_react.useMemo)(() => {
+    return (0, import_utils2.formatCurrentUser)(utils) || {};
+  }, []);
   const holderIds = (0, import_react.useMemo)(() => {
     if (isFormSubject) return [];
     return accountLists.map((item) => item.id);
@@ -75,7 +75,7 @@ var CartItem = ({ onNext }) => {
     if (isFormSubject) return [];
     return (0, import_utils2.formatHolder)(accountLists);
   }, [accountLists, isFormSubject]);
-  const hasGoodPassApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "goodpass"));
+  const hasGoodPassApp = !!((_a = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a.call(businessUtils, "goodpass"));
   const handleClickCard = (e, type, val) => {
     console.log(e, type, val, "handleClickCard");
     if (type === "note") {
@@ -149,6 +149,9 @@ var CartItem = ({ onNext }) => {
       });
     }
   };
+  const products = (0, import_react.useMemo)(() => {
+    return (0, import_utils2.formatCarts)(carts, resources, utils, accountLists);
+  }, [carts, resources, accountLists]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -158,12 +161,12 @@ var CartItem = ({ onNext }) => {
       import_shoppingCart.default,
       {
         productParams: {
-          products: (0, import_utils2.formatCarts)(carts, resources, accountLists),
+          products,
           hideAddBtn: false,
           holders,
           disabledEdit: isLastStep,
-          isShowChangeResource: ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key) === "select-resource",
-          isShowDelete: ((_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key) === "select-service",
+          isShowChangeResource: ((_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) === "select-resource",
+          isShowDelete: ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key) === "select-service",
           isShowPackageNote: false,
           isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
           isShowHolder: isFormSubject,

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

@@ -104,6 +104,12 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: handleNext
   }));
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleNext }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement("img", { src: `${config == null ? void 0 : config.awsStatic}/checkout_confirm.png` })), /* @__PURE__ */ import_react.default.createElement("span", { className: "tips" }, import_utils.locales.getText("pisell2.appointment.tips")), /* @__PURE__ */ import_react.default.createElement("span", { className: "tips-content" }, import_utils.locales.getText("pisell2.appointment.tips.content"))));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleNext }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
+    "img",
+    {
+      src: `${config == null ? void 0 : config.awsStatic}/checkout_confirm.png`,
+      loading: "lazy"
+    }
+  )), /* @__PURE__ */ import_react.default.createElement("span", { className: "tips" }, import_utils.locales.getText("pisell2.appointment.tips")), /* @__PURE__ */ import_react.default.createElement("span", { className: "tips-content" }, import_utils.locales.getText("pisell2.appointment.tips.content"))));
 });
 var ConfirmInformation_default = ConfirmInformation;

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

@@ -62,7 +62,7 @@ var Layout = () => {
     policyParams,
     closePolicy
   } = (0, import_context.useAppointmentBookingContext)();
-  const { getLoadAllSchedule, isDateSelectedFirst, isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isDateSelectedFirst, isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
   const { isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
   const { getHolders } = (0, import_hooks.useAppointmentBookingAccount)();
   const { removeStep, stepList } = (0, import_hooks.useAppointmentBookingStep)();

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

@@ -53,7 +53,7 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
   const [dateMonthList, setDateMonthList] = (0, import_react.useState)([]);
   const [currentMonth, setCurrentMonth] = (0, import_react.useState)();
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
-  const { isDateSelectedFirst, customPageId, getLoadAllSchedule, channel } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isDateSelectedFirst, customPageId, channel } = (0, import_hooks.useAppointmentBookingSetting)();
   const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
   const context = (0, import_useEngineContext.default)();
   (0, import_react.useImperativeHandle)(ref, () => ({

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

@@ -51,6 +51,7 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
   const { getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
   const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
   const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const utils = (0, import_hooks.contextUtils)();
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
       var _a, _b;
@@ -64,11 +65,11 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     const _resource = getResourceList();
     return (_resource == null ? void 0 : _resource.resources) || [];
   }, []);
-  const newCarts = (0, import_utils.formatCarts)(carts, resources);
   const forms = (0, import_react.useMemo)(() => {
+    const newCarts = (0, import_utils.formatCarts)(carts, resources, utils);
     if (!(newCarts == null ? void 0 : newCarts.length) || !(resources == null ? void 0 : resources.length)) return [];
     return (0, import_utils.formatForms)(newCarts) || [];
-  }, [newCarts, resources]);
+  }, [carts, resources]);
   (0, import_react.useEffect)(() => {
     var _a;
     if (!(forms == null ? void 0 : forms.length)) return;

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

@@ -78,12 +78,19 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       },
       callback: async (data) => {
         var _a, _b;
+        if (data == null ? void 0 : data.isCancel) {
+          if (type === "session") {
+            appointmentBooking.closeProductDetail();
+            appointmentBooking.getAvailableDate();
+          }
+          return;
+        }
+        const session = data == null ? void 0 : data.session;
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
         };
         delete product.option;
-        const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
           const endDate = (0, import_dayjs.default)(session == null ? void 0 : session.end_at).format("YYYY-MM-DD");

package/lib/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/lib/components/appointmentBooking/hooks.js

@@ -221,7 +221,6 @@ var useAppointmentBookingAccount = () => {
   const [accountLists, setAccountLists] = (0, import_react.useState)([]);
   const { bookingSubject } = ((_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.productModuleParams) || {};
   const form_id = bookingSubject == null ? void 0 : bookingSubject.form_id;
-  const customer = (0, import_utils2.getCustomer)();
   const getAccountLists = async () => {
     const data = await appointmentBooking.getAccounts();
     setAccountLists(data || []);
@@ -241,6 +240,7 @@ var useAppointmentBookingAccount = () => {
   const getHolders = async () => {
     var _a2, _b, _c;
     const shop_id = (_c = (_b = (_a2 = utils.getStore().getState()) == null ? void 0 : _a2.global) == null ? void 0 : _b.shop) == null ? void 0 : _c.id;
+    const customer = (0, import_utils2.getCustomer)(utils);
     if (!shop_id || !form_id || !(customer == null ? void 0 : customer.id)) return [];
     const params = {
       url: "/form/data/v1",
@@ -260,6 +260,7 @@ var useAppointmentBookingAccount = () => {
     return newData || [];
   };
   const addAccount = async (val, type) => {
+    const customer = (0, import_utils2.getCustomer)(utils);
     const result = await appointmentBooking.addAccount(val, { type, customerId: customer == null ? void 0 : customer.id });
     return result;
   };
@@ -348,10 +349,6 @@ var useAppointmentBookingSetting = () => {
   const utils = contextUtils();
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const { bookingProcess, bookingSubject, customPageId, channel } = ((_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.productModuleParams) || {};
-  const getLoadAllSchedule = () => {
-    const res = appointmentBooking.loadAllSchedule();
-    console.log(res, "loadAllSchedule");
-  };
   const setOtherData = (key, val) => {
     return appointmentBooking.setOtherData(key, val);
   };
@@ -368,7 +365,6 @@ var useAppointmentBookingSetting = () => {
     isFormSubject: (bookingSubject == null ? void 0 : bookingSubject.type) === "form",
     customPageId,
     channel,
-    getLoadAllSchedule,
     bookingSubject,
     setOtherData,
     getOtherData,

package/lib/components/appointmentBooking/index.js

@@ -45,15 +45,15 @@ var AppointmentBooking = () => {
   var _a, _b;
   const context = (0, import_useEngineContext.default)();
   import_utils.locales.init(import_locales.default, ((_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale) || "en");
+  const utils = (0, import_hooks.contextUtils)();
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
-  appointmentBooking.loadAllSchedule();
-  const currentUser = (0, import_utils2.formatCurrentUser)();
   (0, import_react.useEffect)(() => {
     var _a2;
     const { bookingSubject } = ((_a2 = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a2.productModuleParams) || {};
     if ((bookingSubject == null ? void 0 : bookingSubject.type) === "form") return;
     appointmentBooking.getAccounts().then((data) => {
       if (!data.length) {
+        const currentUser = (0, import_utils2.formatCurrentUser)(utils);
         appointmentBooking.addAccounts([currentUser]);
       }
     });

package/lib/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/lib/components/appointmentBooking/utils.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/appointmentBooking/utils.ts
@@ -50,7 +40,6 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
-var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var formatHolder = (data) => {
   return data == null ? void 0 : data.map((d) => {
     return {
@@ -102,11 +91,10 @@ var formatCartsResources = (carts, resources, setPolicyIds) => {
     return [];
   }
 };
-var formatCarts = (data, resources, accountLists) => {
+var formatCarts = (data, resources, utils, accountLists) => {
   var _a;
   try {
-    const context = (0, import_useEngineContext.default)();
-    const utils = context.appHelper.utils || {};
+    if (!utils || !(data == null ? void 0 : data.length)) return [];
     const locale = ((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("umi_locale")) || "en-US";
     const symbol = (utils == null ? void 0 : utils.getSymbolic()) || "$";
     const newCarts = data == null ? void 0 : data.map((d) => {
@@ -170,14 +158,17 @@ var sortResources = (resources, resourceSort) => {
 var getMeAccount = (val) => {
   return val == null ? void 0 : val.find((d) => !(d == null ? void 0 : d.isGuest));
 };
-var getCustomer = () => {
+var getCustomer = (utils) => {
   var _a, _b;
-  const context = (0, import_useEngineContext.default)();
-  const utils = context.appHelper.utils || {};
-  let userInfo = (_b = (_a = utils.getStore().getState()) == null ? void 0 : _a.global) == null ? void 0 : _b.userInfo;
-  const localUserInfo = JSON.parse(utils.storage.get("customer") || "{}");
-  userInfo = (userInfo == null ? void 0 : userInfo.id) ? userInfo : localUserInfo;
-  return userInfo;
+  try {
+    if (!utils) return;
+    let userInfo = (_b = (_a = utils.getStore().getState()) == null ? void 0 : _a.global) == null ? void 0 : _b.userInfo;
+    const localUserInfo = JSON.parse(utils.storage.get("customer") || "{}");
+    userInfo = (userInfo == null ? void 0 : userInfo.id) ? userInfo : localUserInfo;
+    return userInfo;
+  } catch (error) {
+    console.log(`getCustomer ${error}`);
+  }
 };
 var formatCustomer = (val) => {
   let currentUserName = `${(val == null ? void 0 : val.first_name) || ""}${(val == null ? void 0 : val.last_name) ? ` ${val == null ? void 0 : val.last_name}` : ""}`;
@@ -187,8 +178,8 @@ var formatCustomer = (val) => {
     username: currentUserName
   };
 };
-var formatCurrentUser = () => {
-  let userInfo = getCustomer();
+var formatCurrentUser = (utils) => {
+  let userInfo = getCustomer(utils);
   const customer = formatCustomer(userInfo);
   return customer;
 };

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

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

package/lib/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/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/utils.js

@@ -154,7 +154,7 @@ var checkResourcesFormat = (resources, service, isChild) => {
       children: ((_a = resource.children) == null ? void 0 : _a.length) ? checkResourcesFormat(resource.children, service, true) : void 0,
       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/lib/components/booking/components/voucher/index.js

@@ -57,7 +57,7 @@ var VoucherCard = (props) => {
   var _a, _b;
   const context = (0, import_useEngineContext.default)();
   const { state, dispatch } = props;
-  const [showDetail, setShowDetail] = (0, import_react.useState)(!state.bookingId);
+  const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const { pisellos } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const [code, setCode] = (0, import_react.useState)("");
   const [discountList, setDisCountList] = (0, import_react.useState)([]);
@@ -163,10 +163,12 @@ var VoucherCard = (props) => {
     const val = await shopDiscount.scanCode(code);
     console.log(val);
     if (val == null ? void 0 : val.isAvailable) {
+      productRef.current = val.productList;
       dispatch({
         type: "setService",
         payload: {
-          value: val.productList
+          value: val.productList,
+          edit: true
         }
       });
       setCode("");

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

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

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

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

package/lib/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/lib/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/lib/components/booking/info/notes/index.d.ts

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

package/lib/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/lib/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/lib/components/booking/info/service/addService/index.js

@@ -180,7 +180,12 @@ var Info = (props) => {
     let data = await state.apis.getServices({
       skip: 1,
       num: 500,
-      extension_type: state.renderType === "eventBooking" ? void 0 : ["product_appointment", "appointment_ticket", "session_product", "session_ticket"],
+      extension_type: state.renderType === "eventBooking" ? void 0 : [
+        "product_appointment",
+        "appointment_ticket",
+        "session_product",
+        "session_ticket"
+      ],
       with: ["category"],
       ids: state.renderType === "eventBooking" ? (_c2 = state.eventOtherParams) == null ? void 0 : _c2.productIds : void 0,
       open_quotation: 1,
@@ -188,11 +193,7 @@ var Info = (props) => {
       with_count: ["bundleGroup", "optionGroup"],
       order_by_string: "sort:desc",
       status: "published",
-      ...state.isBookingCreatePage ? { schedule_date: params == null ? void 0 : params.schedule_date } : {
-        _config: {
-          useCache: true
-        }
-      },
+      schedule_date: params == null ? void 0 : params.schedule_date,
       ...dayParams
     });
     setLoading(false);
@@ -294,16 +295,15 @@ var Info = (props) => {
   const showAddButton = (0, import_react.useMemo)(() => {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
+  const currentDate = (0, import_react.useMemo)(() => {
+    return state.date.value.format("YYYY-MM-DD");
+  }, [state.date.value]);
   (0, import_ahooks.useUpdateEffect)(() => {
     if (state.service.addModal) {
-      getServices();
+      getServices({ schedule_date: currentDate });
       setSearch("");
     }
-  }, [state.service.addModal]);
-  const currentDate = (0, import_react.useMemo)(() => {
-    return state.date.value.format("YYYY-MM-DD");
-  }, [state.date.value]);
-  console.log(currentDate, "currentDate");
+  }, [state.service.addModal, currentDate]);
   (0, import_react.useEffect)(() => {
     if (renderMode === "current") {
       getServices({ schedule_date: currentDate });
@@ -311,9 +311,9 @@ var Info = (props) => {
   }, [renderMode, currentDate]);
   (0, import_react.useEffect)(() => {
     if (state.renderType === "eventBooking" && state.modalOpen) {
-      getServices();
+      getServices({ schedule_date: currentDate });
     }
-  }, [state.renderType, state.modalOpen]);
+  }, [state.renderType, state.modalOpen, currentDate]);
   const addButton = (0, import_react.useMemo)(() => {
     if (isDay) {
       return;

package/lib/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/lib/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/lib/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/lib/components/booking/info/service2/utils.js

@@ -299,6 +299,7 @@ var updateServices = (state, currentItem, type, other, actions) => {
   }
   if (type === "change_holder") {
     products = handleChangeHolder(products, currentItem, other);
+    return products;
   }
   if (type === "add_holder") {
     (_c = actions == null ? void 0 : actions.handleAddHolder) == null ? void 0 : _c.call(actions, products, currentItem);