@pisell/private-materials 6.3.177 → 6.3.178

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/es/plus/skuOptionsSelection/components/NormalCard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 declare const NormalCard: (props: RenderItemProps & {
     parentDataSource: any;

package/es/pro/Login2.0/locales.js

@@ -259,7 +259,7 @@ export default {
     'pisell-register2-complete-title': '注册完成!',
     'pisell-register2-redirecting': '正在重定向到您的帐户...',
     'pisell-login2-continue-with-email': '使用邮箱',
-    'pisell-login2-continue-with-phone': '使用手机号继续',
+    'pisell-login2-continue-with-phone': '使用手机',
     'pisell-login2-email-not-registered': '该邮箱未注册，请先注册',
     'pisell-login2-check-email-failed': '检查邮箱失败，请重试',
     'pisell-login2-continue-failed': '继续失败，请重试',

package/es/utils/buildCartHolderParams.d.ts

@@ -0,0 +1,92 @@
+/** ProductCard Time 组件所需的 holder 展示字段 */
+export interface CartHolderParams {
+    holder_id?: number;
+    isErrorHolder?: boolean;
+    isShowChangeHolder?: boolean;
+    addHolderButtonText?: string;
+    holder_title?: string;
+    holders?: Array<{
+        id: any;
+        label: any;
+        [key: string]: any;
+    }>;
+}
+export interface BuildCartHolderParamsOptions {
+    /** 购物车行数据 */
+    item: any;
+    /** holder 配置，通常来自 item._productInit.holder_config 或 item._origin.product.holder_config */
+    holderConfig?: Record<string, any>;
+    /** getHolderFormMap 中对应 resource_id 的表单数据 */
+    formData?: Record<string, any>;
+    /** 多语言翻译函数 */
+    translation: (value: any) => string;
+    /** 是否注入 holder 字段，由业务侧决定（如预约商品 / 含 duration 的场地商品） */
+    enabled?: boolean;
+}
+/**
+ * 从购物车行解析当前选中的 holder form_record_id。
+ *
+ * venueBooking：以 _origin.holder 为准（SDK 会原地更新 form_record）；
+ * 顶层 item.holder_id 可能是上一轮 UI 注入或 SDK 回灌的滞后值，不能优先于 _origin.holder。
+ */
+export declare const resolveCartItemHolderId: (item: any) => number | undefined;
+/**
+ * 根据 holderMap 与购物车行数据，构建 ProductCard 所需的 holder 展示字段。
+ * 供 appointmentBooking、venueBooking 等购物车场景复用。
+ */
+export declare const buildCartHolderParams: ({ item, holderConfig, formData, translation, enabled, }: BuildCartHolderParamsOptions) => CartHolderParams;
+/**
+ * 从 appointmentBooking 购物车行读取 holder_config
+ */
+export declare const getAppointmentCartHolderConfig: (item: any) => any;
+/**
+ * 从 venueBooking 购物车行读取 holder_config
+ */
+export declare const getVenueCartHolderConfig: (item: any) => any;
+export interface ValidateRequiredCartHoldersOptions {
+    items?: any[];
+    getHolderConfig?: (item: any) => Record<string, any>;
+    /** 是否校验该行，默认全部校验 */
+    shouldValidateItem?: (item: any) => boolean;
+}
+/**
+ * 校验购物车中 holder_config.required 的行是否已选择 holder。
+ */
+export declare const validateRequiredCartHolders: ({ items, getHolderConfig, }: ValidateRequiredCartHoldersOptions) => {
+    hasError: boolean;
+    invalidItems: any[];
+};
+export interface CartHolderFormModule {
+    appendFormRecord?: (params: {
+        record: any;
+    }) => void;
+    refreshAllHolderFormRecords?: (params: {
+        customer_id?: any;
+    }) => void;
+}
+export interface HandleCartHolderFormSuccessOptions {
+    res: any;
+    formId?: number | string;
+    skuRelationFormId: number;
+    utils: any;
+    module: CartHolderFormModule;
+}
+export interface CartHolderFormSuccessResult {
+    formRecordId: any;
+    mainField: any;
+    formId: any;
+}
+/**
+ * 从 holderMap 解析 minors 表单关联的 sku 关系表单 ID（form_to_form 隐藏字段的 linkedTable）。
+ */
+export declare const getSkuRelationFormId: (holderMap: Record<string, any>, formId?: number | string) => number;
+/**
+ * 从 form_to_form_value 中取最新创建的 form_record_id。
+ */
+export declare const getSkuRelationFormRecordId: (res: any) => any;
+/**
+ * 处理购物车添加 holder 表单提交成功后的公共逻辑。
+ * - minors 关联表单：刷新 holder 列表，取 form_to_form_value 中的 record id
+ * - 普通表单：appendFormRecord 并直接使用 form_record_id
+ */
+export declare const handleCartHolderFormSuccess: ({ res, formId, skuRelationFormId, utils, module, }: HandleCartHolderFormSuccessOptions) => CartHolderFormSuccessResult;

package/es/utils/buildCartHolderParams.js

@@ -0,0 +1,191 @@
+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 _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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; }
+import { getCustomer } from "../components/appointmentBooking/utils";
+
+/** ProductCard Time 组件所需的 holder 展示字段 */
+
+var toHolderRecordId = function toHolderRecordId(value) {
+  if (value == null || value === '') return undefined;
+  var id = Number(value);
+  return Number.isNaN(id) ? undefined : id;
+};
+
+/**
+ * 从 _origin.holder 解析 form_record_id。
+ * form_record 可能是 number、number[]；不能假定一定是数组下标 [0]。
+ */
+var resolveOriginHolderId = function resolveOriginHolderId(holder) {
+  var formRecord = holder === null || holder === void 0 ? void 0 : holder.form_record;
+  if (Array.isArray(formRecord)) {
+    var _iterator = _createForOfIteratorHelper(formRecord),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _value = _step.value;
+        var id = toHolderRecordId(_value);
+        if (id != null) return id;
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  } else {
+    var _id = toHolderRecordId(formRecord);
+    if (_id != null) return _id;
+  }
+  return toHolderRecordId(holder === null || holder === void 0 ? void 0 : holder.form_record_id);
+};
+
+/**
+ * 从购物车行解析当前选中的 holder form_record_id。
+ *
+ * venueBooking：以 _origin.holder 为准（SDK 会原地更新 form_record）；
+ * 顶层 item.holder_id 可能是上一轮 UI 注入或 SDK 回灌的滞后值，不能优先于 _origin.holder。
+ */
+export var resolveCartItemHolderId = function resolveCartItemHolderId(item) {
+  var _item$_origin;
+  var originHolder = item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 ? void 0 : _item$_origin.holder;
+  if (originHolder && _typeof(originHolder) === 'object') {
+    return resolveOriginHolderId(originHolder);
+  }
+  return toHolderRecordId(item === null || item === void 0 ? void 0 : item.holder_id);
+};
+
+/**
+ * 根据 holderMap 与购物车行数据，构建 ProductCard 所需的 holder 展示字段。
+ * 供 appointmentBooking、venueBooking 等购物车场景复用。
+ */
+export var buildCartHolderParams = function buildCartHolderParams(_ref) {
+  var _formData$form, _records$find;
+  var item = _ref.item,
+    _ref$holderConfig = _ref.holderConfig,
+    holderConfig = _ref$holderConfig === void 0 ? {} : _ref$holderConfig,
+    formData = _ref.formData,
+    translation = _ref.translation,
+    _ref$enabled = _ref.enabled,
+    enabled = _ref$enabled === void 0 ? true : _ref$enabled;
+  if (!enabled) {
+    return {
+      isShowChangeHolder: false,
+      holders: []
+    };
+  }
+  var records = (formData === null || formData === void 0 ? void 0 : formData.records) || [];
+  var holderId = resolveCartItemHolderId(item);
+  return {
+    holder_id: holderId,
+    isErrorHolder: !!(!holderId && holderConfig !== null && holderConfig !== void 0 && holderConfig.required),
+    isShowChangeHolder: (holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.status) === 'enable',
+    addHolderButtonText: translation(formData === null || formData === void 0 || (_formData$form = formData.form) === null || _formData$form === void 0 || (_formData$form = _formData$form.form) === null || _formData$form === void 0 || (_formData$form = _formData$form.setting) === null || _formData$form === void 0 ? void 0 : _formData$form.title),
+    holder_title: holderId ? (_records$find = records.find(function (record) {
+      return Number(record === null || record === void 0 ? void 0 : record.form_record_id) === holderId;
+    })) === null || _records$find === void 0 ? void 0 : _records$find.main_field : '',
+    holders: records.map(function (record) {
+      return _objectSpread(_objectSpread({}, record), {}, {
+        id: record === null || record === void 0 ? void 0 : record.form_record_id,
+        label: record === null || record === void 0 ? void 0 : record.main_field
+      });
+    })
+  };
+};
+
+/**
+ * 从 appointmentBooking 购物车行读取 holder_config
+ */
+export var getAppointmentCartHolderConfig = function getAppointmentCartHolderConfig(item) {
+  var _item$_productInit;
+  return (item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.holder_config) || {};
+};
+
+/**
+ * 从 venueBooking 购物车行读取 holder_config
+ */
+export var getVenueCartHolderConfig = function getVenueCartHolderConfig(item) {
+  var _item$_origin2;
+  return (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.holder_config) || {};
+};
+/**
+ * 校验购物车中 holder_config.required 的行是否已选择 holder。
+ */
+export var validateRequiredCartHolders = function validateRequiredCartHolders(_ref2) {
+  var _ref2$items = _ref2.items,
+    items = _ref2$items === void 0 ? [] : _ref2$items,
+    _ref2$getHolderConfig = _ref2.getHolderConfig,
+    getHolderConfig = _ref2$getHolderConfig === void 0 ? getVenueCartHolderConfig : _ref2$getHolderConfig;
+  console.log(items, 'items1111');
+  var invalidItems = items.filter(function (item) {
+    var holderConfig = getHolderConfig(item);
+    if (!(holderConfig !== null && holderConfig !== void 0 && holderConfig.required)) return false;
+    return !resolveCartItemHolderId(item);
+  });
+  return {
+    hasError: invalidItems.length > 0,
+    invalidItems: invalidItems
+  };
+};
+/**
+ * 从 holderMap 解析 minors 表单关联的 sku 关系表单 ID（form_to_form 隐藏字段的 linkedTable）。
+ */
+export var getSkuRelationFormId = function getSkuRelationFormId(holderMap, formId) {
+  var _formData$form2, _formData$form3, _detail$setting;
+  if (!formId) return 0;
+  var formData = holderMap === null || holderMap === void 0 ? void 0 : holderMap[formId];
+  if ((formData === null || formData === void 0 || (_formData$form2 = formData.form) === null || _formData$form2 === void 0 || (_formData$form2 = _formData$form2.form) === null || _formData$form2 === void 0 ? void 0 : _formData$form2.form_type) !== 'minors') return 0;
+  var detail = formData === null || formData === void 0 || (_formData$form3 = formData.form) === null || _formData$form3 === void 0 || (_formData$form3 = _formData$form3.field) === null || _formData$form3 === void 0 ? void 0 : _formData$form3.find(function (item) {
+    return item.filed_type === 'form_to_form' && item.status === 'hide';
+  });
+  return (detail === null || detail === void 0 || (_detail$setting = detail.setting) === null || _detail$setting === void 0 ? void 0 : _detail$setting.linkedTable) || 0;
+};
+
+/**
+ * 从 form_to_form_value 中取最新创建的 form_record_id。
+ */
+export var getSkuRelationFormRecordId = function getSkuRelationFormRecordId(res) {
+  var _res$values;
+  var formToFormValue = res === null || res === void 0 || (_res$values = res.values) === null || _res$values === void 0 || (_res$values = _res$values.form_to_form_value) === null || _res$values === void 0 ? void 0 : _res$values[0];
+  var formDataValue = (formToFormValue === null || formToFormValue === void 0 ? void 0 : formToFormValue.form_data_value) || [];
+  return formDataValue[formDataValue.length - 1];
+};
+
+/**
+ * 处理购物车添加 holder 表单提交成功后的公共逻辑。
+ * - minors 关联表单：刷新 holder 列表，取 form_to_form_value 中的 record id
+ * - 普通表单：appendFormRecord 并直接使用 form_record_id
+ */
+export var handleCartHolderFormSuccess = function handleCartHolderFormSuccess(_ref3) {
+  var _res$values2, _res$values3, _res$values4;
+  var res = _ref3.res,
+    formId = _ref3.formId,
+    skuRelationFormId = _ref3.skuRelationFormId,
+    utils = _ref3.utils,
+    module = _ref3.module;
+  var formRecordId = res === null || res === void 0 || (_res$values2 = res.values) === null || _res$values2 === void 0 ? void 0 : _res$values2.form_record_id;
+  var resolvedFormId = res === null || res === void 0 || (_res$values3 = res.values) === null || _res$values3 === void 0 ? void 0 : _res$values3.form_id;
+  if (formId && skuRelationFormId) {
+    var _module$refreshAllHol;
+    var customer = getCustomer(utils);
+    module === null || module === void 0 || (_module$refreshAllHol = module.refreshAllHolderFormRecords) === null || _module$refreshAllHol === void 0 || _module$refreshAllHol.call(module, {
+      customer_id: customer === null || customer === void 0 ? void 0 : customer.id
+    });
+    formRecordId = getSkuRelationFormRecordId(res);
+    resolvedFormId = formId;
+  } else if (formId) {
+    var _module$appendFormRec;
+    module === null || module === void 0 || (_module$appendFormRec = module.appendFormRecord) === null || _module$appendFormRec === void 0 || _module$appendFormRec.call(module, {
+      record: res === null || res === void 0 ? void 0 : res.values
+    });
+  }
+  return {
+    formRecordId: formRecordId,
+    mainField: res === null || res === void 0 || (_res$values4 = res.values) === null || _res$values4 === void 0 ? void 0 : _res$values4.main_field,
+    formId: resolvedFormId
+  };
+};

package/lib/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/lib/components/appointmentBooking/components/Cart/Item/index.js

@@ -44,6 +44,8 @@ var import_utils2 = require("../../../utils");
 var import_Voucher = __toESM(require("../../Voucher"));
 var import_Deposit = __toESM(require("../../Deposit"));
 var import_utils3 = require("../utils");
+var import_buildCartHolderParams = require("../../../../../utils/buildCartHolderParams");
+var import_buildCartHolderParams2 = require("../../../../../utils/buildCartHolderParams");
 var import_index = require("./index.less");
 var CartItem = ({ onNext, renderContactInfo }) => {
   var _a, _b, _c, _d, _e;
@@ -64,8 +66,26 @@ var CartItem = ({ onNext, renderContactInfo }) => {
   const { isFormSubject, bookingSubject, isRetailTemplate } = (0, import_hooks2.useAppointmentBookingSetting)();
   const { isLogin } = (0, import_hooks2.useAppointmentBookingLogin)();
   const utils = (0, import_hooks2.contextUtils)();
-  const { businessUtils, translation } = utils;
+  const { businessUtils, translation, pisellos } = utils;
   const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = summary;
+  const [holderMap, setHolderMap] = (0, import_react.useState)({});
+  (0, import_react.useEffect)(() => {
+    var _a2;
+    const onHolderChanged = (res) => {
+      if ((res == null ? void 0 : res.path) === "holderMap") {
+        setHolderMap(res == null ? void 0 : res.value);
+      }
+    };
+    (_a2 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a2.on("appointmentBooking_holder:changed", onHolderChanged);
+    return () => {
+      var _a3;
+      (_a3 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a3.off("appointmentBooking_holder:changed", onHolderChanged);
+    };
+  }, []);
+  (0, import_react.useEffect)(() => {
+    const _holderMap = (appointmentBooking == null ? void 0 : appointmentBooking.getHolderFormMap()) || {};
+    setHolderMap(_holderMap);
+  }, []);
   const currentUser = (0, import_react.useMemo)(() => {
     return (0, import_utils2.formatCurrentUser)(utils) || {};
   }, []);
@@ -80,6 +100,7 @@ var CartItem = ({ onNext, renderContactInfo }) => {
   const hasGoodPassApp = !!((_a = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a.call(businessUtils, "goodpass"));
   const hasDiscountCardApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "discountcard"));
   const handleClickCard = (e, type, val) => {
+    var _a2, _b2;
     console.log(e, type, val, "handleClickCard");
     if (type === "note") {
       return appointmentBooking.updateCart({
@@ -119,13 +140,32 @@ var CartItem = ({ onNext, renderContactInfo }) => {
     }
     if (type === "add_holder") {
       const relationShipFormId = bookingSubject == null ? void 0 : bookingSubject.relationship_form_id;
+      const formId = (_b2 = (_a2 = e == null ? void 0 : e._productInit) == null ? void 0 : _a2.holder_config) == null ? void 0 : _b2.resource_id;
+      const skuRelationFormId = (0, import_buildCartHolderParams2.getSkuRelationFormId)(holderMap, formId);
       return (0, import_utils2.openForm)({
-        form_id: relationShipFormId || (bookingSubject == null ? void 0 : bookingSubject.form_id),
+        form_id: skuRelationFormId || formId || relationShipFormId || (bookingSubject == null ? void 0 : bookingSubject.form_id),
         title: import_utils.locales.getText("pisell2.event.create.form"),
         utils,
         callback: async (res) => {
           if ((res == null ? void 0 : res.status) === "success") {
             let result = void 0;
+            if (formId) {
+              const { formRecordId, mainField } = (0, import_buildCartHolderParams2.handleCartHolderFormSuccess)({
+                res,
+                formId,
+                skuRelationFormId,
+                utils,
+                module: appointmentBooking
+              });
+              appointmentBooking.updateCart({
+                _id: e == null ? void 0 : e._id,
+                account: {
+                  id: formRecordId,
+                  username: mainField
+                }
+              });
+              return;
+            }
             if (!relationShipFormId) {
               result = await addAccount(res == null ? void 0 : res.values, "holder");
             } else {
@@ -151,13 +191,26 @@ var CartItem = ({ onNext, renderContactInfo }) => {
   };
   const products = (0, import_react.useMemo)(() => {
     if (!(carts == null ? void 0 : carts.length)) return [];
-    carts.forEach((item) => {
-      item.isShowChangeHolder = !appointmentBooking.isTargetCartIdNormalProduct(
+    const enrichedCarts = carts.map((item) => {
+      const isNormalProduct = appointmentBooking.isTargetCartIdNormalProduct(
         item == null ? void 0 : item._id
       );
+      const holderConfig = (0, import_buildCartHolderParams.getAppointmentCartHolderConfig)(item);
+      const formData = holderMap == null ? void 0 : holderMap[holderConfig == null ? void 0 : holderConfig.resource_id];
+      const holderParams = (0, import_buildCartHolderParams.buildCartHolderParams)({
+        item,
+        holderConfig,
+        formData,
+        translation,
+        enabled: !isFormSubject ? false : !isNormalProduct
+      });
+      return {
+        ...item,
+        ...holderParams
+      };
     });
     if ((currentSelectedResources == null ? void 0 : currentSelectedResources.length) > 0) {
-      const newCarts = carts.map((item) => {
+      const newCarts = enrichedCarts.map((item) => {
         const currentResourceData = currentSelectedResources.find(
           (resource) => (resource == null ? void 0 : resource._id) === (item == null ? void 0 : item._id)
         );
@@ -169,15 +222,22 @@ var CartItem = ({ onNext, renderContactInfo }) => {
         return {
           ...item,
           isMultipleResource: true,
-          multiResources,
-          isErrorHolder: isErrorHolder || false
+          multiResources
+          // isErrorHolder: isErrorHolder || false,
         };
       });
       return newCarts;
     } else {
-      return carts;
+      return enrichedCarts;
     }
-  }, [carts, currentSelectedResources, currentStepParams == null ? void 0 : currentStepParams.key, isErrorHolder]);
+  }, [
+    carts,
+    currentSelectedResources,
+    currentStepParams == null ? void 0 : currentStepParams.key,
+    isErrorHolder,
+    holderMap,
+    isFormSubject
+  ]);
   const subTotalList = (0, import_react.useMemo)(() => {
     const hideDeposit = (carts == null ? void 0 : carts.length) === 0 || !(deposit == null ? void 0 : deposit.hasDeposit);
     const surcharge = ((summary == null ? void 0 : summary.surcharge) || []).map(
@@ -236,7 +296,9 @@ var CartItem = ({ onNext, renderContactInfo }) => {
           isShowDelete: ((_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key) === "select-service",
           isShowPackageNote: false,
           isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
+          // isShowChangeHolder: isLastStep ? false : !isRetailTemplate && isLogin,
           isShowHolder: isFormSubject,
+          // isShowHolder: !isRetailTemplate,
           isShowAddHolderButton: true
         },
         collapseParams: {

package/lib/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -61,7 +61,7 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
     carts,
     setTimes
   } = (0, import_context.useAppointmentBookingContext)();
-  const { isRetailTemplate, bookingSetting } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isRetailTemplate, bookingSetting, isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
   console.log(bookingSetting, "bookingSetting");
   const [form] = import_antd.Form.useForm();
   const userInfo = (0, import_useLoginUser.default)();
@@ -185,8 +185,12 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   };
   const onCheckout = async (extraData) => {
     try {
+      const _extraData = {
+        ...extraData,
+        is_add_holder_info: isFormSubject
+      };
       const { deposit } = summary;
-      const { data } = await appointmentBooking.submitOrder(extraData);
+      const { data } = await appointmentBooking.submitOrder(_extraData);
       const { is_deposit, deposit_amount, total_amount, order_id } = data || {};
       const _total = is_deposit ? deposit_amount : total_amount;
       if (_total > 0) {

package/lib/components/appointmentBooking/components/Header/index.js

@@ -56,7 +56,6 @@ var Header = () => {
   const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
   const { checkProductType } = (0, import_hooks.useAppointmentBookingProduct)();
   const utils = (0, import_hooks.contextUtils)();
-  const progressBarRef = (0, import_react.useRef)(null);
   const stepName = (0, import_react.useMemo)(() => {
     var _a2, _b, _c;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
@@ -132,27 +131,16 @@ var Header = () => {
     const utils2 = context.appHelper.utils || {};
     (_b = utils2 == null ? void 0 : utils2.history) == null ? void 0 : _b.replace("/");
   };
-  const { restoreBackTrap } = (0, import_hooks.useInterceptBrowserBack)({
-    stepIndex: (currentStep == null ? void 0 : currentStep.index) ?? 0,
-    canGoBack: () => ((currentStep == null ? void 0 : currentStep.index) ?? 0) > 0,
-    onBack: handleBack,
-    onExit: () => {
-      var _a2;
-      return (_a2 = progressBarRef.current) == null ? void 0 : _a2.triggerClose();
-    }
-  });
   return /* @__PURE__ */ import_react.default.createElement(
     import_progressBar.default,
     {
-      ref: progressBarRef,
       title: currentStep ? `${import_utils.locales.getText("pisell2.appointment.step")(
         (currentStep == null ? void 0 : currentStep.index) + 1
       )}` : "",
       description: stepName,
       showBack: (currentStep == null ? void 0 : currentStep.index) > 0,
       onBack: () => handleBack(),
-      onClose: () => handleClose(),
-      onConfirmCancel: restoreBackTrap
+      onClose: () => handleClose()
     }
   );
 };

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -45,6 +45,7 @@ var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_utils2 = require("../../../booking/utils");
 var import_index = require("./index.less");
 var import_ahooks = require("ahooks");
+var import_utils3 = require("../../utils");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -268,7 +269,16 @@ var VoucherCard = (props) => {
         onClick: () => {
           if (!action) return;
           openLoginModal({
+            data: {
+              type: "plugin"
+            },
             callback: (status) => {
+              if (status === "success") {
+                const customer = (0, import_utils3.getCustomer)(utils);
+                appointmentBooking == null ? void 0 : appointmentBooking.refreshAllHolderFormRecords({
+                  customer_id: customer == null ? void 0 : customer.id
+                });
+              }
             }
           });
         }

package/lib/components/appointmentBooking/hooks.d.ts

@@ -46,6 +46,7 @@ export declare const useAppointmentBookingLogin: () => {
     isLogin: boolean;
     openLoginModal: (params: {
         callback: any;
+        data?: any;
     }) => void;
 };
 /**
@@ -105,20 +106,3 @@ export declare const useAppointmentBookingSetting: () => {
     formName: any;
     bookingSetting: any;
 };
-export interface UseInterceptBrowserBackOptions {
-    /** 是否启用拦截，默认 true */
-    enabled?: boolean;
-    /** 当前步骤 index（0-based），用于同步 history 栈深度 */
-    stepIndex: number;
-    /** 是否还能在流程内后退（如 currentStep.index > 0） */
-    canGoBack: () => boolean;
-    /** 流程内后退，对应 Header.handleBack */
-    onBack: () => void | Promise<void>;
-    /** 已在第一步时的退出逻辑，对应 Header.handleClose */
-    onExit?: () => void;
-}
-export interface UseInterceptBrowserBackResult {
-    /** 系统返回触发退出确认但被取消时，补回 history trap */
-    restoreBackTrap: () => void;
-}
-export declare const useInterceptBrowserBack: ({ enabled, stepIndex, canGoBack, onBack, onExit, }: UseInterceptBrowserBackOptions) => UseInterceptBrowserBackResult;