@pisell/private-materials 6.3.177 → 6.3.178

package/es/components/scanOrder/locales.js

@@ -30,21 +30,6 @@ export default {
     'pisell2.scan.order.products.empty.tip': 'Please select products',
     'pisell2.scan.order.check.cart.empty.tip': 'Please go back to add products',
     'pisell2.scan.order.submit.disabled.default': 'Order submission is currently disabled.',
-    'pisell2.scan.order.multiple.orders.tip': 'There are multiple active orders for this table. Please contact staff for add-on orders.',
-    'pisell2.scan.order.multiple.orders.confirm': 'I Got It',
-    'pisell2.scan.order.settled.cannot.add.tip': 'This order has already been settled and you cannot add more items. Please scan again to create a new order or contact staff.',
-    'pisell2.scan.order.inventory.insufficient.title': 'Insufficient inventory',
-    'pisell2.scan.order.inventory.insufficient.description': 'The following items are out of stock or do not have enough inventory. Please adjust your cart and try again.',
-    'pisell2.scan.order.inventory.insufficient.products.label': 'Unavailable products:',
-    'pisell2.scan.order.add.on.confirm.title': 'This table has already started ordering',
-    'pisell2.scan.order.add.on.confirm.description': 'Someone at your table has placed the order. This will be submitted as an add-on order.',
-    'pisell2.scan.order.add.on.confirm.button': 'Confirm Add-on Order',
-    'pisell2.scan.order.add.on.return.button': 'Return to Cart',
-    'pisell2.scan.order.add.on.unavailable.title': 'Add-on ordering is not available',
-    'pisell2.scan.order.add.on.unavailable.description': 'You can’t add items to this order from your phone right now.\nPlease ask a staff member for help.',
-    'pisell2.scan.order.add.on.unavailable.confirm': 'Got it',
-    'pisell2.scan.order.add.on.login.required.title': 'Notice',
-    'pisell2.scan.order.add.on.login.required': 'Please login before placing an add-on order.',
     'pisell2.text.goodpass': 'Promotion',
     'pisell2.text.goodpass.product-vouchers': 'Product Vouchers',
     'pisell2.text.goodpass.view-more': 'View More',
@@ -94,21 +79,6 @@ export default {
     'pisell2.scan.order.products.empty.tip': '请选择商品',
     'pisell2.scan.order.check.cart.empty.tip': '请返回添加商品',
     'pisell2.scan.order.submit.disabled.default': '当前暂不可下单',
-    'pisell2.scan.order.multiple.orders.tip': '当前桌台存在多个进行中的订单，请联系店员处理加餐。',
-    'pisell2.scan.order.multiple.orders.confirm': '我知道了',
-    'pisell2.scan.order.settled.cannot.add.tip': '当前订单已结账，无法继续加餐。请重新扫码创建新订单或联系店员。',
-    'pisell2.scan.order.inventory.insufficient.title': '库存不足',
-    'pisell2.scan.order.inventory.insufficient.description': '以下商品库存不足或已售罄，请调整购物车后重新提交。',
-    'pisell2.scan.order.inventory.insufficient.products.label': '异常商品：',
-    'pisell2.scan.order.add.on.confirm.title': '本桌已开始点餐',
-    'pisell2.scan.order.add.on.confirm.description': '同行顾客已提交订单。本次将作为加餐提交，请确认后继续。',
-    'pisell2.scan.order.add.on.confirm.button': '确认加餐',
-    'pisell2.scan.order.add.on.return.button': '返回购物车',
-    'pisell2.scan.order.add.on.unavailable.title': '暂不支持加餐',
-    'pisell2.scan.order.add.on.unavailable.description': '当前无法通过手机为此订单加餐。\n如需加餐，请联系工作人员。',
-    'pisell2.scan.order.add.on.unavailable.confirm': '我知道了',
-    'pisell2.scan.order.add.on.login.required.title': '提示',
-    'pisell2.scan.order.add.on.login.required': '需要登录后才能加餐',
     'pisell2.text.goodpass': '促销',
     'pisell2.text.goodpass.product-vouchers': '商品兑换券',
     'pisell2.text.goodpass.view-more': '查看更多',
@@ -158,21 +128,6 @@ export default {
     'pisell2.scan.order.products.empty.tip': '請選擇商品',
     'pisell2.scan.order.check.cart.empty.tip': '請返回添加商品',
     'pisell2.scan.order.submit.disabled.default': '當前暫不可下單',
-    'pisell2.scan.order.multiple.orders.tip': '當前桌台存在多個進行中的訂單，請聯繫店員處理加餐。',
-    'pisell2.scan.order.multiple.orders.confirm': '我知道了',
-    'pisell2.scan.order.settled.cannot.add.tip': '當前訂單已結賬，無法繼續加餐。請重新掃碼創建新訂單或聯繫店員。',
-    'pisell2.scan.order.inventory.insufficient.title': '庫存不足',
-    'pisell2.scan.order.inventory.insufficient.description': '以下商品庫存不足或已售罄，請調整購物車後重新提交。',
-    'pisell2.scan.order.inventory.insufficient.products.label': '異常商品：',
-    'pisell2.scan.order.add.on.confirm.title': '本桌已開始點餐',
-    'pisell2.scan.order.add.on.confirm.description': '同行顧客已提交訂單。本次將作為加餐提交，請確認後繼續。',
-    'pisell2.scan.order.add.on.confirm.button': '確認加餐',
-    'pisell2.scan.order.add.on.return.button': '返回購物車',
-    'pisell2.scan.order.add.on.unavailable.title': '暫不支援加餐',
-    'pisell2.scan.order.add.on.unavailable.description': '目前無法透過手機為此訂單加餐。\n如需加餐，請聯絡工作人員。',
-    'pisell2.scan.order.add.on.unavailable.confirm': '我知道了',
-    'pisell2.scan.order.add.on.login.required.title': '提示',
-    'pisell2.scan.order.add.on.login.required': '需要登錄後才能加餐',
     'pisell2.text.goodpass': '促銷',
     'pisell2.text.goodpass.product-vouchers': '商品兌換券',
     'pisell2.text.goodpass.view-more': '查看更多',
@@ -222,21 +177,6 @@ export default {
     'pisell2.scan.order.products.empty.tip': '商品を選択してください',
     'pisell2.scan.order.check.cart.empty.tip': '商品を追加するには、前の画面に戻ってください',
     'pisell2.scan.order.submit.disabled.default': '現在、注文を送信できません。',
-    'pisell2.scan.order.multiple.orders.tip': '現在のテーブルには進行中の注文が複数あります。追加注文についてはスタッフにお問い合わせください。',
-    'pisell2.scan.order.multiple.orders.confirm': '了解しました',
-    'pisell2.scan.order.settled.cannot.add.tip': '現在の注文はすでに会計済みのため、追加注文できません。再度QRコードをスキャンして新しい注文を作成するか、スタッフにお問い合わせください。',
-    'pisell2.scan.order.inventory.insufficient.title': '在庫が不足しています',
-    'pisell2.scan.order.inventory.insufficient.description': '以下の商品は在庫切れ、または在庫が不足しています。カートを調整してからもう一度送信してください。',
-    'pisell2.scan.order.inventory.insufficient.products.label': '対象商品:',
-    'pisell2.scan.order.add.on.confirm.title': 'このテーブルではすでに注文が開始されています',
-    'pisell2.scan.order.add.on.confirm.description': '同席のお客様がすでに注文を送信しました。今回は追加注文として送信されます。確認して続行してください。',
-    'pisell2.scan.order.add.on.confirm.button': '追加注文を確認',
-    'pisell2.scan.order.add.on.return.button': 'カートに戻る',
-    'pisell2.scan.order.add.on.unavailable.title': '追加注文は現在ご利用いただけません',
-    'pisell2.scan.order.add.on.unavailable.description': '現在、スマートフォンからこの注文に商品を追加することはできません。\n追加注文をご希望の場合は、スタッフにお声がけください。',
-    'pisell2.scan.order.add.on.unavailable.confirm': '了解しました',
-    'pisell2.scan.order.add.on.login.required.title': 'お知らせ',
-    'pisell2.scan.order.add.on.login.required': '追加注文を行うにはログインが必要です。',
     'pisell2.text.goodpass': 'プロモーション',
     'pisell2.text.goodpass.product-vouchers': '商品バウチャー',
     'pisell2.text.goodpass.view-more': 'もっと見る',
@@ -286,21 +226,6 @@ export default {
     'pisell2.scan.order.products.empty.tip': 'Selecione produtos',
     'pisell2.scan.order.check.cart.empty.tip': 'Volte para adicionar produtos',
     'pisell2.scan.order.submit.disabled.default': 'No momento, não é possível enviar pedidos.',
-    'pisell2.scan.order.multiple.orders.tip': 'Há vários pedidos ativos nesta mesa. Entre em contato com a equipe para adicionar itens.',
-    'pisell2.scan.order.multiple.orders.confirm': 'Entendi',
-    'pisell2.scan.order.settled.cannot.add.tip': 'Este pedido já foi finalizado e não é possível adicionar mais itens. Escaneie novamente para criar um novo pedido ou entre em contato com a equipe.',
-    'pisell2.scan.order.inventory.insufficient.title': 'Estoque insuficiente',
-    'pisell2.scan.order.inventory.insufficient.description': 'Os seguintes itens estão sem estoque ou não têm estoque suficiente. Ajuste o carrinho e tente novamente.',
-    'pisell2.scan.order.inventory.insufficient.products.label': 'Produtos indisponíveis:',
-    'pisell2.scan.order.add.on.confirm.title': 'Esta mesa já começou a fazer o pedido',
-    'pisell2.scan.order.add.on.confirm.description': 'Alguém na sua mesa já enviou o pedido. Este será enviado como um pedido adicional.',
-    'pisell2.scan.order.add.on.confirm.button': 'Confirmar pedido adicional',
-    'pisell2.scan.order.add.on.return.button': 'Voltar ao carrinho',
-    'pisell2.scan.order.add.on.unavailable.title': 'Pedidos adicionais não estão disponíveis',
-    'pisell2.scan.order.add.on.unavailable.description': 'No momento, você não pode adicionar itens a este pedido pelo celular.\nPeça ajuda a um membro da equipe.',
-    'pisell2.scan.order.add.on.unavailable.confirm': 'Entendi',
-    'pisell2.scan.order.add.on.login.required.title': 'Aviso',
-    'pisell2.scan.order.add.on.login.required': 'Faça login antes de fazer um pedido adicional.',
     'pisell2.text.goodpass': 'Promoção',
     'pisell2.text.goodpass.product-vouchers': 'Vales de Produto',
     'pisell2.text.goodpass.view-more': 'Ver Mais',

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

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

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { shoppingCartProps } from './type';
 declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

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

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

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

@@ -4,21 +4,25 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _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; }
 /**
  * venueBooking 购物车组件
  * 参照 scanOrder/Cart 实现，使用系统内置 ShoppingCart + SubTotal 组件
  * 支持两种模式：embedded（桌面端内嵌）和 drawer（移动端抽屉弹出）
  */
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { message } from 'antd';
 import { Button } from '@pisell/materials';
 import { locales } from '@pisell/utils';
@@ -28,12 +32,15 @@ import SubTotal from "../../../subTotal";
 import VoucherCard from "../Voucher";
 import VenueDeposit from "../Deposit";
 import { useVenueBookingContext } from "../../context";
+import { buildCartHolderParams, getVenueCartHolderConfig } from "../../../../utils/buildCartHolderParams";
+import { getSkuRelationFormId, handleCartHolderFormSuccess } from "../../../../utils/buildCartHolderParams";
+import { openForm, getCustomer } from "../../../appointmentBooking/utils";
 import "./index.less";
 
 /** Cart 组件 Props，与 scanOrder/Cart 对齐 */
 
 export default function Cart(props) {
-  var _engineContext$appHel, _engineContext$appHel2, _engineContext$appHel3, _engineContext$engine, _businessUtils$getApp, _businessUtils$getApp2, _ref, _ref2, _ref3, _summary$total_amount, _summary$deposit3;
+  var _engineContext$appHel, _engineContext$appHel2, _engineContext$appHel3, _engineContext$engine, _engineContext$appHel4, _businessUtils$getApp, _businessUtils$getApp2, _ref2, _ref3, _ref4, _summary$total_amount, _summary$deposit3;
   var open = props.open,
     onCancel = props.onCancel,
     onNext = props.onNext,
@@ -50,34 +57,70 @@ export default function Cart(props) {
     refreshViewModel = _useVenueBookingConte.refreshViewModel,
     venueBookingModule = _useVenueBookingConte.venueBookingModule,
     isAgreeDepositPolicy = _useVenueBookingConte.isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy = _useVenueBookingConte.setIsAgreeDepositPolicy;
+    setIsAgreeDepositPolicy = _useVenueBookingConte.setIsAgreeDepositPolicy,
+    isLogin = _useVenueBookingConte.isLogin;
   var engineContext = useEngineContext();
   var businessUtils = engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 || (_engineContext$appHel = _engineContext$appHel.utils) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.businessUtils;
   var symbol = String((engineContext === null || engineContext === void 0 || (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.utils) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel3 = _engineContext$appHel2.getSymbolic) === null || _engineContext$appHel3 === void 0 ? void 0 : _engineContext$appHel3.call(_engineContext$appHel2)) || '$');
   var locale = (engineContext === null || engineContext === void 0 || (_engineContext$engine = engineContext.engine) === null || _engineContext$engine === void 0 || (_engineContext$engine = _engineContext$engine.props) === null || _engineContext$engine === void 0 ? void 0 : _engineContext$engine.locale) || 'en';
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    holderMap = _useState2[0],
+    setHolderMap = _useState2[1];
+  var _ref = (engineContext === null || engineContext === void 0 || (_engineContext$appHel4 = engineContext.appHelper) === null || _engineContext$appHel4 === void 0 ? void 0 : _engineContext$appHel4.utils) || {},
+    pisellos = _ref.pisellos,
+    translation = _ref.translation;
 
   // 是否安装商品券/折扣卡应用
   var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
   var hasDiscountCardApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp2 = businessUtils.getAppByModal) !== null && _businessUtils$getApp2 !== void 0 && _businessUtils$getApp2.call(businessUtils, 'discountcard'));
   var showVoucher = hasGoodPassApp || hasDiscountCardApp;
+  useEffect(function () {
+    var _pisellos$effects;
+    var onHolderChanged = function onHolderChanged(res) {
+      if ((res === null || res === void 0 ? void 0 : res.path) === 'holderMap') {
+        setHolderMap(res === null || res === void 0 ? void 0 : res.value);
+      }
+    };
+    pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on('venueBooking_holder:changed', onHolderChanged);
+    return function () {
+      var _pisellos$effects2;
+      pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off('venueBooking_holder:changed', onHolderChanged);
+    };
+  }, []);
+  useEffect(function () {
+    var _holderMap = (venueBookingModule === null || venueBookingModule === void 0 ? void 0 : venueBookingModule.getHolderFormMap()) || {};
+    setHolderMap(_holderMap);
+  }, [venueBookingModule]);
 
   // 可见判断：内嵌模式始终可见，抽屉模式需 open 为 true
   var isVisible = embedded || open;
   if (!isVisible) return null;
 
   // 从 summary 中提取总金额（兼容多种字段名）
-  var totalAmount = (_ref = (_ref2 = (_ref3 = (_summary$total_amount = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount !== void 0 ? _summary$total_amount : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref3 !== void 0 ? _ref3 : summary === null || summary === void 0 ? void 0 : summary.amount) !== null && _ref2 !== void 0 ? _ref2 : summary === null || summary === void 0 ? void 0 : summary.total) !== null && _ref !== void 0 ? _ref : '0.00';
+  var totalAmount = (_ref2 = (_ref3 = (_ref4 = (_summary$total_amount = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount !== void 0 ? _summary$total_amount : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref4 !== void 0 ? _ref4 : summary === null || summary === void 0 ? void 0 : summary.amount) !== null && _ref3 !== void 0 ? _ref3 : summary === null || summary === void 0 ? void 0 : summary.total) !== null && _ref2 !== void 0 ? _ref2 : '0.00';
 
   // VenueBooking 场景下不展示 ProductCard 的 like（心形）图标，
   // 通过在 item 层注入 is_hide_like 覆盖 Time 组件的渲染条件
   var cartProducts = useMemo(function () {
     return (items || []).map(function (item) {
+      var _item$_origin;
+      var holderConfig = getVenueCartHolderConfig(item);
+      var formData = holderMap === null || holderMap === void 0 ? void 0 : holderMap[holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id];
+      var holderParams = buildCartHolderParams({
+        item: item,
+        holderConfig: holderConfig,
+        formData: formData,
+        translation: translation,
+        enabled: !!(item !== null && item !== void 0 && (_item$_origin = item._origin) !== null && _item$_origin !== void 0 && (_item$_origin = _item$_origin.product) !== null && _item$_origin !== void 0 && _item$_origin.bookingUuid)
+      });
       return _objectSpread(_objectSpread({}, item), {}, {
         symbol: (item === null || item === void 0 ? void 0 : item.symbol) || symbol,
-        is_hide_like: true
-      });
+        is_hide_like: true,
+        allowClearHolder: true
+      }, holderParams);
     });
-  }, [items, symbol]);
+  }, [items, symbol, holderMap, translation]);
 
   // 按钮文案：最后一步显示"立即支付"，其余步骤统一显示"下一步"
   var confirmOrderText = currentStep === 'checkout' ? String(locales.getText('pisell2.venue.action.pay.now') || '立即支付') : String(locales.getText('pisell2.venue.action.next') || '下一步');
@@ -88,10 +131,10 @@ export default function Cart(props) {
    * surcharges 为服务费列表，label 支持多语言对象，按当前 locale 取值
    */
   var subTotalList = useMemo(function () {
-    var _summary$product_amou, _summary$tax_fee, _ref4, _summary$total_amount2, _summary$deposit, _venueBookingModule$g, _tempSummary$is_price, _summary$deposit$tota, _summary$deposit2;
+    var _summary$product_amou, _summary$tax_fee, _ref5, _summary$total_amount2, _summary$deposit, _venueBookingModule$g, _tempSummary$is_price, _summary$deposit$tota, _summary$deposit2;
     var subTotal = Number((_summary$product_amou = summary === null || summary === void 0 ? void 0 : summary.product_amount) !== null && _summary$product_amou !== void 0 ? _summary$product_amou : 0);
     var totalTaxFee = Number((_summary$tax_fee = summary === null || summary === void 0 ? void 0 : summary.tax_fee) !== null && _summary$tax_fee !== void 0 ? _summary$tax_fee : 0);
-    var total = Number((_ref4 = (_summary$total_amount2 = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount2 !== void 0 ? _summary$total_amount2 : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref4 !== void 0 ? _ref4 : 0);
+    var total = Number((_ref5 = (_summary$total_amount2 = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount2 !== void 0 ? _summary$total_amount2 : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref5 !== void 0 ? _ref5 : 0);
     var hasDeposit = !!(summary !== null && summary !== void 0 && (_summary$deposit = summary.deposit) !== null && _summary$deposit !== void 0 && _summary$deposit.hasDeposit);
     var tempOrder = venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g = venueBookingModule.getTempOrder) === null || _venueBookingModule$g === void 0 ? void 0 : _venueBookingModule$g.call(venueBookingModule);
     var tempSummary = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.summary) || {};
@@ -155,75 +198,145 @@ export default function Cart(props) {
     return false;
   };
   var handleCartChange = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item, type, sourceItem) {
-      var _ref6, _targetItem$product_i, _targetItem$product_v;
-      var targetItem, productId, productVariantId, identityKey;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item, type, sourceItem) {
+      var _ref7, _targetItem$product_i, _targetItem$product_v;
+      var _getVenueCartHolderCo, _engineContext$appHel5, formId, skuRelationFormId, _engineContext$appHel8, _item$_origin3, customer, params, targetItem, productId, productVariantId, identityKey;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            if (!(type === 'add_holder')) {
+              _context2.next = 6;
+              break;
+            }
+            formId = (_getVenueCartHolderCo = getVenueCartHolderConfig(item)) === null || _getVenueCartHolderCo === void 0 ? void 0 : _getVenueCartHolderCo.resource_id;
+            if (formId) {
+              _context2.next = 4;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 4:
+            skuRelationFormId = getSkuRelationFormId(holderMap, formId);
+            return _context2.abrupt("return", openForm({
+              form_id: skuRelationFormId || formId,
+              title: locales.getText('pisell2.venue.create.form'),
+              utils: engineContext === null || engineContext === void 0 || (_engineContext$appHel5 = engineContext.appHelper) === null || _engineContext$appHel5 === void 0 ? void 0 : _engineContext$appHel5.utils,
+              callback: function () {
+                var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+                  var _engineContext$appHel6, _engineContext$appHel7, _item$_origin2, _handleCartHolderForm, formRecordId, holderFormId, customer;
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!((res === null || res === void 0 ? void 0 : res.status) === 'success')) {
+                          _context.next = 6;
+                          break;
+                        }
+                        _handleCartHolderForm = handleCartHolderFormSuccess({
+                          res: res,
+                          formId: formId,
+                          skuRelationFormId: skuRelationFormId,
+                          utils: engineContext === null || engineContext === void 0 || (_engineContext$appHel6 = engineContext.appHelper) === null || _engineContext$appHel6 === void 0 ? void 0 : _engineContext$appHel6.utils,
+                          module: venueBookingModule
+                        }), formRecordId = _handleCartHolderForm.formRecordId, holderFormId = _handleCartHolderForm.formId;
+                        customer = getCustomer(engineContext === null || engineContext === void 0 || (_engineContext$appHel7 = engineContext.appHelper) === null || _engineContext$appHel7 === void 0 ? void 0 : _engineContext$appHel7.utils);
+                        venueBookingModule.setBookingHolder(item === null || item === void 0 || (_item$_origin2 = item._origin) === null || _item$_origin2 === void 0 || (_item$_origin2 = _item$_origin2.product) === null || _item$_origin2 === void 0 ? void 0 : _item$_origin2.bookingUuid, {
+                          customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+                          form_id: holderFormId,
+                          form_record: [formRecordId]
+                        });
+                        _context.next = 6;
+                        return refreshViewModel();
+                      case 6:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }));
+                function callback(_x4) {
+                  return _callback.apply(this, arguments);
+                }
+                return callback;
+              }()
+            }));
+          case 6:
+            if (!(type === 'change_holder')) {
+              _context2.next = 13;
+              break;
+            }
+            customer = getCustomer(engineContext === null || engineContext === void 0 || (_engineContext$appHel8 = engineContext.appHelper) === null || _engineContext$appHel8 === void 0 ? void 0 : _engineContext$appHel8.utils);
+            params = !sourceItem ? null : {
+              customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+              form_id: sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.form_id,
+              form_record: [sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.form_record_id]
+            };
+            venueBookingModule.setBookingHolder(item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.bookingUuid, params);
+            _context2.next = 12;
+            return refreshViewModel();
+          case 12:
+            return _context2.abrupt("return");
+          case 13:
             if (!(type !== 'delete')) {
-              _context.next = 2;
+              _context2.next = 15;
               break;
             }
-            return _context.abrupt("return");
-          case 2:
+            return _context2.abrupt("return");
+          case 15:
             targetItem = sourceItem && _typeof(sourceItem) === 'object' ? sourceItem : item;
             if (!(currentStep !== 'select-venue' && isVenueBookingCartItem(targetItem))) {
-              _context.next = 6;
+              _context2.next = 19;
               break;
             }
             message.warning({
               content: String(locales.getText('pisell2.venue.cart.delete.venue.only.step1') || '请返回第一步后再删除场地商品'),
               duration: 2
             });
-            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;
+            return _context2.abrupt("return");
+          case 19:
+            productId = (_ref7 = (_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 && _ref7 !== void 0 ? _ref7 : 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); // 不透明 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;
+              _context2.next = 24;
               break;
             }
-            return _context.abrupt("return");
-          case 11:
+            return _context2.abrupt("return");
+          case 24:
             if (!(typeof identityKey !== 'string' || identityKey.length === 0)) {
-              _context.next = 14;
+              _context2.next = 27;
               break;
             }
             console.error('[venueBooking] removeProductFromOrder skipped: missing identity_key', {
               item: targetItem
             });
-            return _context.abrupt("return");
-          case 14:
-            _context.prev = 14;
-            _context.next = 17;
+            return _context2.abrupt("return");
+          case 27:
+            _context2.prev = 27;
+            _context2.next = 30;
             return runModuleAction('removeProductFromOrder', {
               product_id: productId,
               product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
               identity_key: identityKey
             });
-          case 17:
-            _context.next = 19;
+          case 30:
+            _context2.next = 32;
             return refreshViewModel();
-          case 19:
-            _context.next = 24;
+          case 32:
+            _context2.next = 37;
             break;
-          case 21:
-            _context.prev = 21;
-            _context.t0 = _context["catch"](14);
+          case 34:
+            _context2.prev = 34;
+            _context2.t0 = _context2["catch"](27);
             console.error('[venueBooking] removeProductFromOrder failed', {
-              error: _context.t0,
+              error: _context2.t0,
               item: targetItem
             });
-          case 24:
+          case 37:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[14, 21]]);
+      }, _callee2, null, [[27, 34]]);
     }));
     return function handleCartChange(_x, _x2, _x3) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -244,9 +357,9 @@ export default function Cart(props) {
       isShowNote: false,
       isShowDelete: true,
       isShowPackageNote: false,
-      isShowChangeHolder: false,
-      isShowHolder: false,
-      isShowAddHolderButton: false
+      isShowChangeHolder: currentStep === 'checkout' ? false : !!isLogin,
+      isShowHolder: true,
+      isShowAddHolderButton: true
     },
     platform: "h5",
     emptyText: locales.getText('pisell2.venue.cart.empty'),

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

@@ -189,12 +189,7 @@ export default function VoucherCard() {
       className: "login-btn",
       onClick: function onClick() {
         openLoginModal({
-          callback: function callback(status) {
-            if (status !== 'success') return;
-            handleLoginSuccess().then(function () {
-              void syncAfterDiscountChange();
-            });
-          }
+          callback: function callback() {}
         });
       }
     }, locales.getText('pisell2.text.goodpass.login')), ' ', /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.text.goodpass.login-tip'))));

package/es/components/venueBooking/context.js

@@ -25,6 +25,7 @@ import { usePisellOS } from "../../hooks/useEngineContext";
 import useEngineContext from "../../hooks/useEngineContext";
 import { VENUE_PRODUCT_IDS, useVenueBookingModule, useVenueBookingLogin, safeRunModuleAction, createVenueBookingViewModel, loadVenueProducts, fetchResourceAvailability, getDateRangeSummary, getTimeSlotGrid, toggleSlotAction, getAllSelectedSlots, getOtherParams } from "./hooks";
 import { formatDateKey, getWeekDays } from "./utils";
+import { getVenueCartHolderConfig, validateRequiredCartHolders } from "../../utils/buildCartHolderParams";
 var VenueBookingContext = /*#__PURE__*/createContext(undefined);
 
 /** 初始视图模型：所有数据从 OS 模块获取，初始为空 */
@@ -882,8 +883,20 @@ export function VenueBookingProvider(_ref) {
       });
       return;
     }
+
+    // 如果当前步骤是 addons，则校验购物车中的 holder 数据
+    if (currentStep === 'addons') {
+      var _validateRequiredCart = validateRequiredCartHolders({
+          items: viewModel.cartItems,
+          getHolderConfig: getVenueCartHolderConfig
+        }),
+        hasError = _validateRequiredCart.hasError;
+      if (hasError) {
+        return;
+      }
+    }
     goToStep('checkout');
-  }, [isLogin, openLoginModal, handleLoginSuccess, goToStep, venueBookingModule]);
+  }, [isLogin, openLoginModal, handleLoginSuccess, goToStep, venueBookingModule, currentStep, viewModel.cartItems, getVenueCartHolderConfig]);
 
   /** 主操作按钮行为（含登录门禁，自适应 2/3 步流程） */
   var handlePrimaryAction = useCallback(function () {
@@ -915,7 +928,7 @@ export function VenueBookingProvider(_ref) {
       return;
     }
     void handleSubmitOrder();
-  }, [currentStep, canNext, isAgreeDepositPolicy, viewModel.summary, stepList, proceedToCheckout, goToStep, handleSubmitOrder]);
+  }, [currentStep, canNext, isAgreeDepositPolicy, viewModel.summary, stepList, goToStep, handleSubmitOrder, proceedToCheckout]);
 
   // ── 监听全局登录成功事件（Voucher 区域内登录等场景） ──
   // 仅依赖 pubsub 实例，回调经 ref 取最新实现，避免 handleLoginSuccess 重建

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

@@ -126,6 +126,7 @@ declare const _default: {
         'pisell2.appointment.policy.confirm': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.product-select.search': string;
+        'pisell2.venue.create.form': string;
     };
     'zh-CN': {
         'pisell2.venue.step.select': string;
@@ -250,6 +251,7 @@ declare const _default: {
         'pisell2.appointment.policy.confirm': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.product-select.search': string;
+        'pisell2.venue.create.form': string;
     };
     'zh-HK': {
         'pisell2.venue.step.select': string;
@@ -374,6 +376,7 @@ declare const _default: {
         'pisell2.appointment.policy.confirm': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.product-select.search': string;
+        'pisell2.venue.create.form': string;
     };
     ja: {
         'pisell2.venue.step.select': string;
@@ -498,6 +501,7 @@ declare const _default: {
         'pisell2.appointment.policy.confirm': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.product-select.search': string;
+        'pisell2.venue.create.form': string;
     };
     pt: {
         'pisell2.venue.step.select': string;
@@ -622,6 +626,7 @@ declare const _default: {
         'pisell2.appointment.policy.confirm': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.product-select.search': string;
+        'pisell2.venue.create.form': string;
     };
 };
 export default _default;

package/es/components/venueBooking/locales.js

@@ -125,7 +125,8 @@ export default {
     'pisell2.appointment.policy': 'You have read and agreed to this policy',
     'pisell2.appointment.policy.confirm': 'Confirm',
     'pisell2.appointment.booking.empty.data': 'No data',
-    'pisell2.product-select.search': 'Search'
+    'pisell2.product-select.search': 'Search',
+    'pisell2.venue.create.form': 'Create form'
   },
   'zh-CN': {
     'pisell2.venue.step.select': '选择场地',
@@ -249,7 +250,8 @@ export default {
     'pisell2.appointment.policy': '您已仔细阅读并同意此协议',
     'pisell2.appointment.policy.confirm': '确定',
     'pisell2.appointment.booking.empty.data': '暂无数据',
-    'pisell2.product-select.search': '搜索'
+    'pisell2.product-select.search': '搜索',
+    'pisell2.venue.create.form': '创建表单'
   },
   'zh-HK': {
     'pisell2.venue.step.select': '選擇場地',
@@ -373,7 +375,8 @@ export default {
     'pisell2.appointment.policy': '您已仔細閱讀並同意此協議',
     'pisell2.appointment.policy.confirm': '確定',
     'pisell2.appointment.booking.empty.data': '暫無數據',
-    'pisell2.product-select.search': '搜索'
+    'pisell2.product-select.search': '搜索',
+    'pisell2.venue.create.form': '创建表单'
   },
   ja: {
     'pisell2.venue.step.select': 'コートを選択',
@@ -497,7 +500,8 @@ export default {
     'pisell2.appointment.policy': 'このポリシーを読み、同意しました',
     'pisell2.appointment.policy.confirm': '確認',
     'pisell2.appointment.booking.empty.data': 'データなし',
-    'pisell2.product-select.search': '検索'
+    'pisell2.product-select.search': '検索',
+    'pisell2.venue.create.form': 'フォームを作成'
   },
   pt: {
     'pisell2.venue.step.select': 'Escolher quadra',
@@ -621,6 +625,7 @@ export default {
     'pisell2.appointment.policy': 'Você leu e concordou com esta política',
     'pisell2.appointment.policy.confirm': 'Confirmar',
     'pisell2.appointment.booking.empty.data': 'Sem dados',
-    'pisell2.product-select.search': 'Pesquisar'
+    'pisell2.product-select.search': 'Pesquisar',
+    'pisell2.venue.create.form': 'Criar formulário'
   }
 };