@pisell/private-materials 3.2.33 → 3.2.35

package/es/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/Sales/Event/index.js

@@ -104,7 +104,11 @@ var EventProvider = ({ children }) => {
     setEventData({
       currentEventItem: eventItem
     });
-    createCartItemFromEvent(eventItem);
+    if (currentCartItem) {
+      updateCurrentCartItem({ eventItem });
+    } else {
+      createCartItemFromEvent(eventItem);
+    }
   };
   const contextValue = {
     eventData,

package/lib/components/Sales/Summary/utils.d.ts

@@ -25,7 +25,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

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

@@ -54,7 +54,12 @@ var ContinueButton = () => {
     carts,
     appointmentBooking,
     resourceOtherParams,
-    summary
+    summary,
+    isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy,
+    resources,
+    currentResource,
+    setCurrentResource
   } = (0, import_context.useAppointmentBookingContext)();
   const {
     getResourceTimeSlot,
@@ -62,7 +67,7 @@ var ContinueButton = () => {
     autoSelectAllProductResources
   } = (0, import_hooks.useAppointmentBookingResource)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
-  const { getStepIndex } = (0, import_hooks.useAppointmentBookingStep)();
+  const { getStepIndex, stepList } = (0, import_hooks.useAppointmentBookingStep)();
   const disabled = (0, import_react.useMemo)(() => {
     if (!carts.length) return true;
     return false;
@@ -72,31 +77,42 @@ var ContinueButton = () => {
     accountLists,
     resourceOtherParams == null ? void 0 : resourceOtherParams.errorList
   ]);
+  console.log((0, import_utils2.formatCarts)(carts, resources), "wh98987");
   const clearData = () => {
     var _a2;
     appointmentBooking.destroy();
     (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
+    setIsAgreeDepositPolicy(false);
+  };
+  const goPaymentFinish = (order_id, amount) => {
+    var _a2;
+    const url = `/payment-finish/success?order_id=${order_id}&amount=${Number(
+      amount
+    )}`;
+    (_a2 = utils == null ? void 0 : utils.history) == null ? void 0 : _a2.replace(url);
   };
   const handleNextStep = async () => {
-    var _a2, _b;
+    var _a2;
     if (isLastStep) {
+      const { deposit } = summary;
       setLoading(true);
       try {
-        const res = await appointmentBooking.submitOrder();
-        if ((summary == null ? void 0 : summary.total) > 0) {
+        const { data } = await appointmentBooking.submitOrder();
+        const { is_deposit, deposit_amount, total_amount, order_id } = data || {};
+        const _total = is_deposit ? deposit_amount : total_amount;
+        if (_total > 0) {
           utils.action({
             type: "pisell1.payment",
-            data: res == null ? void 0 : res.data
+            data
           });
         } else {
-          const { order_id, total_amount } = (res == null ? void 0 : res.data) || {};
+          if (deposit == null ? void 0 : deposit.hasDeposit) {
+            return goPaymentFinish(order_id, _total);
+          }
           const freeResult = await appointmentBooking.getFreeProduct(order_id);
           console.log(freeResult, "freeResult");
           if (freeResult == null ? void 0 : freeResult.status) {
-            const url = `/payment-finish/success?order_id=${order_id}&amount=${Number(
-              total_amount
-            )}`;
-            (_a2 = utils == null ? void 0 : utils.history) == null ? void 0 : _a2.replace(url);
+            goPaymentFinish(order_id, total_amount);
           } else {
             (0, import_materials.PisellToast)({
               content: freeResult == null ? void 0 : freeResult.message
@@ -110,21 +126,26 @@ var ContinueButton = () => {
       }
       return;
     }
-    if (((_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) === "select-resource") {
+    if (((_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key) === "select-resource") {
       getResourceTimeSlot();
     }
     return appointmentBooking.next();
   };
   const handleContinue = async () => {
-    var _a2;
+    var _a2, _b;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     console.log(currentStep, isLastStep, isLogin, accountLists, "wh9896788222");
     if (isLastStep) {
+      if (((_b = summary == null ? void 0 : summary.deposit) == null ? void 0 : _b.hasDeposit) && !isAgreeDepositPolicy) {
+        return (0, import_materials.PisellToast)({
+          content: import_utils.locales.getText("pisell2.appointment.deposit.agree.policy")
+        });
+      }
       if (!isLogin) {
         return openLoginModal({
           callback: (status) => {
-            var _a3, _b, _c, _d, _e;
-            const user = ((_d = (_c = (_b = (_a3 = utils == null ? void 0 : utils.store) == null ? void 0 : _a3.getState) == null ? void 0 : _b.call(_a3)) == null ? void 0 : _c.global) == null ? void 0 : _d.userInfo) || JSON.parse(((_e = utils == null ? void 0 : utils.storage) == null ? void 0 : _e.get("customer")) || {});
+            var _a3, _b2, _c, _d, _e;
+            const user = ((_d = (_c = (_b2 = (_a3 = utils == null ? void 0 : utils.store) == null ? void 0 : _a3.getState) == null ? void 0 : _b2.call(_a3)) == null ? void 0 : _c.global) == null ? void 0 : _d.userInfo) || JSON.parse(((_e = utils == null ? void 0 : utils.storage) == null ? void 0 : _e.get("customer")) || {});
             const currentUser = (0, import_utils2.formatCustomer)(user);
             const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
             if (status === "success") {
@@ -145,11 +166,26 @@ var ContinueButton = () => {
         return;
       }
     }
-    if (key === "select-resource" && (0, import_utils2.isEmptyCartsResourceId)(carts)) {
-      (0, import_materials.PisellToast)({
-        content: import_utils.locales.getText("pisell2.appointment.no.available.time")
-      });
-      return;
+    if (key === "select-resource") {
+      if ((0, import_utils2.isEmptyCartsResourceId)(carts)) {
+        (0, import_materials.PisellToast)({
+          content: import_utils.locales.getText("pisell2.appointment.no.available.time")
+        });
+        return;
+      }
+      console.log(
+        23423232344,
+        (0, import_utils2.hasResourceFormId)((0, import_utils2.formatCarts)(carts, resources))
+      );
+      if ((0, import_utils2.hasResourceFormId)((0, import_utils2.formatCarts)(carts, resources))) {
+        appointmentBooking.addStep({
+          // index: stepList - 2,
+          key: "fill-form",
+          description: import_utils.locales.getText("pisell2.appointment.fill-form")
+        });
+      } else {
+        appointmentBooking.removeStep("fill-form");
+      }
     }
     handleNextStep();
   };

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

@@ -40,34 +40,41 @@ var import_classnames = __toESM(require("classnames"));
 var import_context = require("../../../context");
 var Total = ({ className, isFooter }) => {
   const { summary, symbolic } = (0, import_context.useAppointmentBookingContext)();
-  const { taxTitle, totalTaxFee, isPriceIncludeTax, total } = summary;
+  const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = summary;
   console.log(summary, "summarysummary");
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: `appointment-total-wrap ${className}` }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "gst-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", null, taxTitle, isFooter ? ": " : ""), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText.Amount, { value: totalTaxFee, showCurrencySymbol: true })) : null, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
-      className: (0, import_classnames.default)("event-total", {
-        [["total-gst-wrap"]]: !isPriceIncludeTax && Number(totalTaxFee) > 0
-      })
+      className: `appointment-total-wrap ${className} ${(deposit == null ? void 0 : deposit.hasDeposit) ? "appointment-total-deposit-wrap" : ""}`
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
-      import_materials.PisellText.Amount,
+    !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "gst-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", null, taxTitle, isFooter ? ": " : ""), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText.Amount, { value: totalTaxFee, showCurrencySymbol: true })) : null,
+    /* @__PURE__ */ import_react.default.createElement(
+      "div",
       {
-        value: total,
-        showCurrencySymbol: true,
-        className: "event-amount"
-      }
-    ) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("span", { className: "gst" }, import_utils.locales.getText("pisell2.event.total.gst")(
-      `${isFooter ? `${taxTitle}: ` : taxTitle}`,
-      `${symbolic}${totalTaxFee}`
-    )) : null),
-    !isFooter ? /* @__PURE__ */ import_react.default.createElement(
-      import_materials.PisellText.Amount,
-      {
-        value: total,
-        showCurrencySymbol: true,
-        className: "event-amount"
-      }
-    ) : null
-  ));
+        className: (0, import_classnames.default)("event-total", {
+          [["total-gst-wrap"]]: !isPriceIncludeTax && Number(totalTaxFee) > 0
+        })
+      },
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
+        import_materials.PisellText.Amount,
+        {
+          value: total,
+          showCurrencySymbol: true,
+          className: "event-amount"
+        }
+      ) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("span", { className: "gst" }, import_utils.locales.getText("pisell2.event.total.gst")(
+        `${isFooter ? `${taxTitle}: ` : taxTitle}`,
+        `${symbolic}${totalTaxFee}`
+      )) : null),
+      !isFooter ? /* @__PURE__ */ import_react.default.createElement(
+        import_materials.PisellText.Amount,
+        {
+          value: total,
+          showCurrencySymbol: true,
+          className: "event-amount"
+        }
+      ) : null
+    )
+  );
 };
 var Total_default = Total;

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const CartItem: ({ onConfirm }: any) => JSX.Element;
+declare const CartItem: () => JSX.Element;
 export default CartItem;

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

@@ -42,9 +42,10 @@ var import_hooks2 = require("../../../hooks");
 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_index = require("./index.less");
-var CartItem = ({ onConfirm }) => {
+var CartItem = () => {
   var _a, _b, _c, _d;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
@@ -53,21 +54,30 @@ var CartItem = ({ onConfirm }) => {
     currentStep,
     resources,
     setResourceOtherParams,
-    resourceOtherParams
+    resourceOtherParams,
+    summary
   } = (0, import_context.useAppointmentBookingContext)();
-  const { accountLists } = (0, import_hooks2.useAppointmentBookingAccount)();
+  const { accountLists, getHolders } = (0, import_hooks2.useAppointmentBookingAccount)();
   const { getResourceList } = (0, import_hooks2.useAppointmentBookingResource)();
+  const { isFormSubject } = (0, import_hooks2.useAppointmentBookingSetting)();
+  const { isLogin } = (0, import_hooks2.useAppointmentBookingLogin)();
   const context = (0, import_useEngineContext.default)();
   const { businessUtils } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const currentUser = (0, import_utils2.formatCurrentUser)();
+  const { deposit } = summary;
+  console.log(deposit, accountLists, "deposit");
   const holderIds = (0, import_react.useMemo)(() => {
+    if (isFormSubject) return [];
     return accountLists.map((item) => item.id);
-  }, [accountLists]);
+  }, [accountLists, isFormSubject]);
   const holders = (0, import_react.useMemo)(() => {
+    if (isFormSubject) return [];
     return (0, import_utils2.formatHolder)(accountLists);
-  }, [accountLists]);
-  const hasGoodPassApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "goodpass"));
-  console.log("has goodpass app:", hasGoodPassApp);
+  }, [accountLists, isFormSubject]);
+  const hasGoodPassApp = (0, import_react.useMemo)(() => {
+    var _a2;
+    return !!((_a2 = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a2.call(businessUtils, "goodpass"));
+  }, []);
   const handleClickCard = (e, type, val) => {
     if (type === "note") {
       return appointmentBooking.updateCart({
@@ -86,12 +96,19 @@ var CartItem = ({ onConfirm }) => {
         ...resourceOtherParams,
         errorList: null
       });
-      return appointmentBooking.updateCart({
+      appointmentBooking.updateCart({
         _id: e == null ? void 0 : e._id,
         resources: [val]
       });
+      getResourceList();
+      return;
     }
   };
+  console.log(
+    ((_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) === "select-resource",
+    holders,
+    "select-resource"
+  );
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -101,13 +118,16 @@ var CartItem = ({ onConfirm }) => {
       import_shoppingCart.default,
       {
         productParams: {
-          products: (0, import_utils2.formatCarts)(carts, resources),
+          products: (0, import_utils2.formatCarts)(carts, resources, accountLists),
           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",
-          isShowPackageNote: false
+          isShowPackageNote: false,
+          isShowChangeHolder: isFormSubject && isLogin,
+          isShowHolder: isFormSubject,
+          isShowAddHolderButton: true
         },
         collapseParams: {
           activeKey: holderIds,
@@ -120,7 +140,7 @@ var CartItem = ({ onConfirm }) => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
   ));
 };
 var Item_default = CartItem;

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

@@ -74,26 +74,32 @@
   }
 }
 
+.appointment-total-deposit-wrap {
+  color: var(--Text-Text_1, #1b1b1b);
+  font-size: 20px;
+  font-weight: 600;
+  line-height: 28px;
+}
+
 .appointment-cart-mobile-item-wrap {
+  height: 100%;
   display: flex;
   flex-direction: column;
-  position: relative;
-  height: 100%;
+  overflow: hidden;
 
   .content {
     flex: 1;
     overflow-y: auto;
-    padding: 0 0 210px;
-    max-height: 100%;
+    padding: 16px 16px 0;
   }
+
   .appointment-footer {
-    z-index: 10;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
+    background: #fff;
     border-top: 1px solid #eaecf0;
     padding: 14px 24px 24px;
     margin-top: 0;
+    position: relative;
+    flex: none;
+    z-index: 10;
   }
 }

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

@@ -47,14 +47,14 @@ var Cart = ({ open, onCancel }) => {
       closable: true,
       onCancel: () => onCancel(),
       bodyStyle: {
-        padding: "20px"
+        padding: 0
       },
       destroyOnClose: true,
       className: `appointment-cart-modal`,
       footer: null,
       forceRender: true
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflowY: "auto" } }, /* @__PURE__ */ import_react.default.createElement(import_Item.default, null))
+    /* @__PURE__ */ import_react.default.createElement(import_Item.default, null)
   );
 };
 var Cart_default = Cart;

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

@@ -0,0 +1,3 @@
+import './index.less';
+declare const ConfirmInformation: () => JSX.Element;
+export default ConfirmInformation;

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

@@ -0,0 +1,42 @@
+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)
+    __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 __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/components/ConfirmInformation/index.tsx
+var ConfirmInformation_exports = {};
+__export(ConfirmInformation_exports, {
+  default: () => ConfirmInformation_default
+});
+module.exports = __toCommonJS(ConfirmInformation_exports);
+var import_react = __toESM(require("react"));
+var import_utils = require("@pisell/utils");
+var import_Item = __toESM(require("../Cart/Item"));
+var import_index = require("./index.less");
+var ConfirmInformation = () => {
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, null) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__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/ConfirmInformation/index.less

@@ -0,0 +1,24 @@
+.appointment-confirm-information-wrap {
+  padding-top: 20px;
+
+  .appointment-confirm-information-content {
+    display: flex;
+    flex-direction: column;
+
+    .tips {
+      margin-top: 24px;
+      color: var(--Gray-900, #101828);
+      font-size: 18px;
+      font-style: normal;
+      font-weight: 600;
+    }
+
+    .tips-content {
+      margin-top: 4px;
+      color: var(--Gray-900, #101828);
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 400;
+    }
+  }
+}

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

@@ -42,15 +42,30 @@ var import_Date = __toESM(require("../Date"));
 var import_Resource = __toESM(require("../Resource"));
 var import_TimeSlicing = __toESM(require("../TimeSlicing"));
 var import_Guest = __toESM(require("../Guest"));
+var import_Form = __toESM(require("../Form"));
+var import_ConfirmInformation = __toESM(require("../ConfirmInformation"));
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
 var Layout = () => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const { currentStep, setResourceOtherParams, resourceOtherParams } = (0, import_context.useAppointmentBookingContext)();
+  const { getLoadAllSchedule, isDateSelectedFirst, isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
+  const { getHolders } = (0, import_hooks.useAppointmentBookingAccount)();
   (0, import_hooks.useAppointmentBookingCart)();
   (0, import_hooks.useAppointmentBookingStep)();
   const [params, setParams] = (0, import_react.useState)({});
+  (0, import_react.useEffect)(() => {
+    if (isFormSubject && isLogin) {
+      getHolders();
+    }
+  }, [isFormSubject, isLogin]);
+  (0, import_react.useEffect)(() => {
+    if (isDateSelectedFirst) {
+      getLoadAllSchedule();
+    }
+  }, [isDateSelectedFirst]);
   (0, import_react.useEffect)(() => {
     setResourceOtherParams({
       ...resourceOtherParams,
@@ -75,7 +90,11 @@ var Layout = () => {
       // 选择资源
       "select-resource": import_Resource.default,
       // 时间切片
-      "select-time": import_TimeSlicing.default
+      "select-time": import_TimeSlicing.default,
+      // 填写表单
+      "fill-form": import_Form.default,
+      // 确认信息
+      "confirm-information": import_ConfirmInformation.default
     };
     let Com2 = components[key];
     return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params });
@@ -98,13 +117,22 @@ var Layout = () => {
       }
     }
   }, [(_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key]);
+  const isShowCartCom = (0, import_react.useMemo)(() => {
+    var _a2;
+    const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
+    if ((0, import_utils.isMobile)()) return null;
+    if (isDateSelectedFirst && key === "select-date") {
+      return null;
+    }
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "parallel-content-right" }, /* @__PURE__ */ import_react.default.createElement(import_Item.default, null));
+  }, [isDateSelectedFirst, (_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Header.default, null), /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: `parallel-content-wrap ${(0, import_utils.isMobile)() ? "parallel-content-mobile-wrap" : ""}`
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "parallel-content-left" }, Com),
-    !(0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement("div", { className: "parallel-content-right" }, /* @__PURE__ */ import_react.default.createElement(import_Item.default, null)) : null
+    isShowCartCom
   ), (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Footer.default, null) : null);
 };
 var Content_default = Layout;

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

@@ -40,6 +40,7 @@ var import_classnames = __toESM(require("classnames"));
 var import_utils = require("@pisell/utils");
 var import_icons = require("@ant-design/icons");
 var import_context = require("../../context");
+var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 var CalendarDate = (props) => {
@@ -50,6 +51,7 @@ var CalendarDate = (props) => {
     return (0, import_dayjs.default)();
   });
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
+  const { isDateSelectedFirst, customPageId } = (0, import_hooks.useAppointmentBookingSetting)();
   const weekListText = [
     import_utils.locales.getText("pisell2.appointment.sunday"),
     import_utils.locales.getText("pisell2.appointment.monday"),
@@ -89,7 +91,18 @@ var CalendarDate = (props) => {
     let lastDate = (0, import_dayjs.default)(newCurrentMonth).subtract(1, "month");
     return lastDate.isBefore((0, import_dayjs.default)(), "month");
   };
+  const getDateData = async (params) => {
+    console.log(isDateSelectedFirst, customPageId, "wh7868");
+    if (isDateSelectedFirst) {
+      return appointmentBooking.loadScheduleAvailableDate({
+        ...params,
+        custom_page_id: customPageId
+      });
+    }
+    return await appointmentBooking.getAvailableDate(params);
+  };
   const getDates = async (date) => {
+    var _a;
     try {
       const startDate = (0, import_dayjs.default)(date).startOf("month").format("YYYY-MM-DD");
       const endDate = (0, import_dayjs.default)(date).endOf("month").format("YYYY-MM-DD");
@@ -97,13 +110,14 @@ var CalendarDate = (props) => {
         startDate,
         endDate
       };
-      const data = await appointmentBooking.getAvailableDate(params);
+      const data = await getDateData(params);
       const selected = await appointmentBooking.getDateRange();
+      console.log(data, selected, customPageId, "getDates");
       if ((selected == null ? void 0 : selected.length) > 0) {
-        setCurrentDate(selected[0].date);
+        setCurrentDate((_a = selected == null ? void 0 : selected[0]) == null ? void 0 : _a.date);
       } else {
         if (date.format("YYYY-MM") === (0, import_dayjs.default)().format("YYYY-MM")) {
-          const firstAvailableDate = data.find(
+          const firstAvailableDate = (data || []).find(
             (d) => d.status === "available"
           );
           setCurrentDate(firstAvailableDate == null ? void 0 : firstAvailableDate.date);
@@ -126,6 +140,7 @@ var CalendarDate = (props) => {
       setDateMonthList(updatedDates);
     } catch (error) {
       setLoading(false);
+      setDateMonthList([]);
       console.log(error, "wh978968234234");
     }
   };
@@ -143,6 +158,14 @@ var CalendarDate = (props) => {
     setCurrentMonth(newNextMonth);
     setLoading(true);
   };
+  const handleClick = (day, date) => {
+    if (day == null ? void 0 : day.disabled) return;
+    setCurrentDate(date);
+    appointmentBooking.setDateRange([day]);
+    if (isDateSelectedFirst) {
+      appointmentBooking.next();
+    }
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -176,11 +199,7 @@ var CalendarDate = (props) => {
             ["other-month-days"]: !isCurrentMonth,
             ["loading-item"]: loading
           }),
-          onClick: () => {
-            if (day == null ? void 0 : day.disabled) return;
-            setCurrentDate(date);
-            appointmentBooking.setDateRange([day]);
-          }
+          onClick: () => handleClick(day, date)
         },
         isCurrentMonth && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("day-text") }, (0, import_dayjs.default)(day.date).format("D"))
       );

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

@@ -0,0 +1,3 @@
+import './index.less';
+declare const Deposit: () => JSX.Element;
+export default Deposit;