@pisell/private-materials 6.3.131 → 6.3.133

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/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/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;
@@ -51,7 +49,7 @@ export default function Content() {
     };
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("style", null, "\n        @keyframes slideLeft { from { opacity: 0; transform: translateX(34px); } to { opacity: 1; transform: translateX(0); } }\n        @keyframes slideRight { from { opacity: 0; transform: translateX(-34px); } to { opacity: 1; transform: translateX(0); } }\n        @keyframes fadeIn { from { opacity: 0; transform: translateY(6px); } to { opacity: 1; transform: translateY(0); } }\n        /* \u9AA8\u67B6\u5C4F\u5149\u6761\uFF1A\u4ECE\u5DE6\u5230\u53F3\u626B\u8FC7\u8425\u9020\u6570\u636E\u52A0\u8F7D\u611F */\n        @keyframes vbShimmer { 0% { transform: translateX(-100%); } 100% { transform: translateX(100%); } }\n        .vb-skeleton-shimmer {\n          position: absolute;\n          inset: 0;\n          background: linear-gradient(90deg, transparent 0%, rgba(255, 255, 255, 0.6) 50%, transparent 100%);\n          animation: vbShimmer 1.4s ease-in-out infinite;\n          pointer-events: none;\n        }\n\n        /* \u4F5C\u7528\u57DF reset\uFF1A\u4FEE\u590D\u5BBF\u4E3B\u73AF\u5883 preflight: false \u5BFC\u81F4\u6D4F\u89C8\u5668\u9ED8\u8BA4\u6837\u5F0F\u6CC4\u5165 */\n        .venue-booking-scope *,\n        .venue-booking-scope *::before,\n        .venue-booking-scope *::after {\n          box-sizing: border-box;\n        }\n        .venue-booking-scope {\n          --vb-primary: var(--theme-color, #ea1018);\n          --vb-primary-light: color-mix(in srgb, var(--vb-primary) 12%, #fff);\n          --vb-grid-sticky-top: 0px;\n          font-size: 16px;\n          line-height: 1.5;\n        }\n        .venue-booking-scope .vb-primary-text { color: var(--vb-primary); }\n        .venue-booking-scope button {\n          border: none;\n          outline: none;\n          background: transparent;\n          font: inherit;\n          color: inherit;\n          padding: 0;\n          cursor: pointer;\n        }\n        /* \u4EC5\u91CD\u7F6E\u65E0 class \u7684\u539F\u751F\u8F93\u5165\u6846\uFF0C\u907F\u514D\u8986\u76D6 Tailwind \u7EC4\u4EF6\u663E\u5F0F\u8FB9\u6846 */\n        .venue-booking-scope input:not([class]),\n        .venue-booking-scope textarea:not([class]) {\n          border: none;\n          outline: none;\n          font: inherit;\n          color: inherit;\n        }\n\n        /* \u8D2D\u7269\u8F66\u5185 Promotion \u533A\u5757\uFF1A\u7F29\u5C0F\u6807\u9898\u5B57\u53F7\uFF0C\u4E0E SubTotal \u7EDF\u4E00\u4E3A 16px */\n        .venue-booking-scope .pisell-lowcode__appointment-booking-voucher-container .voucher-title .voucher-title-left {\n          font-size: 16px;\n          font-weight: 600;\n          line-height: 24px;\n        }\n        .venue-booking-scope .pisell-lowcode__appointment-booking-voucher-container .voucher-title .voucher-title-right {\n          font-size: 14px;\n          font-weight: 500;\n        }\n\n        /* \u684C\u9762\u7AEF embedded-footer \u7C98\u5728\u4FA7\u8FB9\u680F\u5E95\u90E8 */\n        .venue-booking-scope .pisell-venue-booking-cart-embedded-footer {\n          position: sticky;\n          bottom: 0;\n          z-index: 5;\n          background: #fff;\n          border-radius: 0 0 28px 28px;\n        }\n      "), /*#__PURE__*/React.createElement("main", {
-    className: "mx-auto max-w-[1500px] px-3 pt-3 md:px-6 md:pt-6 lg:pb-12 h-full overscroll-none"
+    className: "mx-auto max-w-[1500px] md:px-6 md:pt-6 lg:pb-12 h-full overscroll-none"
   }, /*#__PURE__*/React.createElement("div", {
     className: "space-y-2 md:space-y-4",
     style: {
@@ -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,
@@ -75,6 +76,6 @@ export default function Content() {
     onNext: handlePrimaryAction,
     confirmLoading: isSubmittingOrder
   })))), /*#__PURE__*/React.createElement("div", {
-    className: "sticky bottom-0 z-30 block lg:hidden"
+    className: "sticky bottom-0 z-41 block lg:hidden"
   }, /*#__PURE__*/React.createElement(Footer, null))));
 }

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;
   });
@@ -125,7 +146,7 @@ export default function Header() {
   });
   return /*#__PURE__*/React.createElement("div", {
     ref: cardRef,
-    className: "relative rounded-[20px] bg-white p-3 md:rounded-[24px] md:p-4 ring-1 ring-black/6 shadow-[0_10px_30px_rgba(20,20,20,0.04)]"
+    className: "relative bg-white p-3 md:rounded-[24px] md:p-4 ring-1 ring-black/6 shadow-[0_10px_30px_rgba(20,20,20,0.04)]"
   }, /*#__PURE__*/React.createElement(Modal, {
     open: confirmOpen,
     onCancel: function onCancel() {

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

@@ -11,7 +11,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
  */
 import React, { useMemo } from 'react';
 import { locales } from '@pisell/utils';
-import { Iconfont } from '@pisell/materials';
 import { useVenueBookingContext } from "../../../context";
 export default function CourtFilter() {
   var _useVenueBookingConte = useVenueBookingContext(),
@@ -40,22 +39,7 @@ export default function CourtFilter() {
   })));
   return /*#__PURE__*/React.createElement("div", {
     className: "mt-4 grid gap-3 md:mt-5 xl:grid-cols-[1fr_auto] xl:items-center"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "flex items-center gap-3 rounded-[18px] border border-black/8 bg-[#fafafa] px-4 py-3"
-  }, /*#__PURE__*/React.createElement(Iconfont, {
-    type: "pisell2-search-lg",
-    style: {
-      fontSize: 16,
-      color: '#a1a1aa'
-    }
-  }), /*#__PURE__*/React.createElement("input", {
-    value: search,
-    onChange: function onChange(e) {
-      return setSearch(e.target.value);
-    },
-    placeholder: String(locales.getText('pisell2.venue.search.placeholder') || '搜索场地'),
-    className: "w-full border-0 bg-transparent text-sm outline-none placeholder:text-zinc-400"
-  })), courtTypes.length > 1 ? /*#__PURE__*/React.createElement("div", {
+  }, courtTypes.length > 1 ? /*#__PURE__*/React.createElement("div", {
     className: "flex flex-wrap gap-2"
   }, filterOptions.map(function (opt) {
     return /*#__PURE__*/React.createElement("button", {

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;
@@ -232,15 +277,16 @@ export default function TimeGrid() {
       style: {
         color: 'var(--vb-primary)'
       }
-    }, locales.getText('pisell2.venue.label.few.left') || '即将满') : null);
+    }, locales.getText('pisell2.venue.label.few.left') || '即将满') : null, !timeMeta.soldOut && !timeMeta.fewLeft && !headerTag ? /*#__PURE__*/React.createElement("div", {
+      className: "mt-1 text-[10px] font-bold text-zinc-500"
+    }, locales.getText('pisell2.venue.label.bookable') || '充足') : null);
   }))), /*#__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
@@ -251,21 +297,12 @@ export default function TimeGrid() {
       className: "grid border-b border-black/6",
       style: tableGridStyle
     }, /*#__PURE__*/React.createElement("div", {
-      className: "sticky left-0 z-10 border-r border-black/6 px-2 py-4 shadow-[10px_0_16px_-14px_rgba(0,0,0,0.2)] md:px-4 ".concat(courtMeta.soldOut ? 'bg-zinc-50' : 'bg-white')
+      className: "sticky left-0 z-10 border-r border-black/6 px-2 py-2 shadow-[10px_0_16px_-14px_rgba(0,0,0,0.2)] md:px-4 ".concat(courtMeta.soldOut ? 'bg-zinc-50' : 'bg-white')
     }, /*#__PURE__*/React.createElement("div", {
       className: "flex items-start justify-between gap-2"
     }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
       className: "text-[13px] font-extrabold leading-5 md:text-[15px] ".concat(courtMeta.soldOut ? 'text-zinc-400' : 'text-zinc-900')
-    }, resource.resourceName), /*#__PURE__*/React.createElement("div", {
-      className: "mt-1 text-[11px] md:text-xs ".concat(courtMeta.soldOut ? 'text-zinc-400' : 'text-zinc-500')
-    }, resource.productTitle), courtMeta.soldOut ? /*#__PURE__*/React.createElement("div", {
-      className: "mt-1 text-[11px] font-semibold text-zinc-500"
-    }, locales.getText('pisell2.venue.label.sold.out') || '已满') : null, !courtMeta.soldOut && courtMeta.fewLeft ? /*#__PURE__*/React.createElement("div", {
-      className: "mt-1 text-[12px] font-bold",
-      style: {
-        color: 'var(--vb-primary)'
-      }
-    }, locales.getText('pisell2.venue.label.few.left') || '即将满') : null))), resource.slots.map(function (slot, slotIndex) {
+    }, resource.resourceName)))), resource.slots.map(function (slot, slotIndex) {
       var isAvailable = slot.status === 'available';
       // unavailable：该时段不提供服务（如非营业时段）；occupied/past 同样不可选
       var isUnavailable = slot.status === 'occupied' || slot.status === 'past' || slot.status === 'unavailable';
@@ -284,7 +321,7 @@ export default function TimeGrid() {
           return handleSlotClick(resource.resourceId, slot);
         },
         disabled: isUnavailable,
-        className: "px-1 py-3 text-center transition md:px-2 ".concat(isUnavailable ? 'cursor-not-allowed bg-zinc-100 text-zinc-400' : selected ? 'text-white' : 'bg-white hover:bg-[#fff6f6]'),
+        className: "px-1 py-2 text-center transition md:px-2 ".concat(isUnavailable ? 'cursor-not-allowed bg-zinc-100 text-zinc-400' : selected ? 'text-white' : 'bg-white hover:bg-[#fff6f6]'),
         style: _objectSpread({
           borderLeft: isHourBoundary(timeLabel) ? '1px solid rgba(0,0,0,0.08)' : '1px solid rgba(0,0,0,0.03)',
           borderBottom: '1px solid rgba(0,0,0,0.04)'
@@ -296,9 +333,9 @@ export default function TimeGrid() {
       }, /*#__PURE__*/React.createElement("div", {
         className: "text-lg font-bold leading-none"
       }, "\xD7")) : selected ? /*#__PURE__*/React.createElement("div", {
-        className: "space-y-1"
+        className: "space-y-0.5"
       }, /*#__PURE__*/React.createElement("div", {
-        className: "text-[11px] font-bold uppercase tracking-wide text-white/90"
+        className: "text-[11px] font-bold uppercase tracking-wide leading-4 text-white/90"
       }, locales.getText('pisell2.venue.label.selected') || '已选'), /*#__PURE__*/React.createElement(PisellText.Amount, {
         value: Number(slot.price || 0),
         symbol: symbol,
@@ -306,16 +343,16 @@ export default function TimeGrid() {
         showCurrencySymbol: true,
         className: "text-sm font-extrabold text-white"
       })) : /*#__PURE__*/React.createElement("div", {
-        className: "space-y-1"
+        className: "space-y-0.5"
       }, /*#__PURE__*/React.createElement(PisellText.Amount, {
         value: Number(slot.price || 0),
         symbol: symbol,
         precision: 2,
         showCurrencySymbol: true,
         hideDecimalForWholeNumbers: false,
-        className: "text-[13px] font-normal ".concat(priceClass, " md:text-sm")
+        className: "text-[13px] font-normal leading-4 ".concat(priceClass, " md:text-sm")
       }), tag ? /*#__PURE__*/React.createElement("div", {
-        className: "inline-flex rounded-full px-1.5 py-0.5 text-[8px] font-semibold ring-1 md:text-[9px] ".concat(tag.className)
+        className: "inline-flex rounded-full px-1.5 py-0 text-[8px] font-semibold leading-4 ring-1 md:text-[9px] ".concat(tag.className)
       }, tagText) : null));
     }));
   }))));

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

@@ -52,7 +52,7 @@ export default function VenueSelection() {
     navigateWeek(7);
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "rounded-[24px] bg-white p-3 shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6 md:rounded-[28px] md:p-6"
+    className: "rounded-b-[24px] bg-white p-3 shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6 md:rounded-[28px] md:p-6"
   }, /*#__PURE__*/React.createElement("div", {
     className: "flex flex-col gap-2 xl:flex-row xl:items-center xl:justify-between"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h2", {
@@ -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)));
 }