@pisell/private-materials 3.2.35 → 3.2.37

package/es/components/ticketBooking/data.js

@@ -0,0 +1,82 @@
+// const mockProduct = {
+//   order_id: 0,
+//   shop_id: 0,
+//   product_id: 0,
+//   product_variant_id: 0,
+//   product_unique_string: '0:0:',
+//   product_title: '',
+//   product_cover: '',
+//   product_sku: {
+//     code: 'HNYmhKjqKKCJ',
+//     name: '',
+//     barcode: '',
+//     sku_ids: '',
+//     variant: [],
+//     variant_id: '0',
+//     generate_voucher: [],
+//   },
+//   product_bundle: [],
+//   gift_card: 0,
+//   selling_price: '0',
+//   original_price: '0',
+//   cost_price: '0.00',
+//   product_quantity: 1,
+//   payment_price: '0',
+//   deposit_price: '0.00',
+//   tax_fee: '0',
+//   is_charge_tax: 1,
+//   refund_quantity: 0,
+//   refund_status: '0',
+//   shipping_status: 'unfulfilled',
+//   payment_status: 'payment_processing',
+//   commission: 0,
+//   commission_tax: 0,
+//   rebate_type: '',
+//   rebate_value: '0.00',
+//   commission_percent: '0.0000',
+//   channel: '',
+//   channel_id: 0,
+//   item_relation_id: 0,
+//   schedule_event_id: 0,
+//   note: '',
+//   extension_type: 'product_appointment',
+//   before_product_quantity: 1,
+//   remove_product_quantity: 0,
+//   deleted_at: null,
+//   created_at: '2024-02-28 15:49:21',
+//   updated_at: '2024-02-28 15:49:39',
+//   order_detail_id: 0,
+//   product_option_string: '',
+//   product_subtitle: '',
+//   source_product_price: '0',
+//   discount_amount: 0,
+//   product_discount_reason: '',
+//   discount_type: '',
+//   discountway: '',
+//   discount_per: '',
+//   single_discount: null,
+// };
+
+// const payStatusMap = {
+//   authorized: this.i18n('i18n-lwug1s79'),
+//   paid: this.i18n('i18n-m1oe3fyx'),
+//   partially_paid: this.i18n('i18n-m1oe3g3w'),
+//   partially_refunded: this.i18n('i18n-m1oe3g8j'),
+//   payment_pending: this.i18n('i18n-m1oe3gd6'),
+//   refunded: this.i18n('i18n-m1oe474a'),
+//   unpaid: this.i18n('i18n-m1oe47cm'),
+//   voided: this.i18n('i18n-m1oe4k3o'),
+//   payment_processing: this.i18n('i18n-m1oe4k9a'),
+// };
+
+// const payStatusColorMap = {
+//   authorized: 'var(--Gray-200, #EAECF0)',
+//   paid: 'var(--Success-100, #DCFAE6)',
+//   partially_paid: 'var(--Moss-100, #E6F4D7)',
+//   partially_refunded: 'var(--Pink-100, #FCE7F6)',
+//   payment_pending: 'var(--Warning-100, #FEF0C7)',
+//   refunded: 'var(--Error-100, #FEE4E2)',
+//   unpaid: 'var(--Blue-100, #D1E9FF)',
+//   voided: 'var(--Gray-200, #EAECF0)',
+//   payment_processing: 'var(--Warning-100, #FEF0C7)',
+// };

package/es/components/ticketBooking/index.js

@@ -0,0 +1,6 @@
+var TicketBooking = function TicketBooking() {
+  return /*#__PURE__*/React.createElement("div", {
+    className: ""
+  });
+};
+export default TicketBooking;

package/es/components/wallet/Detail/index.js

@@ -227,7 +227,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     var absAmount = amount.startsWith('-') ? amount.substring(1) : amount;
 
     // 根据isNegative参数决定是否添加负号
-    return isNegative ? "-".concat(tag !== 'point_card' ? symbol : '').concat(absAmount) : "".concat(tag !== 'point_card' ? symbol : '').concat(amount);
+    return isNegative ? "-".concat(!['point_card', 'good_pass'].includes(tag) ? symbol : '').concat(absAmount) : "".concat(!['point_card', 'good_pass'].includes(tag) ? symbol : '').concat(amount);
   };
   var getDetail = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {

package/es/components/wallet/components/WalletCard.js

@@ -65,7 +65,7 @@ var WalletCard = function WalletCard(_ref) {
     propStyle: {
       marginBottom: 16
     },
-    showBalanceSymbol: tag !== 'point_card',
+    showBalanceSymbol: !['point_card', 'good_pass'].includes(tag),
     active: isActive,
     name: product_title,
     qrCode: code,

package/es/components/wallet/hooks/useWalletCard.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/es/hooks/useComponents.js

@@ -8,7 +8,7 @@ var useComponents = function useComponents(params) {
     var _utils$getComponents;
     var _ref = appHelper || {},
       utils = _ref.utils;
-    return (utils === null || utils === void 0 || (_utils$getComponents = utils.getComponents) === null || _utils$getComponents === void 0 ? void 0 : _utils$getComponents.call(utils, components)) || [];
+    return (utils === null || utils === void 0 ? void 0 : (_utils$getComponents = utils.getComponents) === null || _utils$getComponents === void 0 ? void 0 : _utils$getComponents.call(utils, components)) || [];
   }, [components]);
   return Cpt;
 };

package/es/index.js

@@ -43,5 +43,4 @@ export { default as EventScheduleCalendar } from "./components/eventBooking/comp
 export { default as EventBookingDetailModal } from "./components/eventBooking/components/bookingDetailModal";
 export { default as EventProgressBar } from "./components/eventBooking/components/progressBar";
 export { default as ShoppingCart } from "./components/shoppingCart";
-export { default as AppointmentBooking } from "./components/appointmentBooking";
-export { default as AppointmentDeposit } from "./components/appointmentBooking/deposit";
+export { default as AppointmentBooking } from "./components/appointmentBooking";

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/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

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

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

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

@@ -54,12 +54,7 @@ var ContinueButton = () => {
     carts,
     appointmentBooking,
     resourceOtherParams,
-    summary,
-    isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy,
-    resources,
-    currentResource,
-    setCurrentResource
+    summary
   } = (0, import_context.useAppointmentBookingContext)();
   const {
     getResourceTimeSlot,
@@ -67,7 +62,7 @@ var ContinueButton = () => {
     autoSelectAllProductResources
   } = (0, import_hooks.useAppointmentBookingResource)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
-  const { getStepIndex, stepList } = (0, import_hooks.useAppointmentBookingStep)();
+  const { getStepIndex } = (0, import_hooks.useAppointmentBookingStep)();
   const disabled = (0, import_react.useMemo)(() => {
     if (!carts.length) return true;
     return false;
@@ -77,42 +72,31 @@ 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;
+    var _a2, _b;
     if (isLastStep) {
-      const { deposit } = summary;
       setLoading(true);
       try {
-        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) {
+        const res = await appointmentBooking.submitOrder();
+        if ((summary == null ? void 0 : summary.total) > 0) {
           utils.action({
             type: "pisell1.payment",
-            data
+            data: res == null ? void 0 : res.data
           });
         } else {
-          if (deposit == null ? void 0 : deposit.hasDeposit) {
-            return goPaymentFinish(order_id, _total);
-          }
+          const { order_id, total_amount } = (res == null ? void 0 : res.data) || {};
           const freeResult = await appointmentBooking.getFreeProduct(order_id);
           console.log(freeResult, "freeResult");
           if (freeResult == null ? void 0 : freeResult.status) {
-            goPaymentFinish(order_id, total_amount);
+            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);
           } else {
             (0, import_materials.PisellToast)({
               content: freeResult == null ? void 0 : freeResult.message
@@ -126,26 +110,21 @@ var ContinueButton = () => {
       }
       return;
     }
-    if (((_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key) === "select-resource") {
+    if (((_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) === "select-resource") {
       getResourceTimeSlot();
     }
     return appointmentBooking.next();
   };
   const handleContinue = async () => {
-    var _a2, _b;
+    var _a2;
     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, _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")) || {});
+            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")) || {});
             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") {
@@ -166,26 +145,11 @@ var ContinueButton = () => {
         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");
-      }
+    if (key === "select-resource" && (0, import_utils2.isEmptyCartsResourceId)(carts)) {
+      (0, import_materials.PisellToast)({
+        content: import_utils.locales.getText("pisell2.appointment.no.available.time")
+      });
+      return;
     }
     handleNextStep();
   };

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

@@ -40,41 +40,34 @@ 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, deposit } = summary;
+  const { taxTitle, totalTaxFee, isPriceIncludeTax, total } = summary;
   console.log(summary, "summarysummary");
-  return /* @__PURE__ */ import_react.default.createElement(
+  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(
     "div",
     {
-      className: `appointment-total-wrap ${className} ${(deposit == null ? void 0 : deposit.hasDeposit) ? "appointment-total-deposit-wrap" : ""}`
+      className: (0, import_classnames.default)("event-total", {
+        [["total-gst-wrap"]]: !isPriceIncludeTax && Number(totalTaxFee) > 0
+      })
     },
-    !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",
+    /* @__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,
       {
-        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
-    )
-  );
+        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.js

@@ -42,10 +42,9 @@ 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 = () => {
+var CartItem = ({ onConfirm }) => {
   var _a, _b, _c, _d;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
@@ -54,30 +53,21 @@ var CartItem = () => {
     currentStep,
     resources,
     setResourceOtherParams,
-    resourceOtherParams,
-    summary
+    resourceOtherParams
   } = (0, import_context.useAppointmentBookingContext)();
-  const { accountLists, getHolders } = (0, import_hooks2.useAppointmentBookingAccount)();
+  const { accountLists } = (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, isFormSubject]);
+  }, [accountLists]);
   const holders = (0, import_react.useMemo)(() => {
-    if (isFormSubject) return [];
     return (0, import_utils2.formatHolder)(accountLists);
-  }, [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"));
-  }, []);
+  }, [accountLists]);
+  const hasGoodPassApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "goodpass"));
+  console.log("has goodpass app:", hasGoodPassApp);
   const handleClickCard = (e, type, val) => {
     if (type === "note") {
       return appointmentBooking.updateCart({
@@ -96,19 +86,12 @@ var CartItem = () => {
         ...resourceOtherParams,
         errorList: null
       });
-      appointmentBooking.updateCart({
+      return 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",
     {
@@ -118,16 +101,13 @@ var CartItem = () => {
       import_shoppingCart.default,
       {
         productParams: {
-          products: (0, import_utils2.formatCarts)(carts, resources, accountLists),
+          products: (0, import_utils2.formatCarts)(carts, resources),
           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,
-          isShowChangeHolder: isFormSubject && isLogin,
-          isShowHolder: isFormSubject,
-          isShowAddHolderButton: true
+          isShowPackageNote: false
         },
         collapseParams: {
           activeKey: holderIds,
@@ -140,7 +120,7 @@ var CartItem = () => {
         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), (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))
+    /* @__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))
   ));
 };
 var Item_default = CartItem;

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

@@ -74,32 +74,26 @@
   }
 }
 
-.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;
-  overflow: hidden;
+  position: relative;
+  height: 100%;
 
   .content {
     flex: 1;
     overflow-y: auto;
-    padding: 16px 16px 0;
+    padding: 0 0 210px;
+    max-height: 100%;
   }
-
   .appointment-footer {
-    background: #fff;
+    z-index: 10;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
     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: 0
+        padding: "20px"
       },
       destroyOnClose: true,
       className: `appointment-cart-modal`,
       footer: null,
       forceRender: true
     },
-    /* @__PURE__ */ import_react.default.createElement(import_Item.default, null)
+    /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflowY: "auto" } }, /* @__PURE__ */ import_react.default.createElement(import_Item.default, null))
   );
 };
 var Cart_default = Cart;

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

@@ -42,30 +42,15 @@ 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, _d;
+  var _a, _b, _c;
   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,
@@ -90,11 +75,7 @@ var Layout = () => {
       // 选择资源
       "select-resource": import_Resource.default,
       // 时间切片
-      "select-time": import_TimeSlicing.default,
-      // 填写表单
-      "fill-form": import_Form.default,
-      // 确认信息
-      "confirm-information": import_ConfirmInformation.default
+      "select-time": import_TimeSlicing.default
     };
     let Com2 = components[key];
     return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params });
@@ -117,22 +98,13 @@ 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),
-    isShowCartCom
+    !(0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement("div", { className: "parallel-content-right" }, /* @__PURE__ */ import_react.default.createElement(import_Item.default, null)) : null
   ), (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Footer.default, null) : null);
 };
 var Content_default = Layout;