@pisell/private-materials 3.3.10 → 3.3.13

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

@@ -45,9 +45,16 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
   const [showAgreement, setShowAgreement] = (0, import_react.useState)(false);
   const [agreementContent, setAgreementContent] = (0, import_react.useState)({});
   const [formStatus, setFormStatus] = (0, import_react.useState)([]);
-  const { carts, appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
+  const { carts, appointmentBooking, setLoading } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
   const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    next: () => {
+      var _a, _b;
+      setLoading(true);
+      (_b = (_a = manualRef.current) == null ? void 0 : _a.submit) == null ? void 0 : _b.call(_a);
+    }
+  }));
   const key = "booking_form";
   const resources = (0, import_react.useMemo)(() => {
     const _resource = getResourceList();
@@ -59,7 +66,7 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
   const newCarts = (0, import_utils.formatCarts)(carts, resources);
   const forms = (0, import_react.useMemo)(() => {
     if (!(newCarts == null ? void 0 : newCarts.length) || !(resources == null ? void 0 : resources.length)) return [];
-    return (0, import_utils.formatForms)(newCarts);
+    return (0, import_utils.formatForms)(newCarts) || [];
   }, [newCarts, resources]);
   const currentForm = (0, import_react.useMemo)(() => {
     return forms == null ? void 0 : forms[currentFormIndex];
@@ -73,6 +80,7 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     if (nextIndex < forms.length) {
       setCurrentFormIndex(nextIndex);
       if (!((_a = forms == null ? void 0 : forms[nextIndex]) == null ? void 0 : _a.form_id) && ((_b = forms == null ? void 0 : forms[nextIndex]) == null ? void 0 : _b.policy_id)) {
+        setLoading(true);
         setAgreementContent({ id: (_c = forms == null ? void 0 : forms[nextIndex]) == null ? void 0 : _c.policy_id });
         setShowAgreement(true);
       }
@@ -81,6 +89,9 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     }
   };
   const updateFormStatus = (status) => {
+    if (status === "error") {
+      setLoading(false);
+    }
     const newFormStatus = (0, import_utils.updateLists)(formStatus, "id", currentForm == null ? void 0 : currentForm.form_id, {
       status
     });
@@ -116,12 +127,6 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     setShowAgreement(false);
     goToNextForm();
   };
-  (0, import_react.useImperativeHandle)(ref, () => ({
-    submit: () => {
-      var _a, _b;
-      (_b = (_a = manualRef.current) == null ? void 0 : _a.submit) == null ? void 0 : _b.call(_a);
-    }
-  }));
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, (currentForm == null ? void 0 : currentForm.form_id) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-form-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     FormCard,
     {
@@ -142,15 +147,16 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
       onFormValueChange: (values) => {
         console.log(values, "onFormValueChange");
       },
-      defaultValues: formStorage == null ? void 0 : formStorage[currentForm == null ? void 0 : currentForm.id],
-      isClearData: false
+      defaultValues: (formStorage == null ? void 0 : formStorage[currentForm == null ? void 0 : currentForm.id]) || {},
+      isClearData: !(formStorage == null ? void 0 : formStorage[currentForm == null ? void 0 : currentForm.id])
     }
   )) : null, showAgreement ? /* @__PURE__ */ import_react.default.createElement(
     import_PolicyModal.default,
     {
       open: showAgreement,
       onCancel: handleAgreementOk,
-      item: agreementContent
+      item: agreementContent,
+      onChange: () => setLoading(false)
     }
   ) : null);
 });

package/lib/components/appointmentBooking/components/Guest/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const Guest: () => JSX.Element;
+declare const Guest: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
 export default Guest;

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

@@ -41,11 +41,16 @@ var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
-var Guest = () => {
+var Guest = (0, import_react.forwardRef)((props, ref) => {
   const [openOption, setOpenOption] = (0, import_react.useState)(false);
   const [holderItem, setHolderItem] = (0, import_react.useState)(null);
   const { carts, appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    next: () => {
+      appointmentBooking.next();
+    }
+  }));
   const lists = (0, import_react.useMemo)(() => {
     const _lists = (0, import_utils2.formatGuest)(accountLists, carts);
     return _lists;
@@ -156,5 +161,5 @@ var Guest = () => {
       }
     }
   ) : null);
-};
+});
 var Guest_default = Guest;

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

@@ -45,7 +45,7 @@ var Header = () => {
   const shopDiscount = (0, import_hooks.useShopDiscount)();
   const context = (0, import_useEngineContext.default)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
-  const { getStepIndex, stepList } = (0, import_hooks.useAppointmentBookingStep)();
+  const { getStepIndex, stepList, updateStep } = (0, import_hooks.useAppointmentBookingStep)();
   const { setOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
   const { checkProductType } = (0, import_hooks.useAppointmentBookingProduct)();
   const stepName = (0, import_react.useMemo)(() => {
@@ -84,17 +84,17 @@ var Header = () => {
     if (key === "fill-form") {
       setOtherData("booking_form", {});
     }
-    const isHasForm = stepList == null ? void 0 : stepList.some((item) => item.key === "fill-form");
-    const shouldCheckSkip = isHasForm && key === "fill-form" || key === "select-time";
-    if (shouldCheckSkip) {
-      const skipResourceStep = await checkSkipResourceStep();
-      if (skipResourceStep) {
-        appointmentBooking.deleteCartItemInfo("resource");
-        const targetIndex = getStepIndex("prev", 2);
-        return appointmentBooking.gotoStep(targetIndex);
-      }
+    const resourceStep = stepList[(currentStep == null ? void 0 : currentStep.index) - 1];
+    if ((resourceStep == null ? void 0 : resourceStep.isSkip) && (resourceStep == null ? void 0 : resourceStep.key) === "select-resource") {
+      appointmentBooking.deleteCartItemInfo("resource");
     }
     appointmentBooking.back();
+    if ((resourceStep == null ? void 0 : resourceStep.isSkip) && (resourceStep == null ? void 0 : resourceStep.key) === "select-resource") {
+      updateStep(resourceStep == null ? void 0 : resourceStep.key, {
+        index: currentStep == null ? void 0 : currentStep.index,
+        isSkip: false
+      });
+    }
   };
   const handleClose = () => {
     var _a2, _b;

package/lib/components/appointmentBooking/components/Resource/index.d.ts

@@ -1,3 +1,7 @@
+import React from 'react';
 import './index.less';
-declare const Resource: () => JSX.Element;
+interface ResourceProps {
+    onChange?: (val: any) => void;
+}
+declare const Resource: React.ForwardRefExoticComponent<ResourceProps & React.RefAttributes<any>>;
 export default Resource;

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

@@ -38,54 +38,107 @@ var import_resourceDisplay = __toESM(require("../../../eventBooking/components/r
 var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_context = require("../../context");
-var import_guests = __toESM(require("../../assets/guests.svg"));
 var import_utils = require("../../utils");
-var import_utils2 = require("@pisell/utils");
+var import_utils2 = require("../../components/Cart/utils");
+var import_utils3 = require("./utils");
+var import_guests = __toESM(require("../../assets/guests.svg"));
+var import_utils4 = require("@pisell/utils");
 var import_index = require("./index.less");
-var Resource = () => {
+var Resource = (0, import_react.forwardRef)((props, ref) => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)(0);
   const {
     appointmentBooking,
-    resources,
     carts,
     resourceOtherParams,
-    currentStep
+    setCarts,
+    currentStep,
+    setResourceOtherParams,
+    setIsErrorHolder
   } = (0, import_context.useAppointmentBookingContext)();
-  const { getResourceList, autoSelectAllProductResources } = (0, import_hooks.useAppointmentBookingResource)();
+  const {
+    getResourceList,
+    autoSelectAllProductResources,
+    getResourceTimeSlot
+  } = (0, import_hooks.useAppointmentBookingResource)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
-  const { addStep, removeStep } = (0, import_hooks.useAppointmentBookingStep)();
-  const newCarts = (0, import_utils.formatCarts)(carts, resources);
+  const { updateStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const { openLoginModal, isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
+  const { getHolders, checkAccount } = (0, import_hooks.useAppointmentBookingAccount)();
+  const { isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
+  const utils = (0, import_hooks.contextUtils)();
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    next: async () => {
+      var _a, _b, _c;
+      const result = (0, import_utils2.checkResource)({ carts, resources });
+      if (result) {
+        setCarts(result);
+      }
+      setIsErrorHolder(!!result);
+      if (!!result) {
+        (0, import_utils3.scrollToFirstErrorCard)();
+        return;
+      }
+      const resultCarts = (0, import_utils.formatCartsResources)(carts, resources);
+      const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
+      const accountLists = await appointmentBooking.getAccounts();
+      const checkResult = (0, import_utils.checkHasFormStep)({
+        hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0,
+        currentStep,
+        stepList,
+        appointmentBooking,
+        locales: import_utils4.locales,
+        openLoginModal,
+        utils,
+        accountLists,
+        getHolders,
+        checkHolder: import_utils2.checkHolder,
+        checkAccount,
+        setCarts,
+        carts,
+        isFormSubject,
+        isLogin
+      });
+      if (checkResult) return;
+      setResourceOtherParams({
+        ...resourceOtherParams,
+        errorList: null
+      });
+      getResourceTimeSlot();
+      appointmentBooking.next();
+    }
+  }));
+  const resources = (0, import_react.useMemo)(() => {
+    const { resources: resources2 } = getResourceList();
+    return resources2 || [];
+  }, []);
   (0, import_react.useEffect)(() => {
     const checkAndSkipResourceStep = async () => {
-      const skipResourceStep = await checkSkipResourceStep();
-      const _resources = getResourceList();
-      autoSelectAllProductResources();
-      getResourceList();
-      console.log(skipResourceStep, "skipResourceStep");
-      if (skipResourceStep) {
-        const index = (currentStep == null ? void 0 : currentStep.index) + 1;
-        if ((0, import_utils.hasResourceFormId)(newCarts)) {
-          const description = import_utils2.locales.getText("pisell2.appointment.fill-form");
-          addStep({ index, key: "fill-form", description });
-        } else {
-          removeStep("fill-form");
+      var _a;
+      try {
+        const _resources = getResourceList();
+        await autoSelectAllProductResources();
+        getResourceList();
+        const skipResourceStep = await checkSkipResourceStep();
+        const key = (_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key;
+        updateStep(key, {
+          index: currentStep == null ? void 0 : currentStep.index,
+          isSkip: skipResourceStep
+        });
+        if (skipResourceStep) {
+          return true;
         }
-        appointmentBooking.next();
-        return true;
+        return false;
+      } catch (error) {
       }
-      return false;
     };
     checkAndSkipResourceStep();
   }, []);
-  (0, import_react.useEffect)(() => {
-    console.log(resourceOtherParams, "resourceOtherParams");
-  }, [resourceOtherParams == null ? void 0 : resourceOtherParams.errorList]);
   const anyResource = [
     {
       id: 0,
       image: import_guests.default,
-      title: import_utils2.locales.getText("pisell2.appointment.any.professional"),
-      subtitle: import_utils2.locales.getText("pisell2.appointment.for.maximum.availability")
+      title: import_utils4.locales.getText("pisell2.appointment.any.professional"),
+      subtitle: import_utils4.locales.getText("pisell2.appointment.for.maximum.availability")
     }
   ];
   const currentResource = (0, import_react.useMemo)(() => {
@@ -132,11 +185,11 @@ var Resource = () => {
           }
         );
       },
-      columns: (0, import_utils2.isMobile)() ? 2 : 3,
+      columns: (0, import_utils4.isMobile)() ? 2 : 3,
       horizontalGap: 16,
       verticalGap: 16,
       onClick: (e) => onClick && onClick(e)
     }
   ));
-};
+});
 var Resource_default = Resource;

package/lib/components/appointmentBooking/components/Resource/utils.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 滚动到第一个错误卡片
+ * @param {string} selector - 错误卡片的 class 选择器
+ */
+export declare const scrollToFirstErrorCard: (selector?: string) => void;

package/lib/components/appointmentBooking/components/Resource/utils.js

@@ -0,0 +1,36 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/appointmentBooking/components/Resource/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  scrollToFirstErrorCard: () => scrollToFirstErrorCard
+});
+module.exports = __toCommonJS(utils_exports);
+var scrollToFirstErrorCard = (selector = ".pisell-lowcode-product-select-resource-error") => {
+  setTimeout(() => {
+    const errorCard = document.querySelector(selector);
+    if (errorCard) {
+      errorCard.scrollIntoView({ behavior: "smooth", block: "center" });
+    }
+  }, 0);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  scrollToFirstErrorCard
+});

package/lib/components/appointmentBooking/components/Services/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const Services: () => JSX.Element;
+declare const Services: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
 export default Services;

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

@@ -41,9 +41,7 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
-var Services = () => {
-  const searchRef = (0, import_react.useRef)();
-  const [search, setSearch] = (0, import_react.useState)("");
+var Services = (0, import_react.forwardRef)((props, ref) => {
   const context = (0, import_useEngineContext.default)();
   const { utils } = context.appHelper || {};
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
@@ -53,6 +51,11 @@ var Services = () => {
   const { currentStep } = (0, import_context.useAppointmentBookingContext)();
   const [products, setProducts] = (0, import_react.useState)(null);
   const [loading, setLoading] = (0, import_react.useState)(false);
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    next: () => {
+      appointmentBooking.next();
+    }
+  }));
   (0, import_react.useEffect)(() => {
     setLoading(true);
     getProducts().then((res) => {
@@ -144,15 +147,13 @@ var Services = () => {
       token: {
         colorPrimary: "var(--theme-color)",
         containerBg: "#FFFFFF",
-        // tab
         tabItemBg: "#F2F4F7",
         tabItemHoverBg: "#F2F4F7",
         tabItemActiveBg: "var(--theme-color)",
-        // category
         categoryTextColor: "#1B1B1B",
         cardSelectedBg: "var(--theme-color)"
       }
     }
   ));
-};
+});
 var Services_default = Services;

package/lib/components/appointmentBooking/components/TimeSlicing/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const Resource: () => JSX.Element;
-export default Resource;
+declare const TimeSlicing: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
+export default TimeSlicing;

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

@@ -37,8 +37,9 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
+var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
-var Resource = () => {
+var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)("");
   const {
     times,
@@ -48,6 +49,16 @@ var Resource = () => {
     carts
   } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceTimeSlot, getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    next: () => {
+      const isUnSelectedTimes = appointmentBooking.checkCartItems("date");
+      if ((isUnSelectedTimes == null ? void 0 : isUnSelectedTimes.length) > 0) {
+        (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unselect.time"));
+        return;
+      }
+      appointmentBooking.next();
+    }
+  }));
   (0, import_react.useEffect)(() => {
     getResourceTimeSlot();
   }, []);
@@ -91,5 +102,5 @@ var Resource = () => {
       description: import_utils.locales.getText("pisell2.appointment.unselect.time")
     }
   );
-};
-var TimeSlicing_default = Resource;
+});
+var TimeSlicing_default = TimeSlicing;

package/lib/components/appointmentBooking/context.js

@@ -52,13 +52,14 @@ var AppointmentBookingProvider = ({
   const [isAgreeDepositPolicy, setIsAgreeDepositPolicy] = (0, import_react.useState)(false);
   const [currentResource, setCurrentResource] = (0, import_react.useState)(null);
   const [stepParams, setStepParams] = (0, import_react.useState)({});
+  const [loading, setLoading] = (0, import_react.useState)(false);
+  const [isErrorHolder, setIsErrorHolder] = (0, import_react.useState)(false);
   const { appHelper } = (0, import_useEngineContext.default)();
   const symbolic = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.getSymbolic();
   (0, import_react.useEffect)(() => {
     const currentStep2 = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
     setCurrentStep(currentStep2);
   }, []);
-  console.log(3234234, times, resources);
   const value = {
     appointmentBooking,
     times,
@@ -82,7 +83,11 @@ var AppointmentBookingProvider = ({
     currentResource,
     setCurrentResource,
     setStepParams,
-    stepParams
+    stepParams,
+    loading,
+    setLoading,
+    isErrorHolder,
+    setIsErrorHolder
   };
   return /* @__PURE__ */ import_react.default.createElement(AppointmentBookingContext.Provider, { value }, children);
 };

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

@@ -39,7 +39,7 @@ var import_utils = require("@pisell/utils");
 var import_context = require("../../../context");
 var import_index = require("./index.less");
 var DepositModal = (props) => {
-  const { open, onCancel, item } = props;
+  const { open, onCancel, item, onChange } = props;
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const [policy, setPolicy] = (0, import_react.useState)(null);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -48,8 +48,10 @@ var DepositModal = (props) => {
     try {
       const { data } = await appointmentBooking.getProtocol(id);
       setPolicy(data);
+      onChange(data);
     } catch (error) {
       console.log(error);
+      onChange(error);
     } finally {
       setLoading(false);
     }

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

@@ -13,6 +13,7 @@ export declare const useAppointmentBookingStep: () => {
     stepList: any;
     removeStep: (key: string) => any;
     addStep: (props: any, stepKey?: string) => any;
+    updateStep: (key: string, step: any) => void;
 };
 /**
  * @title: 获取商品数据
@@ -83,7 +84,7 @@ export declare const useAppointmentBookingResource: () => {
  * @Date: 2025-04-21 11:47
  */
 export declare const useIsSkipResourceStep: () => {
-    checkSkipResourceStep: () => Promise<boolean>;
+    checkSkipResourceStep: (isSkipUpdateFormStep?: boolean) => Promise<boolean>;
 };
 /**
  * @title: 获取预约配置

package/lib/components/appointmentBooking/hooks.js

@@ -43,10 +43,12 @@ __export(hooks_exports, {
 });
 module.exports = __toCommonJS(hooks_exports);
 var import_react = require("react");
+var import_utils = require("@pisell/utils");
 var import_useEngineContext = require("../../hooks/useEngineContext");
 var import_useEngineContext2 = __toESM(require("../../hooks/useEngineContext"));
-var import_utils = require("./utils");
+var import_utils2 = require("./utils");
 var import_context = require("./context");
+var import_utils3 = require("./components/Cart/utils");
 var useAppointmentBooking = () => {
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
   return pisellOS.getModule("appointmentBooking");
@@ -111,7 +113,14 @@ var useAppointmentBookingStep = () => {
       description
     }, stepKey);
   };
-  return { getStepIndex, stepList, removeStep, addStep };
+  const updateStep = (key, step) => {
+    appointmentBooking.updateStep(key, {
+      index: step == null ? void 0 : step.index,
+      key,
+      isSkip: (step == null ? void 0 : step.isSkip) || false
+    });
+  };
+  return { getStepIndex, stepList, removeStep, addStep, updateStep };
 };
 var useAppointmentBookingProduct = () => {
   const { appointmentBooking, carts } = (0, import_context.useAppointmentBookingContext)();
@@ -199,7 +208,7 @@ 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_utils.getCustomer)();
+  const customer = (0, import_utils2.getCustomer)();
   const getAccountLists = async () => {
     const data = await appointmentBooking.getAccounts();
     setAccountLists(data || []);
@@ -255,7 +264,7 @@ var useAppointmentBookingResource = () => {
     resources = resources.map((item) => {
       return {
         ...item,
-        resources: (0, import_utils.sortResources)((item == null ? void 0 : item.resources) || [], resourceSort)
+        resources: (0, import_utils2.sortResources)((item == null ? void 0 : item.resources) || [], resourceSort)
       };
     });
     const _resources = ((_a = resources == null ? void 0 : resources[0]) == null ? void 0 : _a.resources) || [];
@@ -285,17 +294,28 @@ var useAppointmentBookingResource = () => {
   return { getResourceTimeSlot, getResourceList, autoSelectAllProductResources };
 };
 var useIsSkipResourceStep = () => {
-  const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
+  var _a, _b, _c;
+  const { currentStep, setCarts } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList, autoSelectAllProductResources } = useAppointmentBookingResource();
   const { isFormSubject } = useAppointmentBookingSetting();
-  const checkSkipResourceStep = async () => {
-    var _a, _b, _c, _d, _e;
+  const appointmentBooking = useAppointmentBooking();
+  const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
+  const { isLogin, openLoginModal } = useAppointmentBookingLogin();
+  const { getHolders, checkAccount } = useAppointmentBookingAccount();
+  const utils = contextUtils();
+  const checkSkipResourceStep = async (isSkipUpdateFormStep) => {
+    var _a2, _b2, _c2, _d, _e;
     try {
       const accountLists = await appointmentBooking.getAccounts();
+      const carts = await appointmentBooking.getCart();
       if ((accountLists == null ? void 0 : accountLists.length) === 1 || isFormSubject) {
         const res = await autoSelectAllProductResources();
         const { resources } = getResourceList();
-        if (!((_a = res == null ? void 0 : res.errorList) == null ? void 0 : _a.length) && ((_e = (_d = (_c = (_b = resources == null ? void 0 : resources[0]) == null ? void 0 : _b.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.renderList) == null ? void 0 : _e.length) === 1) {
+        if (!((_a2 = res == null ? void 0 : res.errorList) == null ? void 0 : _a2.length) && ((_e = (_d = (_c2 = (_b2 = resources == null ? void 0 : resources[0]) == null ? void 0 : _b2.resources) == null ? void 0 : _c2[0]) == null ? void 0 : _d.renderList) == null ? void 0 : _e.length) === 1) {
+          if (!isSkipUpdateFormStep) {
+            const resultCarts = (0, import_utils2.formatCartsResources)(carts, resources);
+            (0, import_utils2.checkHasFormStep)({ isSkip: true, openLoginModal, utils, accountLists, getHolders, checkHolder: import_utils3.checkHolder, setCarts, checkAccount, carts, isFormSubject, hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0, currentStep, stepList, appointmentBooking, locales: import_utils.locales, isLogin });
+          }
           return true;
         } else {
           return false;
@@ -304,6 +324,7 @@ var useIsSkipResourceStep = () => {
         return false;
       }
     } catch (error) {
+      console.log(error, "checkSkipResourceStep33");
       return false;
     }
   };