@pisell/private-materials 6.3.135 → 6.3.137

package/lib/components/venueBooking/components/Cart/index.d.ts

@@ -0,0 +1,28 @@
+/**
+ * venueBooking 购物车组件
+ * 参照 scanOrder/Cart 实现，使用系统内置 ShoppingCart + SubTotal 组件
+ * 支持两种模式：embedded（桌面端内嵌）和 drawer（移动端抽屉弹出）
+ */
+import React from 'react';
+import './index.less';
+/** Cart 组件 Props，与 scanOrder/Cart 对齐 */
+interface CartProps {
+    /** 是否打开（drawer 模式生效） */
+    open: boolean;
+    /** 关闭回调（drawer 模式） */
+    onCancel: () => void;
+    /** 确认/下一步回调 */
+    onNext: () => void;
+    /** 购物车商品列表（从 OS 模块获取后由 toShoppingCartProducts 转换） */
+    items: any[];
+    /** 金额汇总（从 OS 模块 getSummary 获取） */
+    summary: Record<string, any>;
+    /** 是否内嵌模式（桌面端侧边栏使用） */
+    embedded?: boolean;
+    /** 确认按钮 loading 状态 */
+    confirmLoading?: boolean;
+    /** 购物车底部额外内容插槽 */
+    extraContent?: React.ReactNode;
+}
+export default function Cart(props: CartProps): JSX.Element | null;
+export {};

package/lib/components/venueBooking/components/Checkout/index.d.ts

@@ -1,7 +1,2 @@
-/**
- * venueBooking 结算步骤（Step 3）
- * 展示预订明细、客户信息表单、到场须知、金额汇总
- * 金额从 viewModel.summary（OS 模块）读取，购物车条目从 viewModel.cartItems 读取
- */
-import React from 'react';
-export default function Checkout(): React.JSX.Element;
+/// <reference types="react" />
+export default function Checkout(): JSX.Element;

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

@@ -83,7 +83,7 @@ function Checkout() {
       required: false
     },
     last_name: {
-      visible: false,
+      visible: true,
       required: false
     },
     phone: {
@@ -91,7 +91,7 @@ function Checkout() {
       required: false
     },
     email: {
-      visible: true,
+      visible: false,
       required: false
     }
   }), []);
@@ -121,7 +121,7 @@ function Checkout() {
     setNoteValue(nextNote);
     lastNoteRef.current = nextNote;
   }, [viewModel.note]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "space-y-3 md:space-y-5" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "grid gap-3 md:gap-4" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "rounded-[22px] bg-white p-4 shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6 md:rounded-[28px] md:p-6" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "flex items-center justify-between gap-3" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("div", { className: "text-xs font-bold uppercase tracking-[0.24em] text-[#b39a8b]" }, import_utils.locales.getText("pisell2.venue.checkout.booking.details") || "预订详情"), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-3 text-[22px] font-extrabold text-zinc-900" }, import_utils.locales.getText("pisell2.venue.checkout.court.summary") || "场地预订摘要"))), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-5 grid gap-4 md:grid-cols-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6 md:col-span-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "text-sm font-semibold text-[#a69183]" }, import_utils.locales.getText("pisell2.venue.checkout.selected.courts") || "已选场地"), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-3 space-y-2 text-[15px] font-semibold text-zinc-900" }, mergedCourtSessionLines.length ? mergedCourtSessionLines.map((line, idx) => /* @__PURE__ */ import_react.default.createElement("div", { key: `venue-session-line-${idx}` }, line)) : /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.venue.checkout.sessions.empty") || "-"))), addonCartItems.length > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "text-sm font-semibold text-[#a69183]" }, import_utils.locales.getText("pisell2.venue.checkout.addons") || "附加项"), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-3 text-[15px] font-semibold text-zinc-900" }, addonCartItems.map((item, idx) => /* @__PURE__ */ import_react.default.createElement("div", { key: `addon-${item.id || idx}` }, item.title || item.name || "-"))), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-2 text-[15px] text-zinc-500" }, import_utils.locales.getText("pisell2.venue.checkout.addons.total") || "附加项合计", ": ", symbol, addonTotal.toFixed(2))) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6 md:col-span-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "text-sm font-semibold text-[#a69183]" }, import_utils.locales.getText("pisell2.venue.checkout.subtotal") || "预订小计"), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-3 text-[30px] font-extrabold text-zinc-900" }, symbol, Number.isNaN(bookingSubtotal) ? "0.00" : bookingSubtotal.toFixed(2))))), /* @__PURE__ */ import_react.default.createElement("div", { className: "space-y-4" }, /* @__PURE__ */ import_react.default.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" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "flex items-start justify-between gap-3" }), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-5 rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "text-lg font-bold text-zinc-900" }, import_utils.locales.getText("pisell2.venue.checkout.notice") || "备注"), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "space-y-3 md:space-y-5" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "grid gap-3 md:gap-4" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "rounded-[22px] bg-white p-4 shadow-[0_10px_40px_rgba(20,20,20,0.06)] ring-1 ring-black/6 md:rounded-[28px] md:p-6" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "flex items-center justify-between gap-3" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-3 text-[22px] font-extrabold text-zinc-900" }, import_utils.locales.getText("pisell2.venue.checkout.court.summary") || "场地预订摘要"))), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-5 grid gap-4 md:grid-cols-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6 md:col-span-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "text-sm font-semibold text-[#a69183]" }, import_utils.locales.getText("pisell2.venue.checkout.selected.courts") || "已选场地"), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-3 space-y-2 text-[15px] font-semibold text-zinc-900" }, mergedCourtSessionLines.length ? mergedCourtSessionLines.map((line, idx) => /* @__PURE__ */ import_react.default.createElement("div", { key: `venue-session-line-${idx}` }, line)) : /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("pisell2.venue.checkout.sessions.empty") || "-"))), addonCartItems.length > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "text-sm font-semibold text-[#a69183]" }, import_utils.locales.getText("pisell2.venue.checkout.addons") || "附加项"), /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-3 text-[15px] font-semibold text-zinc-900" }, addonCartItems.map((item, idx) => /* @__PURE__ */ import_react.default.createElement("div", { key: `addon-${item.id || idx}` }, item.title || item.name || "-")))) : null)), /* @__PURE__ */ import_react.default.createElement("div", { className: "space-y-4" }, /* @__PURE__ */ import_react.default.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" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "mt-5 rounded-[22px] bg-[#faf7f4] p-4 ring-1 ring-black/6" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "text-lg font-bold text-zinc-900" }, import_utils.locales.getText("pisell2.venue.checkout.notice") || "备注"), /* @__PURE__ */ import_react.default.createElement(
     "textarea",
     {
       className: "mt-4 min-h-[120px] w-full rounded-[20px] border border-black/10 bg-white px-4 py-4 text-sm outline-none placeholder:text-zinc-400",
@@ -190,6 +190,33 @@ function toContactsInfoPayload(formValues) {
     }
   ];
 }
+function applyI18nPlaceholders(template, vars) {
+  let result = template;
+  for (const [key, value] of Object.entries(vars)) {
+    result = result.split(`{${key}}`).join(String(value));
+  }
+  return result;
+}
+function formatCheckoutDurationText(totalMinutes) {
+  const hours = Math.floor(totalMinutes / 60);
+  const minutes = totalMinutes % 60;
+  if (hours > 0 && minutes > 0) {
+    const tpl2 = String(
+      import_utils.locales.getText("pisell2.venue.checkout.duration.hours_minutes") || "{hours}h {minutes}min"
+    );
+    return applyI18nPlaceholders(tpl2, { hours, minutes });
+  }
+  if (hours > 0) {
+    const tpl2 = String(
+      import_utils.locales.getText("pisell2.venue.checkout.duration.hours") || "{hours}h"
+    );
+    return applyI18nPlaceholders(tpl2, { hours });
+  }
+  const tpl = String(
+    import_utils.locales.getText("pisell2.venue.checkout.duration.minutes") || "{minutes}min"
+  );
+  return applyI18nPlaceholders(tpl, { minutes });
+}
 function getSessionDisplayText(item) {
   const startRaw = String((item == null ? void 0 : item.start_date) || "");
   const endRaw = String((item == null ? void 0 : item.end_date) || "");
@@ -198,7 +225,7 @@ function getSessionDisplayText(item) {
   if (!start.isValid() || !end.isValid())
     return String((item == null ? void 0 : item.description) || (item == null ? void 0 : item.subtitle) || "-");
   const durationMinutes = Math.max(0, end.diff(start, "minute"));
-  const durationText = durationMinutes >= 60 ? `${Math.floor(durationMinutes / 60)}h` : `${durationMinutes}m`;
+  const durationText = formatCheckoutDurationText(durationMinutes);
   return `${start.format("HH:mm")} ~ ${end.format("HH:mm")} ${start.format("DD/MM/YYYY")} (${durationText})`;
 }
 function getVenueResourceName(item) {

package/lib/components/venueBooking/components/Content/index.d.ts

@@ -1,6 +1,2 @@
-/**
- * venueBooking 内容区域组件
- * 负责根据当前步骤渲染对应的子视图，管理桌面端 Cart 侧边栏和移动端 Footer
- */
-import React from 'react';
-export default function Content(): React.JSX.Element;
+/// <reference types="react" />
+export default function Content(): JSX.Element;

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

@@ -1,10 +1,4 @@
-/**
- * venueBooking 定金协议组件
- * 复用 appointmentBooking/deposit 作为渲染引擎，适配 venueBooking 的数据形状：
- *   - deposit_policy_data（场地预订）→ protocols（appointmentBooking 期望字段）
- *   - venueBookingModule.getProtocol(id) → depositProtocolRequest
- */
-import React from 'react';
+/// <reference types="react" />
 import '../../../appointmentBooking/deposit/index.less';
 interface VenueDepositProps {
     /** summary.deposit 对象，含 hasDeposit / total / deposit_policy_data */
@@ -16,5 +10,5 @@ interface VenueDepositProps {
     /** 获取协议详情的方法，对应 venueBookingModule.getProtocol(id) */
     getProtocol: (id: string) => Promise<any>;
 }
-export default function VenueDeposit({ deposit, isAgreePolicy, onChange, getProtocol, }: VenueDepositProps): React.JSX.Element | null;
+export default function VenueDeposit({ deposit, isAgreePolicy, onChange, getProtocol, }: VenueDepositProps): JSX.Element | null;
 export {};

package/lib/components/venueBooking/components/Footer/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import './index.less';
+export default function Footer(): JSX.Element;

package/lib/components/venueBooking/components/Header/index.d.ts

@@ -1,6 +1,2 @@
-/**
- * venueBooking 步骤导航头部
- * 展示三步流程进度条（选场地 → 附加商品 → 结账），支持点击跳转已完成步骤
- */
-import React from 'react';
-export default function Header(): React.JSX.Element;
+/// <reference types="react" />
+export default function Header(): JSX.Element;

package/lib/components/venueBooking/components/VenueSelection/components/CourtFilter.d.ts

@@ -1,7 +1,2 @@
-/**
- * 场地筛选器
- * 包含搜索框和场地类型标签（All / Badminton / Pickleball 等）
- * 类型从 timeSlotGrid.resources 的 productTitle 去重提取
- */
-import React from 'react';
-export default function CourtFilter(): React.JSX.Element;
+/// <reference types="react" />
+export default function CourtFilter(): JSX.Element;

package/lib/components/venueBooking/components/VenueSelection/components/DateNavigator.d.ts

@@ -1,11 +1,7 @@
-/**
- * 日期导航器
- * 前后翻周按钮、月份名称（点击展开月历选择器）、回到今天按钮
- */
-import React from 'react';
+/// <reference types="react" />
 interface DateNavigatorProps {
     onPrevWeek: () => void;
     onNextWeek: () => void;
 }
-export default function DateNavigator({ onPrevWeek, onNextWeek }: DateNavigatorProps): React.JSX.Element;
+export default function DateNavigator({ onPrevWeek, onNextWeek }: DateNavigatorProps): JSX.Element;
 export {};

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/components/venueBooking/context.js

@@ -91,6 +91,8 @@ function VenueBookingProvider({ entryContext, children }) {
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
   const venueBookingModule = (0, import_hooks.useVenueBookingModule)();
   const [currentStep, setCurrentStep] = (0, import_react.useState)("select-venue");
+  const hydratedRef = (0, import_react.useRef)(false);
+  const [addonsResolved, setAddonsResolved] = (0, import_react.useState)(false);
   const [viewModel, setViewModel] = (0, import_react.useState)(INITIAL_VIEW_MODEL);
   const stepList = (0, import_react.useMemo)(() => {
     var _a2;
@@ -130,6 +132,28 @@ function VenueBookingProvider({ entryContext, children }) {
     const timer = window.setTimeout(() => setLimitMessage(""), 3800);
     return () => window.clearTimeout(timer);
   }, [limitMessage]);
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2;
+    if (hydratedRef.current || !venueBookingModule) return;
+    hydratedRef.current = true;
+    const pending = (_a2 = venueBookingModule.getUIState) == null ? void 0 : _a2.call(venueBookingModule, "pendingStep");
+    if (pending) {
+      (_b2 = venueBookingModule.deleteUIState) == null ? void 0 : _b2.call(venueBookingModule, "pendingStep");
+      setCurrentStep(pending);
+      return;
+    }
+    const cached = (_c2 = venueBookingModule.getUIState) == null ? void 0 : _c2.call(venueBookingModule, "step");
+    if (cached) setCurrentStep(cached);
+  }, [venueBookingModule]);
+  (0, import_react.useEffect)(() => {
+    var _a2;
+    if (!hydratedRef.current || !venueBookingModule) return;
+    (_a2 = venueBookingModule.setUIState) == null ? void 0 : _a2.call(venueBookingModule, "step", currentStep);
+  }, [currentStep, venueBookingModule]);
+  (0, import_react.useEffect)(() => {
+    if (!hydratedRef.current || !addonsResolved) return;
+    if (!stepList.includes(currentStep)) setCurrentStep(stepList[0]);
+  }, [stepList, currentStep, addonsResolved]);
   const refreshViewModel = (0, import_react.useCallback)(async (extraFields) => {
     if (venueBookingModule && typeof venueBookingModule.getSummary === "function") {
       try {
@@ -322,24 +346,32 @@ function VenueBookingProvider({ entryContext, children }) {
     }
   }, [isSubmittingOrder, venueBookingModule, refreshViewModel, utils, (_c = viewModel == null ? void 0 : viewModel.summary) == null ? void 0 : _c.total_amount]);
   const handleSubmitOrder = (0, import_react.useCallback)(async () => {
+    var _a2;
     if (isLogin) {
       await submitOrder();
       return;
     }
+    (_a2 = venueBookingModule == null ? void 0 : venueBookingModule.setUIState) == null ? void 0 : _a2.call(venueBookingModule, "pendingStep", "checkout");
     openLoginModal({
       callback: (status) => {
+        var _a3;
         if (status !== "success") return;
+        (_a3 = venueBookingModule == null ? void 0 : venueBookingModule.deleteUIState) == null ? void 0 : _a3.call(venueBookingModule, "pendingStep");
         handleLoginSuccess().then(() => {
           void submitOrder();
         });
       }
     });
-  }, [isLogin, openLoginModal, handleLoginSuccess, submitOrder]);
+  }, [isLogin, openLoginModal, handleLoginSuccess, submitOrder, venueBookingModule]);
   const proceedToCheckout = (0, import_react.useCallback)(() => {
+    var _a2;
     if (!isLogin) {
+      (_a2 = venueBookingModule == null ? void 0 : venueBookingModule.setUIState) == null ? void 0 : _a2.call(venueBookingModule, "pendingStep", "checkout");
       openLoginModal({
         callback: (status) => {
+          var _a3;
           if (status === "success") {
+            (_a3 = venueBookingModule == null ? void 0 : venueBookingModule.deleteUIState) == null ? void 0 : _a3.call(venueBookingModule, "pendingStep");
             handleLoginSuccess().then(() => goToStep("checkout"));
           }
         }
@@ -347,7 +379,7 @@ function VenueBookingProvider({ entryContext, children }) {
       return;
     }
     goToStep("checkout");
-  }, [isLogin, openLoginModal, handleLoginSuccess, goToStep]);
+  }, [isLogin, openLoginModal, handleLoginSuccess, goToStep, venueBookingModule]);
   const handlePrimaryAction = (0, import_react.useCallback)(() => {
     var _a2, _b2;
     if (currentStep === "select-venue") {
@@ -458,7 +490,11 @@ function VenueBookingProvider({ entryContext, children }) {
               }
             }).catch((err) => {
               console.warn("[venueBooking] prefetch getProductList failed", err);
+            }).finally(() => {
+              if (!unmounted) setAddonsResolved(true);
             });
+          } else {
+            setAddonsResolved(true);
           }
         }
       } catch (error) {

package/lib/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/lib/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/lib/components/venueBooking/locales.js

@@ -98,6 +98,9 @@ var locales_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.",
@@ -219,6 +222,9 @@ var locales_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": "暂无可选附加商品",
@@ -340,6 +346,9 @@ var locales_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": "暫無可選附加商品",
@@ -461,6 +470,9 @@ var locales_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": "追加できる商品がありません。",
@@ -582,6 +594,9 @@ var locales_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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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;

package/lib/plus/orderList/components/HandleActions.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 declare const HandleActions: (props: {
     locales: any;
     __id?: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default HandleActions;