@pisell/private-materials 6.3.135 → 6.3.137

package/es/components/venueBooking/components/VenueSelection/components/DayTabs.d.ts

@@ -1,13 +1,7 @@
-/**
- * 周日期选项卡
- * 横向展示一周 7 天，每天显示周几、日期数字、起步价和可用状态
- * 数据来自 context 中的 dateSummary（PisellOS venueBooking.getDateRangeSummary）
- * 支持左右滑动手势切换前后周
- */
-import React from 'react';
+/// <reference types="react" />
 interface DayTabsProps {
     onPrevWeek: () => void;
     onNextWeek: () => void;
 }
-export default function DayTabs({ onPrevWeek, onNextWeek }: DayTabsProps): React.JSX.Element;
+export default function DayTabs({ onPrevWeek, onNextWeek }: DayTabsProps): JSX.Element;
 export {};

package/es/components/venueBooking/components/VenueSelection/components/MonthPicker.d.ts

@@ -1,7 +1,2 @@
-/**
- * 月历选择器
- * 以日历网格形式展示一个月的日期，标记已选日期、今天、已售完日期
- * 点击日期后更新锚点日期并关闭选择器
- */
-import React from 'react';
-export default function MonthPicker(): React.JSX.Element;
+/// <reference types="react" />
+export default function MonthPicker(): JSX.Element;

package/es/components/venueBooking/components/VenueSelection/components/PriceLegend.d.ts

@@ -1,6 +1,2 @@
-/**
- * 价格图例
- * 展示场地商品标题与表述（来自 venueProducts），最多一行四个，超出自动换行
- */
-import React from 'react';
-export default function PriceLegend(): React.JSX.Element | null;
+/// <reference types="react" />
+export default function PriceLegend(): JSX.Element | null;

package/es/components/venueBooking/components/VenueSelection/components/TimeGrid.d.ts

@@ -1,14 +1,2 @@
-/**
- * 时段网格
- * 核心交互组件：横轴为时间（每 30 分钟一格），纵轴为资源/场地
- * 数据来自 PisellOS venueBooking.getTimeSlotGrid()
- *
- * 结构：
- * - 表头段（sticky）：外层 overflow-hidden 作为窗口，内层 grid 用 transform 跟随
- *   表体横向 scrollLeft。纵向 sticky 相对外层页面滚动容器生效，实现吸顶。
- * - 表体段：保留 overflow-x: auto、横向拖拽、点击选中/取消时段、切换日期自动滚到
- *   首个可用时段。
- * - 同步方向单向：body.scrollLeft -> headerInner.style.transform。
- */
-import React from 'react';
-export default function TimeGrid(): React.JSX.Element;
+/// <reference types="react" />
+export default function TimeGrid(): JSX.Element;

package/es/components/venueBooking/components/VenueSelection/index.d.ts

@@ -1,6 +1,2 @@
-/**
- * venueBooking 场地选择步骤（Step 1）
- * 包含日期导航、周视图、场地筛选、价格图例、时段网格等子组件
- */
-import React from 'react';
-export default function VenueSelection(): React.JSX.Element;
+/// <reference types="react" />
+export default function VenueSelection(): JSX.Element;

package/es/components/venueBooking/components/Voucher/index.d.ts

@@ -1,13 +1,8 @@
-/**
- * venueBooking 优惠券/Promotion 组件
- * 参照 appointmentBooking/Voucher 实现，适配 venueBooking 模块的 scanCode / getDiscountList / setDiscountSelected
- * 包含：标题行折叠、PisellGoodPassCard 券列表、未登录登录卡片、Code 输入 + Apply
- */
-import React from 'react';
+/// <reference types="react" />
 import '../../../booking/components/voucher/index.less';
 import '../../../appointmentBooking/components/Voucher/index.less';
 /**
  * VoucherCard -- 优惠券/Promotion 区块
  * 嵌入购物车底部，提供券列表展示、勾选、扫码兑码、未登录引导等能力
  */
-export default function VoucherCard(): React.JSX.Element;
+export default function VoucherCard(): JSX.Element;

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

@@ -1,13 +1,9 @@
-/**
- * venueBooking 全局状态管理
- * 集中管理步骤、场地选择、PisellOS venueBooking 模块数据等状态
- */
-import React from 'react';
+/// <reference types="react" />
 import type { VenueBookingContextValue, VenueBookingProviderProps } from './types';
 /**
  * VenueBookingProvider -- 场地预订全局 Context
  * 管理步骤导航、场地选择状态、OS 模块集成
  */
-export declare function VenueBookingProvider({ entryContext, children }: VenueBookingProviderProps): React.JSX.Element;
+export declare function VenueBookingProvider({ entryContext, children }: VenueBookingProviderProps): JSX.Element;
 /** 消费 venueBooking Context 的 hook */
 export declare function useVenueBookingContext(): VenueBookingContextValue;

package/es/components/venueBooking/context.js

@@ -121,12 +121,29 @@ export function VenueBookingProvider(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     currentStep = _useState2[0],
     setCurrentStep = _useState2[1];
+  /**
+   * 步骤状态是否已完成首屏 hydrate：
+   *   - 首次 venueBookingModule 就绪时，从 OS UI 缓存里读取 pendingStep / step
+   *   - 只做一次，避免 module 引用更新时重复覆盖用户真实的步骤操作
+   */
+  var hydratedRef = useRef(false);
+  /**
+   * 附加商品列表是否已至少 resolve 过一次。
+   * bootstrap 里对 getProductList() 是非阻塞预拉取，`addonProductList` 一开始是空数组，
+   * stepList 也因此先呈现为 2 步。若直接用 stepList 校验 hydrated step，会把缓存里
+   * 合法的 'addons' 误判为非法。所以 stepList 校验必须等到本标记翻转之后。
+   * 用 state 而非 ref：保证翻转时触发 effect 重跑（即便 stepList 没变化）
+   */
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    addonsResolved = _useState4[0],
+    setAddonsResolved = _useState4[1];
 
   // ── 视图模型 ──
-  var _useState3 = useState(INITIAL_VIEW_MODEL),
-    _useState4 = _slicedToArray(_useState3, 2),
-    viewModel = _useState4[0],
-    setViewModel = _useState4[1];
+  var _useState5 = useState(INITIAL_VIEW_MODEL),
+    _useState6 = _slicedToArray(_useState5, 2),
+    viewModel = _useState6[0],
+    setViewModel = _useState6[1];
 
   /**
    * 步骤列表：当 addonProductList 为空时跳过 addons 步骤。
@@ -140,51 +157,51 @@ export function VenueBookingProvider(_ref) {
   }, [(_viewModel$addonProdu2 = viewModel.addonProductList) === null || _viewModel$addonProdu2 === void 0 ? void 0 : _viewModel$addonProdu2.length]);
 
   // ── 加载状态 ──
-  var _useState5 = useState(true),
-    _useState6 = _slicedToArray(_useState5, 2),
-    isLoading = _useState6[0],
-    setIsLoading = _useState6[1];
-  /** 周视图加载中：fetchWeekData / goToNearestAvailableDate 期间为 true */
   var _useState7 = useState(true),
     _useState8 = _slicedToArray(_useState7, 2),
-    isWeekLoading = _useState8[0],
-    setIsWeekLoading = _useState8[1];
-  /** 时段网格加载中：包含周加载 + 日期切换的短暂过渡 */
+    isLoading = _useState8[0],
+    setIsLoading = _useState8[1];
+  /** 周视图加载中：fetchWeekData / goToNearestAvailableDate 期间为 true */
   var _useState9 = useState(true),
     _useState10 = _slicedToArray(_useState9, 2),
-    isGridTransition = _useState10[0],
-    setIsGridTransition = _useState10[1];
+    isWeekLoading = _useState10[0],
+    setIsWeekLoading = _useState10[1];
+  /** 时段网格加载中：包含周加载 + 日期切换的短暂过渡 */
+  var _useState11 = useState(true),
+    _useState12 = _slicedToArray(_useState11, 2),
+    isGridTransition = _useState12[0],
+    setIsGridTransition = _useState12[1];
   var isGridLoading = isWeekLoading || isGridTransition;
 
   // ── UI 状态 ──
-  var _useState11 = useState(dayjs()),
-    _useState12 = _slicedToArray(_useState11, 2),
-    anchorDate = _useState12[0],
-    setAnchorDate = _useState12[1];
-  var _useState13 = useState('ALL'),
+  var _useState13 = useState(dayjs()),
     _useState14 = _slicedToArray(_useState13, 2),
-    filter = _useState14[0],
-    setFilter = _useState14[1];
-  var _useState15 = useState(''),
+    anchorDate = _useState14[0],
+    setAnchorDate = _useState14[1];
+  var _useState15 = useState('ALL'),
     _useState16 = _slicedToArray(_useState15, 2),
-    search = _useState16[0],
-    setSearch = _useState16[1];
+    filter = _useState16[0],
+    setFilter = _useState16[1];
   var _useState17 = useState(''),
     _useState18 = _slicedToArray(_useState17, 2),
-    limitMessage = _useState18[0],
-    setLimitMessage = _useState18[1];
-  var _useState19 = useState(false),
+    search = _useState18[0],
+    setSearch = _useState18[1];
+  var _useState19 = useState(''),
     _useState20 = _slicedToArray(_useState19, 2),
-    mobileCartOpen = _useState20[0],
-    setMobileCartOpen = _useState20[1];
+    limitMessage = _useState20[0],
+    setLimitMessage = _useState20[1];
   var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    monthPickerOpen = _useState22[0],
-    setMonthPickerOpen = _useState22[1];
-  var _useState23 = useState(dayjs().startOf('month')),
+    mobileCartOpen = _useState22[0],
+    setMobileCartOpen = _useState22[1];
+  var _useState23 = useState(false),
     _useState24 = _slicedToArray(_useState23, 2),
-    monthCursor = _useState24[0],
-    setMonthCursor = _useState24[1];
+    monthPickerOpen = _useState24[0],
+    setMonthPickerOpen = _useState24[1];
+  var _useState25 = useState(dayjs().startOf('month')),
+    _useState26 = _slicedToArray(_useState25, 2),
+    monthCursor = _useState26[0],
+    setMonthCursor = _useState26[1];
 
   // ── 登录状态 ──
   var _useVenueBookingLogin = useVenueBookingLogin(),
@@ -194,33 +211,33 @@ export function VenueBookingProvider(_ref) {
   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([]),
-    _useState26 = _slicedToArray(_useState25, 2),
-    discountList = _useState26[0],
-    setDiscountList = _useState26[1];
+  var _useState27 = useState([]),
+    _useState28 = _slicedToArray(_useState27, 2),
+    discountList = _useState28[0],
+    setDiscountList = _useState28[1];
 
   // ── 定金协议勾选状态（有定金协议时需用户主动同意才可提交） ──
-  var _useState27 = useState(false),
-    _useState28 = _slicedToArray(_useState27, 2),
-    isAgreeDepositPolicy = _useState28[0],
-    setIsAgreeDepositPolicy = _useState28[1];
+  var _useState29 = useState(false),
+    _useState30 = _slicedToArray(_useState29, 2),
+    isAgreeDepositPolicy = _useState30[0],
+    setIsAgreeDepositPolicy = _useState30[1];
 
   // ── OS 模块集成状态 ──
-  var _useState29 = useState({
+  var _useState31 = useState({
       passed: null,
       failures: []
     }),
-    _useState30 = _slicedToArray(_useState29, 2),
-    cartValidation = _useState30[0],
-    setCartValidation = _useState30[1];
-  var _useState31 = useState(String(locales.getText('pisell2.venue.action.next.addons') || '')),
     _useState32 = _slicedToArray(_useState31, 2),
-    footerActionText = _useState32[0],
-    setFooterActionText = _useState32[1];
-  var _useState33 = useState(false),
+    cartValidation = _useState32[0],
+    setCartValidation = _useState32[1];
+  var _useState33 = useState(String(locales.getText('pisell2.venue.action.next.addons') || '')),
     _useState34 = _slicedToArray(_useState33, 2),
-    isSubmittingOrder = _useState34[0],
-    setIsSubmittingOrder = _useState34[1];
+    footerActionText = _useState34[0],
+    setFooterActionText = _useState34[1];
+  var _useState35 = useState(false),
+    _useState36 = _slicedToArray(_useState35, 2),
+    isSubmittingOrder = _useState36[0],
+    setIsSubmittingOrder = _useState36[1];
 
   // 用 ref 追踪最新的 anchorDate 避免闭包陈旧问题
   var anchorDateRef = useRef(anchorDate);
@@ -246,6 +263,47 @@ export function VenueBookingProvider(_ref) {
     };
   }, [limitMessage]);
 
+  /**
+   * 步骤缓存 hydrate：首次 module 就绪时读取 OS UI 缓存
+   *   - 优先级：pendingStep（用户点过 next 的意图，可能经过登录重定向）→ step（普通刷新场景）
+   *   - pendingStep 命中即消费（delete），避免下次刷新还被拉到 checkout
+   *   - 基于 cacheId 分桶，无 cacheId 时 OS 层降级为 no-op，getUIState 返回 undefined
+   */
+  useEffect(function () {
+    var _venueBookingModule$g, _venueBookingModule$g2;
+    if (hydratedRef.current || !venueBookingModule) return;
+    hydratedRef.current = true;
+    var pending = (_venueBookingModule$g = venueBookingModule.getUIState) === null || _venueBookingModule$g === void 0 ? void 0 : _venueBookingModule$g.call(venueBookingModule, 'pendingStep');
+    if (pending) {
+      var _venueBookingModule$d;
+      (_venueBookingModule$d = venueBookingModule.deleteUIState) === null || _venueBookingModule$d === void 0 || _venueBookingModule$d.call(venueBookingModule, 'pendingStep');
+      setCurrentStep(pending);
+      return;
+    }
+    var cached = (_venueBookingModule$g2 = venueBookingModule.getUIState) === null || _venueBookingModule$g2 === void 0 ? void 0 : _venueBookingModule$g2.call(venueBookingModule, 'step');
+    if (cached) setCurrentStep(cached);
+  }, [venueBookingModule]);
+
+  /**
+   * 步骤变化写回 OS UI 缓存，hydrate 完成后才写，避免用默认值覆盖已有缓存
+   */
+  useEffect(function () {
+    var _venueBookingModule$s;
+    if (!hydratedRef.current || !venueBookingModule) return;
+    (_venueBookingModule$s = venueBookingModule.setUIState) === null || _venueBookingModule$s === void 0 || _venueBookingModule$s.call(venueBookingModule, 'step', currentStep);
+  }, [currentStep, venueBookingModule]);
+
+  /**
+   * 步骤列表是动态的（无 addons 时只 2 步），若缓存 step 落在当前 stepList 之外则回退。
+   * 例：缓存为 'addons' 但本次 addonProductList 确实为空，stepList 里没有 'addons'。
+   * 必须等 addonsResolvedRef 置位（getProductList 至少 resolve 过一次）才能校验，
+   * 否则会被首屏 2 步的过渡态误杀掉合法的 'addons' 缓存。
+   */
+  useEffect(function () {
+    if (!hydratedRef.current || !addonsResolved) return;
+    if (!stepList.includes(currentStep)) setCurrentStep(stepList[0]);
+  }, [stepList, currentStep, addonsResolved]);
+
   // ── 核心数据方法 ──
 
   /**
@@ -645,7 +703,7 @@ export function VenueBookingProvider(_ref) {
    * 登录成功后调用 OS onCustomerLogin 加载折扣配置并刷新数据
    */
   var handleLoginSuccess = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-    var _venueBookingModule$g, list;
+    var _venueBookingModule$g3, list;
     return _regeneratorRuntime().wrap(function _callee8$(_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
@@ -654,7 +712,7 @@ export function VenueBookingProvider(_ref) {
           return syncCustomerLoginToModule();
         case 3:
           // 刷新折扣列表
-          list = (venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g = venueBookingModule.getDiscountList) === null || _venueBookingModule$g === void 0 ? void 0 : _venueBookingModule$g.call(venueBookingModule)) || [];
+          list = (venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g3 = venueBookingModule.getDiscountList) === null || _venueBookingModule$g3 === void 0 ? void 0 : _venueBookingModule$g3.call(venueBookingModule)) || [];
           setDiscountList(list);
           _context9.next = 7;
           return refreshViewModel();
@@ -749,6 +807,7 @@ export function VenueBookingProvider(_ref) {
 
   /** 带登录门禁的提交订单入口 */
   var handleSubmitOrder = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+    var _venueBookingModule$s2;
     return _regeneratorRuntime().wrap(function _callee10$(_context11) {
       while (1) switch (_context11.prev = _context11.next) {
         case 0:
@@ -761,27 +820,36 @@ export function VenueBookingProvider(_ref) {
         case 3:
           return _context11.abrupt("return");
         case 4:
+          // 登录前落盘跳转意图：弹窗回调命中时本函数消费，重定向回来时由 hydrate 消费
+          venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$s2 = venueBookingModule.setUIState) === null || _venueBookingModule$s2 === void 0 || _venueBookingModule$s2.call(venueBookingModule, 'pendingStep', 'checkout');
           openLoginModal({
             callback: function callback(status) {
+              var _venueBookingModule$d2;
               if (status !== 'success') return;
+              venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$d2 = venueBookingModule.deleteUIState) === null || _venueBookingModule$d2 === void 0 || _venueBookingModule$d2.call(venueBookingModule, 'pendingStep');
               handleLoginSuccess().then(function () {
                 void submitOrder();
               });
             }
           });
-        case 5:
+        case 6:
         case "end":
           return _context11.stop();
       }
     }, _callee10);
-  })), [isLogin, openLoginModal, handleLoginSuccess, submitOrder]);
+  })), [isLogin, openLoginModal, handleLoginSuccess, submitOrder, venueBookingModule]);
 
   /** 跳转到 checkout，并在未登录时插入登录门禁（参照 scanOrder gotoCheckOrder） */
   var proceedToCheckout = useCallback(function () {
     if (!isLogin) {
+      var _venueBookingModule$s3;
+      // 登录前落盘跳转意图：弹窗回调命中时本函数消费，重定向回来时由 hydrate 消费
+      venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$s3 = venueBookingModule.setUIState) === null || _venueBookingModule$s3 === void 0 || _venueBookingModule$s3.call(venueBookingModule, 'pendingStep', 'checkout');
       openLoginModal({
         callback: function callback(status) {
           if (status === 'success') {
+            var _venueBookingModule$d3;
+            venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$d3 = venueBookingModule.deleteUIState) === null || _venueBookingModule$d3 === void 0 || _venueBookingModule$d3.call(venueBookingModule, 'pendingStep');
             handleLoginSuccess().then(function () {
               return goToStep('checkout');
             });
@@ -791,7 +859,7 @@ export function VenueBookingProvider(_ref) {
       return;
     }
     goToStep('checkout');
-  }, [isLogin, openLoginModal, handleLoginSuccess, goToStep]);
+  }, [isLogin, openLoginModal, handleLoginSuccess, goToStep, venueBookingModule]);
 
   /** 主操作按钮行为（含登录门禁，自适应 2/3 步流程） */
   var handlePrimaryAction = useCallback(function () {
@@ -980,7 +1048,13 @@ export function VenueBookingProvider(_ref) {
                     }
                   }).catch(function (err) {
                     console.warn('[venueBooking] prefetch getProductList failed', err);
+                  }).finally(function () {
+                    // 无论成功/失败都算「已解析过一次」，允许 stepList 校验上场
+                    if (!unmounted) setAddonsResolved(true);
                   });
+                } else {
+                  // 模块未提供 getProductList 时视为已解析（不会有 addons）
+                  setAddonsResolved(true);
                 }
               }
               _context14.next = 17;

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

@@ -1,10 +1,6 @@
-/**
- * venueBooking 入口组件
- * 初始化国际化、标准化入口上下文，并挂载 Provider + Content
- */
-import React from 'react';
+/// <reference types="react" />
 import type { VenueBookingProps } from './types';
 /** 场地预订主组件 */
-declare function VenueBooking(props: VenueBookingProps): React.JSX.Element;
+declare function VenueBooking(props: VenueBookingProps): JSX.Element;
 export type { VenueBookingProps } from './types';
 export default VenueBooking;

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

@@ -78,6 +78,9 @@ declare const _default: {
         'pisell2.venue.checkout.hotline': string;
         'pisell2.venue.checkout.estimated.total': string;
         'pisell2.venue.checkout.change': string;
+        'pisell2.venue.checkout.duration.hours_minutes': string;
+        'pisell2.venue.checkout.duration.hours': string;
+        'pisell2.venue.checkout.duration.minutes': string;
         'pisell2.venue.grid.loading': string;
         'pisell2.venue.legend.product.fallback': string;
         'pisell2.venue.addons.empty': string;
@@ -199,6 +202,9 @@ declare const _default: {
         'pisell2.venue.checkout.hotline': string;
         'pisell2.venue.checkout.estimated.total': string;
         'pisell2.venue.checkout.change': string;
+        'pisell2.venue.checkout.duration.hours_minutes': string;
+        'pisell2.venue.checkout.duration.hours': string;
+        'pisell2.venue.checkout.duration.minutes': string;
         'pisell2.venue.grid.loading': string;
         'pisell2.venue.legend.product.fallback': string;
         'pisell2.venue.addons.empty': string;
@@ -320,6 +326,9 @@ declare const _default: {
         'pisell2.venue.checkout.hotline': string;
         'pisell2.venue.checkout.estimated.total': string;
         'pisell2.venue.checkout.change': string;
+        'pisell2.venue.checkout.duration.hours_minutes': string;
+        'pisell2.venue.checkout.duration.hours': string;
+        'pisell2.venue.checkout.duration.minutes': string;
         'pisell2.venue.grid.loading': string;
         'pisell2.venue.legend.product.fallback': string;
         'pisell2.venue.addons.empty': string;
@@ -441,6 +450,9 @@ declare const _default: {
         'pisell2.venue.checkout.hotline': string;
         'pisell2.venue.checkout.estimated.total': string;
         'pisell2.venue.checkout.change': string;
+        'pisell2.venue.checkout.duration.hours_minutes': string;
+        'pisell2.venue.checkout.duration.hours': string;
+        'pisell2.venue.checkout.duration.minutes': string;
         'pisell2.venue.grid.loading': string;
         'pisell2.venue.legend.product.fallback': string;
         'pisell2.venue.addons.empty': string;
@@ -562,6 +574,9 @@ declare const _default: {
         'pisell2.venue.checkout.hotline': string;
         'pisell2.venue.checkout.estimated.total': string;
         'pisell2.venue.checkout.change': string;
+        'pisell2.venue.checkout.duration.hours_minutes': string;
+        'pisell2.venue.checkout.duration.hours': string;
+        'pisell2.venue.checkout.duration.minutes': string;
         'pisell2.venue.grid.loading': string;
         'pisell2.venue.legend.product.fallback': string;
         'pisell2.venue.addons.empty': string;

package/es/components/venueBooking/locales.js

@@ -78,6 +78,9 @@ export default {
     'pisell2.venue.checkout.hotline': 'Support hotline',
     'pisell2.venue.checkout.estimated.total': 'Estimated total',
     'pisell2.venue.checkout.change': 'Change',
+    'pisell2.venue.checkout.duration.hours_minutes': '{hours}h {minutes}min',
+    'pisell2.venue.checkout.duration.hours': '{hours}h',
+    'pisell2.venue.checkout.duration.minutes': '{minutes}min',
     'pisell2.venue.grid.loading': 'Loading...',
     'pisell2.venue.legend.product.fallback': 'Product',
     'pisell2.venue.addons.empty': 'No add-ons available.',
@@ -199,6 +202,9 @@ export default {
     'pisell2.venue.checkout.hotline': '客服热线',
     'pisell2.venue.checkout.estimated.total': '预估总价',
     'pisell2.venue.checkout.change': '修改',
+    'pisell2.venue.checkout.duration.hours_minutes': '{hours}小时{minutes}分钟',
+    'pisell2.venue.checkout.duration.hours': '{hours}小时',
+    'pisell2.venue.checkout.duration.minutes': '{minutes}分钟',
     'pisell2.venue.grid.loading': '加载中...',
     'pisell2.venue.legend.product.fallback': '商品',
     'pisell2.venue.addons.empty': '暂无可选附加商品',
@@ -320,6 +326,9 @@ export default {
     'pisell2.venue.checkout.hotline': '客服熱線',
     'pisell2.venue.checkout.estimated.total': '預估總價',
     'pisell2.venue.checkout.change': '修改',
+    'pisell2.venue.checkout.duration.hours_minutes': '{hours}小時{minutes}分鐘',
+    'pisell2.venue.checkout.duration.hours': '{hours}小時',
+    'pisell2.venue.checkout.duration.minutes': '{minutes}分鐘',
     'pisell2.venue.grid.loading': '加載中...',
     'pisell2.venue.legend.product.fallback': '商品',
     'pisell2.venue.addons.empty': '暫無可選附加商品',
@@ -441,6 +450,9 @@ export default {
     'pisell2.venue.checkout.hotline': 'サポート窓口',
     'pisell2.venue.checkout.estimated.total': '見積合計',
     'pisell2.venue.checkout.change': '変更',
+    'pisell2.venue.checkout.duration.hours_minutes': '{hours}時間{minutes}分',
+    'pisell2.venue.checkout.duration.hours': '{hours}時間',
+    'pisell2.venue.checkout.duration.minutes': '{minutes}分',
     'pisell2.venue.grid.loading': '読み込み中...',
     'pisell2.venue.legend.product.fallback': '商品',
     'pisell2.venue.addons.empty': '追加できる商品がありません。',
@@ -562,6 +574,9 @@ export default {
     'pisell2.venue.checkout.hotline': 'Central de suporte',
     'pisell2.venue.checkout.estimated.total': 'Total estimado',
     'pisell2.venue.checkout.change': 'Alterar',
+    'pisell2.venue.checkout.duration.hours_minutes': '{hours} h {minutes} min',
+    'pisell2.venue.checkout.duration.hours': '{hours} h',
+    'pisell2.venue.checkout.duration.minutes': '{minutes} min',
     'pisell2.venue.grid.loading': 'Carregando...',
     'pisell2.venue.legend.product.fallback': 'Produto',
     'pisell2.venue.addons.empty': 'Nenhum adicional disponível.',

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

@@ -1,2 +1,2 @@
-import React from "react";
-export default function RainbowTownBadmintonBookingPage(): React.JSX.Element;
+/// <reference types="react" />
+export default function RainbowTownBadmintonBookingPage(): JSX.Element;

package/es/components/venueBooking/utils/transformProductDetail.d.ts

@@ -2,5 +2,7 @@
  * 商品详情 -> 订单行数据的转换工具
  * 直接复用 scanOrder 的 transformProductDetail 逻辑
  * 将商品详情弹窗回调 / 数量变更回调的 payload 转换为 OS 模块 addProductToOrder 所需的格式
+ *
+ * 订单行 _origin 与 scanOrder 一致：列表商品字段在顶层，详情回调挂在 callbackData
  */
 export { transformProductDetailToOrderProduct, type ProductDetailCallbackPayload, type ScanOrderOrderProductInput, } from '../../scanOrder/utils/transformProductDetail';

package/es/components/venueBooking/utils/transformProductDetail.js

@@ -2,5 +2,7 @@
  * 商品详情 -> 订单行数据的转换工具
  * 直接复用 scanOrder 的 transformProductDetail 逻辑
  * 将商品详情弹窗回调 / 数量变更回调的 payload 转换为 OS 模块 addProductToOrder 所需的格式
+ *
+ * 订单行 _origin 与 scanOrder 一致：列表商品字段在顶层，详情回调挂在 callbackData
  */
 export { transformProductDetailToOrderProduct } from "../../scanOrder/utils/transformProductDetail";

package/es/components/walletList/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const WalletList: (props: any) => React.JSX.Element;
+declare const WalletList: (props: any) => JSX.Element;
 export default WalletList;

package/es/components/walletList/model.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { State, WalletListContextType } from './types';
 export declare const initialState: State;
 export declare const Context: React.Context<WalletListContextType>;
-export declare const Provider: (Component: React.ComponentType<any>) => (props: any) => React.JSX.Element;
+export declare const Provider: (Component: React.ComponentType<any>) => (props: any) => JSX.Element;
 export * from './types';

package/es/components/walletList/tempHolderSelector/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import './index.less';
 export declare const getAvatarText: (name: string) => string;
 interface ITempHolderSelectorProps {
@@ -10,5 +10,5 @@ interface ITempHolderSelectorProps {
     onCancel: () => void;
     confirmLoading: boolean;
 }
-export default function TempHolderSelector(props: ITempHolderSelectorProps): React.JSX.Element;
+export default function TempHolderSelector(props: ITempHolderSelectorProps): JSX.Element;
 export {};

package/es/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {
@@ -12,7 +11,7 @@ declare type ModalComponent = typeof OriginModal & {
     success: typeof AntModal.success;
     info: typeof AntModal.info;
 };
-declare const OriginModal: (props: ModalProps) => React.JSX.Element;
+declare const OriginModal: (props: ModalProps) => JSX.Element;
 declare const Modal: ModalComponent;
 export declare type ModalFuncProps = AntModalFuncProps;
 export default Modal;

package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

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

package/es/hooks/usePaymentLogger.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;
@@ -16,8 +15,8 @@ interface UsePaymentLoggerOptions {
  */
 declare const usePaymentLogger: (options: UsePaymentLoggerOptions) => {
     logs: import("react").MutableRefObject<LogData[]>;
-    addLog: (this: unknown, logData: LogData) => void;
-    sendLogs: (this: unknown, title?: string | undefined, err?: any) => void;
+    addLog: (logData: LogData) => void;
+    sendLogs: (title?: string, err?: any) => void;
 };
 export default usePaymentLogger;
 export type { LogData, UsePaymentLoggerOptions };

package/es/plus/clientName/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 import './index.less';
 import { IClientNameProps } from './type';
-declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => React.JSX.Element | null;
+declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => JSX.Element | null;
 export default ClientName;

package/es/plus/clinetSearch/Add/BirthdayField/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => React.JSX.Element;
+declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/es/plus/clinetSearch/Add/GenderField/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const GenderField: (props: any) => React.JSX.Element;
+declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

package/es/plus/clinetSearch/Add/PhoneField/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const PhoneField: ({ value, onChange }: any) => React.JSX.Element;
+declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/es/plus/contactInfoModal/ContactInfoContent.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const ContactInfoContent: (props: any) => React.JSX.Element;
+declare const ContactInfoContent: (props: any) => JSX.Element;
 export default ContactInfoContent;