@pisell/private-materials 6.3.131 → 6.3.132

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

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

@@ -245,4 +245,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -166,10 +166,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/ecocup/components/CupStatusModal/hooks.d.ts

@@ -8,7 +8,7 @@ export declare const useCupAction: () => {
  * @return {*}
  */
 export declare const useBatchCupAction: () => {
-    run: (this: unknown, eco_cup_ids: string[] | number[]) => Promise<boolean>;
+    run: (this: unknown, eco_cup_ids: number[] | string[]) => Promise<boolean>;
     loading: boolean;
 };
 /**

package/es/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "payo" | "windcave" | "stripe" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -176,7 +176,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "warn" | "success" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -197,7 +197,7 @@ export declare const updateComponent: (component: string, render?: boolean) => {
     } | {
         readonly type: "step";
         readonly render: boolean;
-        readonly component?: undefined;
+        component?: undefined;
     };
 };
 /**
@@ -297,9 +297,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "payo" | "windcave" | "stripe" | "linkly" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -310,7 +310,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/eftposPay/tyro/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => import("react").JSX.Element;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/shoppingCart/components/Empty/index.d.ts

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

package/es/components/venueBooking/components/Cart/index.js

@@ -67,20 +67,20 @@ export default function Cart(props) {
 
   // 从 summary 中提取总金额（兼容多种字段名）
   var totalAmount = (_ref = (_ref2 = (_ref3 = (_summary$total_amount = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount !== void 0 ? _summary$total_amount : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref3 !== void 0 ? _ref3 : summary === null || summary === void 0 ? void 0 : summary.amount) !== null && _ref2 !== void 0 ? _ref2 : summary === null || summary === void 0 ? void 0 : summary.total) !== null && _ref !== void 0 ? _ref : '0.00';
+
+  // VenueBooking 场景下不展示 ProductCard 的 like（心形）图标，
+  // 通过在 item 层注入 is_hide_like 覆盖 Time 组件的渲染条件
   var cartProducts = useMemo(function () {
     return (items || []).map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
-        symbol: (item === null || item === void 0 ? void 0 : item.symbol) || symbol
+        symbol: (item === null || item === void 0 ? void 0 : item.symbol) || symbol,
+        is_hide_like: true
       });
     });
   }, [items, symbol]);
 
-  // 根据当前步骤动态选择按钮文案
-  var confirmOrderText = function () {
-    if (currentStep === 'select-venue') return String(locales.getText('pisell2.venue.action.next.addons') || '下一步：附加项');
-    if (currentStep === 'addons') return String(locales.getText('pisell2.venue.action.review.pay') || '确认 & 支付');
-    return String(locales.getText('pisell2.venue.action.pay.now') || '立即支付');
-  }();
+  // 按钮文案：最后一步显示"立即支付"，其余步骤统一显示"下一步"
+  var confirmOrderText = currentStep === 'checkout' ? String(locales.getText('pisell2.venue.action.pay.now') || '立即支付') : String(locales.getText('pisell2.venue.action.next') || '下一步');
 
   /**
    * SubTotal 金额明细列表

package/es/components/venueBooking/components/Checkout/index.js

@@ -43,10 +43,6 @@ export default function Checkout() {
     var _ref, _viewModel$summary$to, _viewModel$summary2, _viewModel$summary3;
     return Number((_ref = (_viewModel$summary$to = (_viewModel$summary2 = viewModel.summary) === null || _viewModel$summary2 === void 0 ? void 0 : _viewModel$summary2.total_amount) !== null && _viewModel$summary$to !== void 0 ? _viewModel$summary$to : (_viewModel$summary3 = viewModel.summary) === null || _viewModel$summary3 === void 0 ? void 0 : _viewModel$summary3.expect_amount) !== null && _ref !== void 0 ? _ref : 0);
   }, [viewModel.summary]);
-  var taxFee = useMemo(function () {
-    var _viewModel$summary$ta, _viewModel$summary4;
-    return Number((_viewModel$summary$ta = (_viewModel$summary4 = viewModel.summary) === null || _viewModel$summary4 === void 0 ? void 0 : _viewModel$summary4.tax_fee) !== null && _viewModel$summary$ta !== void 0 ? _viewModel$summary$ta : 0);
-  }, [viewModel.summary]);
 
   // 场地预订商品：带有时段信息（start_date / end_date）
   var venueCartItems = useMemo(function () {
@@ -186,18 +182,12 @@ export default function Checkout() {
   })), /*#__PURE__*/React.createElement("div", {
     className: "mt-2 text-[15px] text-zinc-500"
   }, locales.getText('pisell2.venue.checkout.addons.total') || '附加项合计', ": ", symbol, addonTotal.toFixed(2))) : null, /*#__PURE__*/React.createElement("div", {
-    className: "rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6"
+    className: "rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6 md:col-span-2"
   }, /*#__PURE__*/React.createElement("div", {
     className: "text-sm font-semibold text-[#a69183]"
   }, locales.getText('pisell2.venue.checkout.subtotal') || '预订小计'), /*#__PURE__*/React.createElement("div", {
     className: "mt-3 text-[30px] font-extrabold text-zinc-900"
-  }, symbol, Number.isNaN(bookingSubtotal) ? '0.00' : bookingSubtotal.toFixed(2))), taxFee > 0 ? /*#__PURE__*/React.createElement("div", {
-    className: "rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "text-sm font-semibold text-[#a69183]"
-  }, locales.getText('pisell2.venue.checkout.tax') || '税费'), /*#__PURE__*/React.createElement("div", {
-    className: "mt-3 text-[15px] font-semibold text-zinc-900"
-  }, symbol, Number.isNaN(taxFee) ? '0.00' : taxFee.toFixed(2))) : null)), /*#__PURE__*/React.createElement("div", {
+  }, symbol, Number.isNaN(bookingSubtotal) ? '0.00' : bookingSubtotal.toFixed(2))))), /*#__PURE__*/React.createElement("div", {
     className: "space-y-4"
   }, /*#__PURE__*/React.createElement("div", {
     className: "rounded-[28px] bg-white p-5 shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6 md:p-6"

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

@@ -27,8 +27,8 @@ export default function Content() {
 
   /**
    * 动态测量 Step Header 高度并写入 --vb-grid-sticky-top。
-   * 供 TimeGrid 的 sticky 表头作为 top 偏移，避免被 Step Header 覆盖。
-   * 宽屏下 Step Header 为 lg:static 不占据吸顶位置，此时写 0。
+   * 供 TimeGrid sticky 表头作为 top 偏移，以及 Cart 侧栏 sticky top 计算使用，
+   * 保证三者不互相覆盖。
    */
   useEffect(function () {
     var wrap = stepHeaderRef.current;
@@ -37,9 +37,7 @@ export default function Content() {
     if (!scope) return undefined;
     function update() {
       if (!wrap) return;
-      var isSticky = typeof window !== 'undefined' && window.getComputedStyle(wrap).position === 'sticky';
-      var value = isSticky ? "".concat(wrap.offsetHeight, "px") : '0px';
-      scope === null || scope === void 0 || scope.style.setProperty('--vb-grid-sticky-top', value);
+      scope === null || scope === void 0 || scope.style.setProperty('--vb-grid-sticky-top', "".concat(wrap.offsetHeight, "px"));
     }
     update();
     var ro = typeof ResizeObserver !== 'undefined' ? new ResizeObserver(update) : null;
@@ -59,13 +57,16 @@ export default function Content() {
     }
   }, /*#__PURE__*/React.createElement("div", {
     ref: stepHeaderRef,
-    className: "sticky top-0 z-30 lg:static lg:z-auto"
+    className: "sticky top-0 z-40"
   }, /*#__PURE__*/React.createElement(Header, null)), /*#__PURE__*/React.createElement("div", {
     className: "grid max-w-full gap-2 md:gap-4 lg:grid-cols-[minmax(0,1fr)_390px] xl:grid-cols-[minmax(0,1fr)_420px]"
   }, /*#__PURE__*/React.createElement("section", {
     className: "min-w-0 space-y-3 overscroll-none md:space-y-5"
   }, stepRegistry[currentStep]), /*#__PURE__*/React.createElement("aside", {
-    className: "hidden lg:block sticky top-6 self-start rounded-[28px] bg-white shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6"
+    className: "hidden lg:block sticky self-start z-10 rounded-[28px] bg-white shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6",
+    style: {
+      top: 'calc(var(--vb-grid-sticky-top, 0px) + 1.5rem)'
+    }
   }, /*#__PURE__*/React.createElement(Cart, {
     embedded: true,
     open: true,

package/es/components/venueBooking/components/Footer/index.js

@@ -41,15 +41,9 @@ export default function Footer() {
     return parsedAmount.toFixed(2);
   }, [viewModel.summary]);
 
-  /** 操作按钮文案（根据当前步骤动态变化） */
+  /** 操作按钮文案：最后一步显示"立即支付"，其余步骤统一显示"下一步" */
   var actionText = useMemo(function () {
-    if (currentStep === 'select-venue') {
-      return String(locales.getText('pisell2.venue.action.next.addons') || '下一步：附加项');
-    }
-    if (currentStep === 'addons') {
-      return String(locales.getText('pisell2.venue.action.review.pay') || '确认 & 支付');
-    }
-    return String(locales.getText('pisell2.venue.action.pay.now') || '立即支付');
+    return currentStep === 'checkout' ? String(locales.getText('pisell2.venue.action.pay.now') || '立即支付') : String(locales.getText('pisell2.venue.action.next') || '下一步');
   }, [currentStep]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-venue-booking-footer"

package/es/components/venueBooking/components/Header/index.js

@@ -1,3 +1,13 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -8,27 +18,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * venueBooking 步骤导航头部
  * 展示三步流程进度条（选场地 → 附加商品 → 结账），支持点击跳转已完成步骤
  */
-import React, { useRef, useState } from 'react';
+import React, { useMemo, useRef, useState } from 'react';
 import { Modal } from 'antd';
 import { locales } from '@pisell/utils';
 import { Iconfont } from '@pisell/materials';
 import { useVenueBookingContext } from "../../context";
-
-/** 步骤配置：序号、路由 key、国际化标题 key */
-var STEP_ITEMS = [{
-  n: 1,
-  key: 'select-venue',
-  titleKey: 'pisell2.venue.step.select'
-}, {
-  n: 2,
-  key: 'addons',
-  titleKey: 'pisell2.venue.step.addons'
-}, {
-  n: 3,
-  key: 'checkout',
-  titleKey: 'pisell2.venue.step.checkout'
-}];
 export default function Header() {
+  var _viewModel$addonProdu2;
   var _useVenueBookingConte = useVenueBookingContext(),
     currentStep = _useVenueBookingConte.currentStep,
     canNext = _useVenueBookingConte.canNext,
@@ -44,6 +40,31 @@ export default function Header() {
     confirmOpen = _useState4[0],
     setConfirmOpen = _useState4[1];
   var cardRef = useRef(null);
+
+  /**
+   * 步骤配置：当 addonProductList 为空时跳过 addons 步骤，自动重排序号。
+   * - 有附加商品：select-venue → addons → checkout（3 步）
+   * - 无附加商品：select-venue → checkout（2 步）
+   */
+  var STEP_ITEMS = useMemo(function () {
+    var _viewModel$addonProdu;
+    var hasAddons = (((_viewModel$addonProdu = viewModel.addonProductList) === null || _viewModel$addonProdu === void 0 ? void 0 : _viewModel$addonProdu.length) || 0) > 0;
+    var base = [{
+      key: 'select-venue',
+      titleKey: 'pisell2.venue.step.select'
+    }].concat(_toConsumableArray(hasAddons ? [{
+      key: 'addons',
+      titleKey: 'pisell2.venue.step.addons'
+    }] : []), [{
+      key: 'checkout',
+      titleKey: 'pisell2.venue.step.checkout'
+    }]);
+    return base.map(function (item, idx) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        n: idx + 1
+      });
+    });
+  }, [(_viewModel$addonProdu2 = viewModel.addonProductList) === null || _viewModel$addonProdu2 === void 0 ? void 0 : _viewModel$addonProdu2.length]);
   var currentStepIndex = STEP_ITEMS.findIndex(function (item) {
     return item.key === currentStep;
   });

package/es/components/venueBooking/components/VenueSelection/components/TimeGrid.js

@@ -18,7 +18,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 import React, { useEffect, useMemo, useRef, useCallback } from 'react';
 import { Iconfont, PisellText } from '@pisell/materials';
-import { locales } from '@pisell/utils';
+import { locales, isIos } from '@pisell/utils';
 import { useVenueBookingContext } from "../../../context";
 import { isSlotSelected as checkSlotSelected, useVenueBookingSymbol } from "../../../hooks";
 import { formatHourHeader, isHourBoundary, buildHourGroups, buildSlotPriceInfo, getPriceColor, getSlotTag, getColumnTag, getTimeMetaFromGrid, getResourceCourtMeta, getTableGridStyle, getFirstAvailableSlotIndex, FIRST_COLUMN_WIDTH } from "../../../utils";
@@ -40,6 +40,23 @@ export default function TimeGrid() {
   var tableGridStyle = useMemo(function () {
     return getTableGridStyle(timeLabels.length);
   }, [timeLabels.length]);
+
+  /**
+   * iOS 需要 overscroll-behavior: none 阻止 body 橡皮筋回弹导致的异常；
+   * 桌面端保留 Y 方向的 scroll chaining，使鼠标悬停在此区域时仍能上下滚页面。
+   */
+  var isIosDevice = useMemo(function () {
+    if (typeof navigator === 'undefined') return false;
+    return isIos();
+  }, []);
+  var scrollerOverscrollStyle = useMemo(function () {
+    return isIosDevice ? {
+      overscrollBehavior: 'none'
+    } : {
+      overscrollBehaviorX: 'none',
+      overscrollBehaviorY: 'auto'
+    };
+  }, [isIosDevice]);
   var visibleResources = useMemo(function () {
     return resources.filter(function (resource) {
       var hitType = filter === 'ALL' || resource.productTitle === filter;
@@ -80,8 +97,11 @@ export default function TimeGrid() {
     applyHeaderTransform(e.currentTarget.scrollLeft);
   }
 
-  // 切换日期时自动滚动到第一个可用时段（留 1 格前置空间便于用户感知上下文）
+  // 切换日期/首次加载完成时自动滚动到第一个可用时段（留 1 格前置空间便于用户感知上下文）。
+  // 依赖 isGridLoading：骨架屏阶段真实 table DOM 卸载，ref 为 null；
+  // 骨架屏结束时重新触发，此时新 DOM 已挂载且布局完成，scrollWidth 可靠。
   useEffect(function () {
+    if (isGridLoading) return;
     var scroller = scrollTableRef.current;
     if (!scroller || !timeLabels.length || !grid) return;
     var firstAvailableIndex = getFirstAvailableSlotIndex(grid);
@@ -100,7 +120,7 @@ export default function TimeGrid() {
     });
     // smooth 滚动不会立即触发 onScroll 到目标值，先手动同步一次避免首帧错位
     applyHeaderTransform(targetLeft);
-  }, [grid === null || grid === void 0 ? void 0 : grid.date, timeLabels.length, applyHeaderTransform]);
+  }, [grid === null || grid === void 0 ? void 0 : grid.date, timeLabels.length, isGridLoading, applyHeaderTransform]);
 
   // 横向拖拽滚动
   useEffect(function () {
@@ -161,6 +181,31 @@ export default function TimeGrid() {
       scroller.removeEventListener('pointercancel', endDrag);
     };
   }, [applyHeaderTransform]);
+
+  // overflow-x: auto 会使该容器成为滚动容器，浏览器默认将 wheel 事件优先交给它处理，
+  // 导致纵向滚动被静默吞掉、页面无法上下滚动。
+  // 此处拦截纵向主导的 wheel 事件，转发给 window，还原正常的页面滚动体验。
+  useEffect(function () {
+    var scroller = scrollTableRef.current;
+    if (!scroller) return undefined;
+    function onWheel(e) {
+      // 仅纵向滚动意图（deltaY 占主导）才转发给页面；
+      // 横向滚动（含 shift+scroll）不干预，由 overflow-x: auto 正常处理。
+      if (Math.abs(e.deltaY) > Math.abs(e.deltaX)) {
+        e.preventDefault();
+        window.scrollBy({
+          top: e.deltaY,
+          behavior: 'instant'
+        });
+      }
+    }
+    scroller.addEventListener('wheel', onWheel, {
+      passive: false
+    });
+    return function () {
+      return scroller.removeEventListener('wheel', onWheel);
+    };
+  }, []);
   function handleSlotClick(resourceId, slot) {
     if (dragStateRef.current.moved) {
       dragStateRef.current.moved = false;
@@ -236,11 +281,10 @@ export default function TimeGrid() {
   }))), /*#__PURE__*/React.createElement("div", {
     ref: scrollTableRef,
     onScroll: syncHeader,
-    className: "max-w-full overflow-x-auto cursor-grab select-none touch-pan-y overscroll-none active:cursor-grabbing",
-    style: {
-      WebkitOverflowScrolling: 'touch',
-      overscrollBehaviorX: 'none'
-    }
+    className: "max-w-full overflow-x-auto cursor-grab select-none touch-pan-y active:cursor-grabbing",
+    style: _objectSpread({
+      WebkitOverflowScrolling: 'touch'
+    }, scrollerOverscrollStyle)
   }, /*#__PURE__*/React.createElement("div", {
     className: "w-full",
     key: grid.date

package/es/components/venueBooking/components/VenueSelection/index.js

@@ -69,10 +69,6 @@ export default function VenueSelection() {
     onNextWeek: goNextWeek
   })), /*#__PURE__*/React.createElement(CourtFilter, null)), /*#__PURE__*/React.createElement("div", {
     ref: tableSectionRef,
-    className: "w-full max-w-full isolate rounded-[28px] bg-white shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6",
-    style: {
-      overflowX: 'clip',
-      overflowY: 'visible'
-    }
+    className: "w-full max-w-full isolate rounded-[28px] bg-white shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6"
   }, /*#__PURE__*/React.createElement(TimeGrid, null)));
 }

package/es/components/venueBooking/context.js

@@ -7,10 +7,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -27,7 +23,7 @@ import { message } from 'antd';
 import { locales } from '@pisell/utils';
 import { usePisellOS } from "../../hooks/useEngineContext";
 import useEngineContext from "../../hooks/useEngineContext";
-import { VENUE_BOOKING_STEPS, VENUE_PRODUCT_IDS, useVenueBookingModule, useVenueBookingLogin, safeRunModuleAction, createVenueBookingViewModel, loadVenueProducts, fetchResourceAvailability, getDateRangeSummary, getTimeSlotGrid, toggleSlotAction, getAllSelectedSlots, getOtherParams } from "./hooks";
+import { VENUE_PRODUCT_IDS, useVenueBookingModule, useVenueBookingLogin, safeRunModuleAction, createVenueBookingViewModel, loadVenueProducts, fetchResourceAvailability, getDateRangeSummary, getTimeSlotGrid, toggleSlotAction, getAllSelectedSlots, getOtherParams } from "./hooks";
 import { formatDateKey, getWeekDays } from "./utils";
 var VenueBookingContext = /*#__PURE__*/createContext(undefined);
 
@@ -43,6 +39,13 @@ var INITIAL_VIEW_MODEL = {
   addonProductList: []
 };
 
+/**
+ * 宿主 engineContext.appHelper.utils 缺失时的稳定兜底对象。
+ * 必须为模块级常量，避免在 Provider 内用 `|| {}` 字面量导致每次 render 产生新引用，
+ * 进而让依赖它的 useCallback / useEffect 反复失效，拖入重渲染循环。
+ */
+var EMPTY_UTILS = {};
+
 /**
  * 计算 anchorDate 所在周的起止日期
  */
@@ -94,7 +97,7 @@ function findNearestAvailableDate(params) {
  * 管理步骤导航、场地选择状态、OS 模块集成
  */
 export function VenueBookingProvider(_ref) {
-  var _engineContext$appHel, _viewModel$summary2;
+  var _viewModel$addonProdu2, _engineContext$appHel, _viewModel$summary2;
   var entryContext = _ref.entryContext,
     children = _ref.children;
   var pisellOS = usePisellOS();
@@ -105,7 +108,6 @@ export function VenueBookingProvider(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     currentStep = _useState2[0],
     setCurrentStep = _useState2[1];
-  var stepList = _toConsumableArray(VENUE_BOOKING_STEPS);
 
   // ── 视图模型 ──
   var _useState3 = useState(INITIAL_VIEW_MODEL),
@@ -113,6 +115,17 @@ export function VenueBookingProvider(_ref) {
     viewModel = _useState4[0],
     setViewModel = _useState4[1];
 
+  /**
+   * 步骤列表：当 addonProductList 为空时跳过 addons 步骤。
+   * - 有附加商品：select-venue → addons → checkout（3 步）
+   * - 无附加商品：select-venue → checkout（2 步）
+   */
+  var stepList = useMemo(function () {
+    var _viewModel$addonProdu;
+    var hasAddons = (((_viewModel$addonProdu = viewModel.addonProductList) === null || _viewModel$addonProdu === void 0 ? void 0 : _viewModel$addonProdu.length) || 0) > 0;
+    return hasAddons ? ['select-venue', 'addons', 'checkout'] : ['select-venue', 'checkout'];
+  }, [(_viewModel$addonProdu2 = viewModel.addonProductList) === null || _viewModel$addonProdu2 === void 0 ? void 0 : _viewModel$addonProdu2.length]);
+
   // ── 加载状态 ──
   var _useState5 = useState(true),
     _useState6 = _slicedToArray(_useState5, 2),
@@ -165,7 +178,7 @@ export function VenueBookingProvider(_ref) {
     isLogin = _useVenueBookingLogin.isLogin,
     openLoginModal = _useVenueBookingLogin.openLoginModal;
   var engineContext = useEngineContext();
-  var utils = (engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.utils) || {};
+  var utils = (engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.utils) || EMPTY_UTILS;
 
   // ── 折扣/优惠券状态 ──
   var _useState25 = useState([]),
@@ -734,7 +747,24 @@ export function VenueBookingProvider(_ref) {
     }, _callee10);
   })), [isLogin, openLoginModal, handleLoginSuccess, submitOrder]);
 
-  /** 主操作按钮行为（含登录门禁） */
+  /** 跳转到 checkout，并在未登录时插入登录门禁（参照 scanOrder gotoCheckOrder） */
+  var proceedToCheckout = useCallback(function () {
+    if (!isLogin) {
+      openLoginModal({
+        callback: function callback(status) {
+          if (status === 'success') {
+            handleLoginSuccess().then(function () {
+              return goToStep('checkout');
+            });
+          }
+        }
+      });
+      return;
+    }
+    goToStep('checkout');
+  }, [isLogin, openLoginModal, handleLoginSuccess, goToStep]);
+
+  /** 主操作按钮行为（含登录门禁，自适应 2/3 步流程） */
   var handlePrimaryAction = useCallback(function () {
     var _viewModel$summary3, _deposit$deposit_poli;
     if (currentStep === 'select-venue') {
@@ -745,24 +775,16 @@ export function VenueBookingProvider(_ref) {
         });
         return;
       }
+      // 2 步模式：select-venue 直接进 checkout（带登录门禁）；3 步模式：先去 addons
+      if (stepList[1] === 'checkout') {
+        proceedToCheckout();
+        return;
+      }
       goToStep('addons');
       return;
     }
-    // addons -> checkout：插入登录门禁（参照 scanOrder gotoCheckOrder）
     if (currentStep === 'addons') {
-      if (!isLogin) {
-        openLoginModal({
-          callback: function callback(status) {
-            if (status === 'success') {
-              handleLoginSuccess().then(function () {
-                return goToStep('checkout');
-              });
-            }
-          }
-        });
-        return;
-      }
-      goToStep('checkout');
+      proceedToCheckout();
       return;
     }
     // checkout -> 支付：有定金协议时必须已勾选，否则 Toast 提示
@@ -772,7 +794,7 @@ export function VenueBookingProvider(_ref) {
       return;
     }
     void handleSubmitOrder();
-  }, [currentStep, canNext, isLogin, isAgreeDepositPolicy, viewModel.summary, goToStep, openLoginModal, handleLoginSuccess, handleSubmitOrder]);
+  }, [currentStep, canNext, isAgreeDepositPolicy, viewModel.summary, stepList, proceedToCheckout, goToStep, handleSubmitOrder]);
 
   // ── 监听全局登录成功事件（Voucher 区域内登录等场景） ──
   useEffect(function () {

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

@@ -5,6 +5,7 @@ export declare const VENUE_BOOKING_STEPS: readonly ["select-venue", "addons", "c
 export declare const VENUE_PRODUCT_IDS: number[];
 /**
  * 获取 PisellOS venueBooking 业务模块
+ * 使用 useRef 稳定模块引用，防止 getModule 返回值每次渲染变化时触发 bootstrap useEffect 重跑
  */
 export declare function useVenueBookingModule(): any;
 /** 统一获取货币前缀（优先引擎配置，兜底 '$'） */