@pisell/private-materials 6.3.138 → 6.3.140

package/es/components/systemSettings/registry/index.js

@@ -821,6 +821,7 @@ var Registry = function Registry(_ref) {
               section_code: currentSection.code,
               code: formData.code,
               title: formData.title,
+              description: formData === null || formData === void 0 ? void 0 : formData.description,
               sort: newSort
             });
           case 10:
@@ -838,7 +839,8 @@ var Registry = function Registry(_ref) {
             return handleUpdateGroup({
               id: editingGroup.id,
               code: formData.code,
-              title: formData.title
+              title: formData.title,
+              description: formData === null || formData === void 0 ? void 0 : formData.description
             });
           case 17:
             // 只有在保存成功后才关闭模态框

package/es/components/systemSettings/registry/services.d.ts

@@ -4,11 +4,13 @@ export interface CreateGroupParams {
     code: string;
     title: MultiLanguageText;
     sort: number;
+    description?: MultiLanguageText;
 }
 export interface UpdateGroupParams {
     id: number;
     code: string;
     title: MultiLanguageText;
+    description?: MultiLanguageText;
 }
 export interface DeleteGroupParams {
     id: number;

package/es/components/systemSettings/registry/types.d.ts

@@ -36,6 +36,8 @@ export interface SettingGroup extends BaseItem {
     items: SettingItem[];
     expanded?: boolean;
     sort: number;
+    description?: MultiLanguageText;
+    title?: MultiLanguageText;
 }
 export interface Section extends BaseItem {
     icon?: string;
@@ -90,6 +92,7 @@ export interface SettingsTableProps {
 export interface GroupFormData {
     title: MultiLanguageText;
     code: string;
+    description?: MultiLanguageText;
 }
 export interface ItemFormData {
     name: MultiLanguageText;

package/es/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

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

@@ -131,17 +131,19 @@ export default function Addons() {
   // ── 从订单移除商品 ──
   var removeOrderProduct = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-      var product_id, product_variant_id, sourceData;
+      var product_id, product_variant_id, identity_key, sourceData;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            product_id = params.product_id, product_variant_id = params.product_variant_id, sourceData = params.sourceData;
+            product_id = params.product_id, product_variant_id = params.product_variant_id, identity_key = params.identity_key, sourceData = params.sourceData;
             _context3.prev = 1;
             _context3.next = 4;
-            return runModuleAction('removeProductFromOrder', {
+            return runModuleAction('removeProductFromOrder', _objectSpread({
               product_id: product_id,
               product_variant_id: product_variant_id
-            });
+            }, identity_key ? {
+              identity_key: identity_key
+            } : {}));
           case 4:
             _context3.next = 6;
             return refreshViewModel();
@@ -155,7 +157,8 @@ export default function Addons() {
               error: _context3.t0,
               sourceData: sourceData,
               product_id: product_id,
-              product_variant_id: product_variant_id
+              product_variant_id: product_variant_id,
+              identity_key: identity_key
             });
           case 11:
           case "end":
@@ -171,18 +174,21 @@ export default function Addons() {
   // ── 更新订单中商品数量 ──
   var updateOrderProduct = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-      var product_id, product_variant_id, updates, sourceData;
+      var product_id, product_variant_id, identity_key, updates, sourceData;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, sourceData = params.sourceData;
+            product_id = params.product_id, product_variant_id = params.product_variant_id, identity_key = params.identity_key, updates = params.updates, sourceData = params.sourceData;
             _context4.prev = 1;
             _context4.next = 4;
-            return runModuleAction('updateProductInOrder', {
+            return runModuleAction('updateProductInOrder', _objectSpread(_objectSpread({
               product_id: product_id,
-              product_variant_id: product_variant_id,
+              product_variant_id: product_variant_id
+            }, identity_key ? {
+              identity_key: identity_key
+            } : {}), {}, {
               updates: updates
-            });
+            }));
           case 4:
             _context4.next = 6;
             return refreshViewModel();
@@ -197,6 +203,7 @@ export default function Addons() {
               sourceData: sourceData,
               product_id: product_id,
               product_variant_id: product_variant_id,
+              identity_key: identity_key,
               updates: updates
             });
           case 11:
@@ -218,13 +225,13 @@ export default function Addons() {
    */
   var handleSelectProduct = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(item, clickType, meta) {
-      var sourceItem, _item$option, _item$bundle, _item$price, _item$product_id, _ref7, _meta$quantity, _orderProduct$product, _orderProduct$product4, quantityData, orderProduct, nextQuantity, productVariantId, normalizedQuantity, _orderProduct$product2, cartItems, existedCartItem;
+      var sourceItem, _item$option, _item$bundle, _item$price, _item$product_id, _ref7, _meta$quantity, _orderProduct$product, _orderProduct$product4, quantityData, orderProduct, nextQuantity, productVariantId, normalizedQuantity, cartItems, existedCartItem, existedIdentityKey, _orderProduct$product3;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             sourceItem = (meta === null || meta === void 0 ? void 0 : meta.product) || item;
             if (!((meta === null || meta === void 0 ? void 0 : meta.intent) === 'quantity')) {
-              _context6.next = 27;
+              _context6.next = 28;
               break;
             }
             // ── 数量变更模式 ──
@@ -259,54 +266,56 @@ export default function Addons() {
             });
             return _context6.abrupt("return");
           case 12:
-            normalizedQuantity = Number.isNaN(nextQuantity) ? 0 : Math.max(0, Math.floor(nextQuantity)); // 数量为 0 → 移除商品
+            normalizedQuantity = Number.isNaN(nextQuantity) ? 0 : Math.max(0, Math.floor(nextQuantity)); // 检查购物车中是否已存在该商品（优先取 SDK 回灌的 identity_key 做精确删改）
+            cartItems = Array.isArray(viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
+            existedCartItem = cartItems.find(function (cartItem) {
+              var _cartItem$product_id, _orderProduct$product2, _cartItem$product_var;
+              return String((_cartItem$product_id = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_id) !== null && _cartItem$product_id !== void 0 ? _cartItem$product_id : null) === String((_orderProduct$product2 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product2 !== void 0 ? _orderProduct$product2 : null) && Number((_cartItem$product_var = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_variant_id) !== null && _cartItem$product_var !== void 0 ? _cartItem$product_var : 0) === productVariantId;
+            });
+            existedIdentityKey = typeof (existedCartItem === null || existedCartItem === void 0 ? void 0 : existedCartItem.identity_key) === 'string' && existedCartItem.identity_key.length > 0 ? existedCartItem.identity_key : undefined; // 数量为 0 → 移除商品
             if (!(normalizedQuantity <= 0)) {
-              _context6.next = 17;
+              _context6.next = 20;
               break;
             }
-            _context6.next = 16;
+            _context6.next = 19;
             return removeOrderProduct({
-              product_id: (_orderProduct$product2 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product2 !== void 0 ? _orderProduct$product2 : null,
+              product_id: (_orderProduct$product3 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product3 !== void 0 ? _orderProduct$product3 : null,
               product_variant_id: productVariantId,
+              identity_key: existedIdentityKey,
               sourceData: quantityData
             });
-          case 16:
+          case 19:
             return _context6.abrupt("return");
-          case 17:
-            // 检查购物车中是否已存在该商品
-            cartItems = Array.isArray(viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
-            existedCartItem = cartItems.find(function (cartItem) {
-              var _cartItem$product_id, _orderProduct$product3, _cartItem$product_var;
-              return String((_cartItem$product_id = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_id) !== null && _cartItem$product_id !== void 0 ? _cartItem$product_id : null) === String((_orderProduct$product3 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product3 !== void 0 ? _orderProduct$product3 : null) && Number((_cartItem$product_var = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_variant_id) !== null && _cartItem$product_var !== void 0 ? _cartItem$product_var : 0) === productVariantId;
-            }); // 不存在 → 新增；已存在 → 更新数量
+          case 20:
             if (existedCartItem) {
-              _context6.next = 23;
+              _context6.next = 24;
               break;
             }
-            _context6.next = 22;
+            _context6.next = 23;
             return addOrderProduct({
               orderProduct: _objectSpread(_objectSpread({}, orderProduct), {}, {
                 num: normalizedQuantity
               }),
               sourceData: quantityData
             });
-          case 22:
-            return _context6.abrupt("return");
           case 23:
-            _context6.next = 25;
+            return _context6.abrupt("return");
+          case 24:
+            _context6.next = 26;
             return updateOrderProduct({
               product_id: (_orderProduct$product4 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product4 !== void 0 ? _orderProduct$product4 : null,
               product_variant_id: productVariantId,
+              identity_key: existedIdentityKey,
               updates: {
                 num: normalizedQuantity,
                 _origin: orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct._origin
               },
               sourceData: quantityData
             });
-          case 25:
-            _context6.next = 28;
+          case 26:
+            _context6.next = 29;
             break;
-          case 27:
+          case 28:
             // ── 打开商品详情弹窗 ──
             utils === null || utils === void 0 || utils.action({
               type: 'pisell1.productDetail',
@@ -362,7 +371,7 @@ export default function Addons() {
                 return callback;
               }()
             });
-          case 28:
+          case 29:
           case "end":
             return _context6.stop();
         }

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

@@ -147,7 +147,10 @@ export default function Cart(props) {
   var isVenueBookingCartItem = function isVenueBookingCartItem(target) {
     if (!target || _typeof(target) !== 'object') return false;
     if (target !== null && target !== void 0 && target.start_date && target !== null && target !== void 0 && target.end_date) return true;
-    var identity = String((target === null || target === void 0 ? void 0 : target.identity_key) || (target === null || target === void 0 ? void 0 : target.rowKey) || (target === null || target === void 0 ? void 0 : target._id) || '');
+
+    // 不透明 identity 契约下，venueBooking 行的 identity_key 形如 `venue:<resourceId>:<groupIndex>:<uuid>`，
+    // 仅依据 SDK 回灌的 identity_key 判断；不再回退 rowKey / _id。
+    var identity = String((target === null || target === void 0 ? void 0 : target.identity_key) || '');
     if (identity.startsWith('venue:')) return true;
     return false;
   };
@@ -176,39 +179,48 @@ export default function Cart(props) {
             return _context.abrupt("return");
           case 6:
             productId = (_ref6 = (_targetItem$product_i = targetItem === null || targetItem === void 0 ? void 0 : targetItem.product_id) !== null && _targetItem$product_i !== void 0 ? _targetItem$product_i : targetItem === null || targetItem === void 0 ? void 0 : targetItem.id) !== null && _ref6 !== void 0 ? _ref6 : null;
-            productVariantId = Number((_targetItem$product_v = targetItem === null || targetItem === void 0 ? void 0 : targetItem.product_variant_id) !== null && _targetItem$product_v !== void 0 ? _targetItem$product_v : 0);
-            identityKey = (targetItem === null || targetItem === void 0 ? void 0 : targetItem.identity_key) || (targetItem === null || targetItem === void 0 ? void 0 : targetItem.rowKey) || undefined;
+            productVariantId = Number((_targetItem$product_v = targetItem === null || targetItem === void 0 ? void 0 : targetItem.product_variant_id) !== null && _targetItem$product_v !== void 0 ? _targetItem$product_v : 0); // 不透明 identity 契约：删除只信任 SDK 回灌的 identity_key，禁用 rowKey 回退。
+            identityKey = targetItem === null || targetItem === void 0 ? void 0 : targetItem.identity_key;
             if (!(productId === null && Number.isNaN(productVariantId))) {
               _context.next = 11;
               break;
             }
             return _context.abrupt("return");
           case 11:
-            _context.prev = 11;
-            _context.next = 14;
+            if (!(typeof identityKey !== 'string' || identityKey.length === 0)) {
+              _context.next = 14;
+              break;
+            }
+            console.error('[venueBooking] removeProductFromOrder skipped: missing identity_key', {
+              item: targetItem
+            });
+            return _context.abrupt("return");
+          case 14:
+            _context.prev = 14;
+            _context.next = 17;
             return runModuleAction('removeProductFromOrder', {
               product_id: productId,
               product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
               identity_key: identityKey
             });
-          case 14:
-            _context.next = 16;
+          case 17:
+            _context.next = 19;
             return refreshViewModel();
-          case 16:
-            _context.next = 21;
+          case 19:
+            _context.next = 24;
             break;
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](11);
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context["catch"](14);
             console.error('[venueBooking] removeProductFromOrder failed', {
               error: _context.t0,
               item: targetItem
             });
-          case 21:
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[11, 18]]);
+      }, _callee, null, [[14, 21]]);
     }));
     return function handleCartChange(_x, _x2, _x3) {
       return _ref5.apply(this, arguments);

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

@@ -4,6 +4,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 _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); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /**
  * 时段网格
  * 核心交互组件：横轴为时间（每 30 分钟一格），纵轴为资源/场地
@@ -16,11 +22,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  *   首个可用时段。
  * - 同步方向单向：body.scrollLeft -> headerInner.style.transform。
  */
-import React, { useEffect, useMemo, useRef, useCallback } from 'react';
+import React, { useEffect, useMemo, useRef, useCallback, useState } from 'react';
 import { Iconfont, PisellText } from '@pisell/materials';
 import { locales, isIos } from '@pisell/utils';
 import { useVenueBookingContext } from "../../../context";
-import { isSlotSelected as checkSlotSelected, useVenueBookingSymbol } from "../../../hooks";
+import { isSlotSelected as checkSlotSelected, isSlotDisabledBySelection, useVenueBookingSymbol } from "../../../hooks";
 import { formatHourHeader, isHourBoundary, buildHourGroups, buildSlotPriceInfo, getPriceColor, getSlotTag, getColumnTag, getTimeMetaFromGrid, getResourceCourtMeta, getTableGridStyle, getFirstAvailableSlotIndex, FIRST_COLUMN_WIDTH } from "../../../utils";
 export default function TimeGrid() {
   var symbol = useVenueBookingSymbol();
@@ -206,13 +212,24 @@ export default function TimeGrid() {
       return scroller.removeEventListener('wheel', onWheel);
     };
   }, []);
-  function handleSlotClick(resourceId, slot) {
+
+  /** 记录哪些多商品资源是展开态（resourceId -> expanded） */
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    expandedResources = _useState2[0],
+    setExpandedResources = _useState2[1];
+  var toggleExpanded = useCallback(function (resourceId) {
+    setExpandedResources(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, String(resourceId), !prev[String(resourceId)]));
+    });
+  }, []);
+  function handleSlotClick(resourceId, productId, slot) {
     if (dragStateRef.current.moved) {
       dragStateRef.current.moved = false;
       return;
     }
     if (slot.status !== 'available') return;
-    toggleSlot(resourceId, slot);
+    toggleSlot(resourceId, productId, slot);
   }
 
   // 网格加载中（周数据拉取 / 切换日期过渡 / 数据未就绪）：渲染骨架屏
@@ -292,43 +309,79 @@ export default function TimeGrid() {
     key: grid.date
   }, visibleResources.map(function (resource) {
     var courtMeta = getResourceCourtMeta(resource);
-    return /*#__PURE__*/React.createElement("div", {
-      key: "".concat(resource.resourceId, "-").concat(grid.date),
+    var isMultiProduct = !!resource.hasMultipleProducts && Array.isArray(resource.products);
+    var expanded = !!expandedResources[String(resource.resourceId)];
+    return /*#__PURE__*/React.createElement(React.Fragment, {
+      key: "".concat(resource.resourceId, "-").concat(grid.date)
+    }, /*#__PURE__*/React.createElement("div", {
       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-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", {
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "flex items-center gap-1.5"
+    }, isMultiProduct ? /*#__PURE__*/React.createElement("button", {
+      type: "button",
+      "data-cart-button": "true",
+      onClick: function onClick(e) {
+        e.stopPropagation();
+        toggleExpanded(resource.resourceId);
+      },
+      className: "flex h-5 w-5 items-center justify-center rounded text-zinc-500 hover:bg-black/5",
+      "aria-label": expanded ? 'collapse' : 'expand'
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: expanded ? 'pisell2-chevron-down' : 'pisell2-chevron-right',
+      style: {
+        fontSize: 12
+      }
+    })) : 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)))), 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';
-      var selected = isAvailable && checkSlotSelected(venueBookingModule, resource.resourceId, slot.startTime);
+      var timeLabel = timeLabels[slotIndex] || '';
       var priceInfo = buildSlotPriceInfo(slot);
       var priceClass = getPriceColor(_objectSpread(_objectSpread({}, priceInfo), {}, {
         courtType: resource.productTitle
       }));
-      var timeLabel = timeLabels[slotIndex] || '';
       var tag = getSlotTag(priceInfo);
       var tagText = (tag === null || tag === void 0 ? void 0 : tag.text) === 'pisell2.venue.label.promo' ? locales.getText('pisell2.venue.label.promo') || '促销' : (tag === null || tag === void 0 ? void 0 : tag.text) === 'pisell2.venue.label.off.peak' ? locales.getText('pisell2.venue.label.off.peak') || '非高峰' : null;
+
+      // 单商品：保持原选中/禁用判定；多商品：外层 slot 不可直接选，点击仅触发展开
+      var productIdForSingle = resource.productId;
+      var disabledBySelection = !isMultiProduct && !isUnavailable ? isSlotDisabledBySelection(venueBookingModule, {
+        resourceId: resource.resourceId,
+        productId: productIdForSingle,
+        startTime: slot.startTime
+      }) : false;
+      // 跨行互斥禁用视觉上与 unavailable 一致（灰底 + ×），用户能明确看到冲突
+      var isBlocked = isUnavailable || disabledBySelection;
+      var selected = !isMultiProduct && isAvailable && checkSlotSelected(venueBookingModule, resource.resourceId, slot.startTime, productIdForSingle);
+      var interactive = !isMultiProduct && !isBlocked;
+      var showPlusLabel = isMultiProduct && !isBlocked;
       return /*#__PURE__*/React.createElement("button", {
         "data-slot-button": "true",
-        key: "".concat(resource.resourceId, "-").concat(slot.startTime),
+        key: "".concat(resource.resourceId, "-outer-").concat(slot.startTime),
         onClick: function onClick() {
-          return handleSlotClick(resource.resourceId, slot);
+          if (isMultiProduct) {
+            if (isBlocked) return;
+            toggleExpanded(resource.resourceId);
+            return;
+          }
+          if (isBlocked) return;
+          handleSlotClick(resource.resourceId, productIdForSingle, slot);
         },
-        disabled: isUnavailable,
-        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]'),
+        disabled: isBlocked,
+        className: "px-1 py-2 text-center transition md:px-2 ".concat(isBlocked ? '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)'
-        }, selected && !isUnavailable ? {
+        }, selected && interactive ? {
           backgroundColor: 'var(--vb-primary)'
         } : null)
-      }, isUnavailable ? /*#__PURE__*/React.createElement("div", {
+      }, isBlocked ? /*#__PURE__*/React.createElement("div", {
         className: "flex flex-col items-center justify-center gap-1 text-zinc-400"
       }, /*#__PURE__*/React.createElement("div", {
         className: "text-lg font-bold leading-none"
@@ -342,6 +395,8 @@ export default function TimeGrid() {
         className: "text-[13px] font-extrabold leading-4 text-white md:text-sm"
       })) : /*#__PURE__*/React.createElement("div", {
         className: "space-y-0.5"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "flex items-baseline justify-center gap-0.5"
       }, /*#__PURE__*/React.createElement(PisellText.Amount, {
         value: Number(slot.price || 0),
         symbol: symbol,
@@ -349,9 +404,66 @@ export default function TimeGrid() {
         showCurrencySymbol: true,
         hideDecimalForWholeNumbers: true,
         className: "text-[13px] font-normal leading-4 ".concat(priceClass, " md:text-sm")
-      }), tag ? /*#__PURE__*/React.createElement("div", {
+      }), showPlusLabel ? /*#__PURE__*/React.createElement("span", {
+        className: "text-[13px] font-semibold leading-4 ".concat(priceClass, " md:text-sm")
+      }, "+") : null), tag ? /*#__PURE__*/React.createElement("div", {
         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));
+    })), isMultiProduct && expanded && resource.products.map(function (subRow) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: "".concat(resource.resourceId, "-sub-").concat(subRow.productId),
+        className: "grid border-b border-black/6 bg-zinc-50/60",
+        style: tableGridStyle
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "sticky left-0 z-10 border-r border-black/6 bg-zinc-50/60 px-2 py-2 pl-8 shadow-[10px_0_16px_-14px_rgba(0,0,0,0.2)] md:px-4 md:pl-10"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "text-[12px] font-semibold leading-5 text-zinc-700 md:text-[13px]"
+      }, subRow.productTitle)), subRow.slots.map(function (slot, slotIndex) {
+        var isAvailable = slot.status === 'available';
+        var isUnavailable = slot.status === 'occupied' || slot.status === 'past' || slot.status === 'unavailable';
+        var timeLabel = timeLabels[slotIndex] || '';
+        var disabledBySelection = !isUnavailable && isSlotDisabledBySelection(venueBookingModule, {
+          resourceId: resource.resourceId,
+          productId: subRow.productId,
+          startTime: slot.startTime
+        });
+        var isBlocked = isUnavailable || disabledBySelection;
+        var selected = isAvailable && checkSlotSelected(venueBookingModule, resource.resourceId, slot.startTime, subRow.productId);
+        var interactive = !isBlocked;
+        var priceInfo = buildSlotPriceInfo(slot);
+        var priceClass = getPriceColor(_objectSpread(_objectSpread({}, priceInfo), {}, {
+          courtType: subRow.productTitle
+        }));
+        return /*#__PURE__*/React.createElement("button", {
+          "data-slot-button": "true",
+          key: "".concat(resource.resourceId, "-").concat(subRow.productId, "-").concat(slot.startTime),
+          onClick: function onClick() {
+            if (!interactive) return;
+            handleSlotClick(resource.resourceId, subRow.productId, slot);
+          },
+          disabled: !interactive,
+          className: "px-1 py-2 text-center transition md:px-2 ".concat(isBlocked ? '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)'
+          }, selected && interactive ? {
+            backgroundColor: 'var(--vb-primary)'
+          } : null)
+        }, isBlocked ? /*#__PURE__*/React.createElement("div", {
+          className: "flex flex-col items-center justify-center gap-1 text-zinc-400"
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "text-lg font-bold leading-none"
+        }, "\xD7")) : /*#__PURE__*/React.createElement("div", {
+          className: "space-y-0.5"
+        }, /*#__PURE__*/React.createElement(PisellText.Amount, {
+          value: Number(slot.price || 0),
+          symbol: symbol,
+          precision: 2,
+          showCurrencySymbol: true,
+          hideDecimalForWholeNumbers: true,
+          className: "text-[13px] leading-4 ".concat(selected ? 'font-extrabold text-white' : "font-normal ".concat(priceClass), " md:text-sm")
+        })));
+      }));
     }));
   }))));
 }

package/es/components/venueBooking/context.js

@@ -548,7 +548,7 @@ export function VenueBookingProvider(_ref) {
    * 调用 OS venueBooking.toggleSlot 后刷新 grid + 购物车
    */
   var toggleSlot = useCallback( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(resourceId, slot) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(resourceId, productId, slot) {
       return _regeneratorRuntime().wrap(function _callee4$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -562,12 +562,12 @@ export function VenueBookingProvider(_ref) {
             _context5.next = 5;
             return toggleSlotAction(venueBookingModule, {
               resourceId: resourceId,
+              productId: productId,
               startTime: slot.startTime,
               endTime: slot.endTime,
               price: slot.price
             });
           case 5:
-            // toggleSlot 后刷新 grid 获取最新选中状态
             refreshTimeSlotGrid();
             _context5.next = 8;
             return refreshViewModel();
@@ -584,7 +584,7 @@ export function VenueBookingProvider(_ref) {
         }
       }, _callee4, null, [[2, 10]]);
     }));
-    return function (_x5, _x6) {
+    return function (_x5, _x6, _x7) {
       return _ref5.apply(this, arguments);
     };
   }(), [venueBookingModule, refreshTimeSlotGrid, refreshViewModel]);
@@ -606,7 +606,7 @@ export function VenueBookingProvider(_ref) {
         }
       }, _callee5);
     }));
-    return function (_x7) {
+    return function (_x8) {
       return _ref6.apply(this, arguments);
     };
   }(), [venueBookingModule, refreshViewModel]);
@@ -631,7 +631,7 @@ export function VenueBookingProvider(_ref) {
         }
       }, _callee6);
     }));
-    return function (_x8) {
+    return function (_x9) {
       return _ref7.apply(this, arguments);
     };
   }(), [venueBookingModule]);
@@ -936,7 +936,7 @@ export function VenueBookingProvider(_ref) {
           }
         }, _callee11);
       }));
-      return function onGlobalLoginSuccess(_x9) {
+      return function onGlobalLoginSuccess(_x10) {
         return _ref12.apply(this, arguments);
       };
     }();

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

@@ -27,15 +27,28 @@ export declare function fetchResourceAvailability(module: any, startDate: string
 export declare function getDateRangeSummary(module: any, startDate: string, endDate: string): VenueDateSummaryItem[];
 /** 获取某天的时段网格（纯计算不发请求，切换日期时调用） */
 export declare function getTimeSlotGrid(module: any, date: string): VenueTimeSlotGrid | null;
-/** 切换选中/取消一个时段 */
+/** 切换选中/取消一个时段（同一资源下多商品场景必须携带 productId） */
 export declare function toggleSlotAction(module: any, params: {
     resourceId: number;
+    productId: number;
     startTime: string;
     endTime: string;
     price: string;
 }): Promise<any>;
-/** 查询某个时段是否已被选中 */
-export declare function isSlotSelected(module: any, resourceId: number, startTime: string): boolean;
+/**
+ * 查询某个时段是否已被选中
+ * 不传 productId 时：该资源下任一商品选中即 true；传了则精确匹配
+ */
+export declare function isSlotSelected(module: any, resourceId: number, startTime: string, productId?: number): boolean;
+/**
+ * 询问 OS：该 (resourceId, productId, startTime) 格子是否因其它已选项而应禁用
+ * 覆盖：同场地多商品互斥、组合资源 ↔ 子资源联动
+ */
+export declare function isSlotDisabledBySelection(module: any, params: {
+    resourceId: number;
+    productId: number;
+    startTime: string;
+}): boolean;
 /** 获取全部已选时段（按资源分组） */
 export declare function getAllSelectedSlots(module: any): any[];
 /** 查询 otherParams */