@pisell/private-materials 6.3.30 → 6.3.32

package/es/components/appointmentBooking/hooks.js

@@ -14,7 +14,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { useState, useEffect, useMemo } from 'react';
-import { locales } from "@pisell/utils";
+import { locales } from '@pisell/utils';
 import { usePisellOS } from "../../hooks/useEngineContext";
 import useEngineContext from "../../hooks/useEngineContext";
 import { sortResources, getCustomer, currentAppointmentBoard, currentRenderLists, getFormInsertBeforeKey, checkAndGoNext, checkAndMarkCartRenderError, formatHolder, Toast } from "./utils";
@@ -37,7 +37,7 @@ export var contextUtils = function contextUtils() {
 
 /**
  * @title: 监听步骤发生变化
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:11
@@ -143,56 +143,56 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
     var currentSelectedResources = appointmentBooking.getOtherData('current_selected_resources');
 
     // 先确定点击时的步骤，如果当前步骤是选择服务
-    if (!isRetailTemplate && currentKey === "select-service") {
+    if (!isRetailTemplate && currentKey === 'select-service') {
       var _appointmentBooking$o, _stepList, _stepList2;
       var _ref3 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.productModuleParams) || {},
         bookingProcess = _ref3.bookingProcess;
-      var isDateSelectedFirst = bookingProcess === "date_first";
+      var isDateSelectedFirst = bookingProcess === 'date_first';
       var hasResourceStep = (_stepList = stepList) === null || _stepList === void 0 ? void 0 : _stepList.find(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.key) === "select-resource";
+        return (item === null || item === void 0 ? void 0 : item.key) === 'select-resource';
       });
       var hasSelectGuestStep = (_stepList2 = stepList) === null || _stepList2 === void 0 || (_stepList2 = _stepList2.find(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.key) === "select-guest";
+        return (item === null || item === void 0 ? void 0 : item.key) === 'select-guest';
       })) === null || _stepList2 === void 0 ? void 0 : _stepList2.key;
       // 判断购物车里是否全是是普通商品
       var isAllNormalProduct = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartAllNormalProducts();
       if (isAllNormalProduct) {
-        removeStep("select-resource");
-        removeStep("select-time");
+        removeStep('select-resource');
+        removeStep('select-time');
         removeStep('fill-form');
         if (!isDateSelectedFirst) {
-          removeStep("select-date");
+          removeStep('select-date');
         }
       } else if (!hasResourceStep) {
         // 如果不全是普通商品，并且还没有选择资源步骤，证明之前被删除过，要给她加回来
         // 判断当前步骤里有没有添加预约人，如果有的话则应该是在添加预约人之后添加步骤
-        var targetKey = hasSelectGuestStep ? hasSelectGuestStep : "select-service";
+        var targetKey = hasSelectGuestStep ? hasSelectGuestStep : 'select-service';
         var isHasDurationProduct = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartHasDurationProduct();
         // 如果购物车里有 duration 商品（目前来说，只能是纯 duration 商品）
         if (isHasDurationProduct) {
           // 如果是先选商品，则添加日期、资源、时间步骤
           if (!isDateSelectedFirst) {
             appointmentBooking.addStep({
-              key: "select-date",
-              description: locales.getText("pisell2.appointment.select.date")
+              key: 'select-date',
+              description: locales.getText('pisell2.appointment.select.date')
             }, targetKey);
-            targetKey = "select-date";
+            targetKey = 'select-date';
           }
           // 如果是先选日期，则添加资源、时间
           appointmentBooking.addStep({
-            key: "select-resource",
-            description: locales.getText("pisell2.appointment.select.resource")
+            key: 'select-resource',
+            description: locales.getText('pisell2.appointment.select.resource')
           }, targetKey);
-          targetKey = "select-resource";
+          targetKey = 'select-resource';
           appointmentBooking.addStep({
-            key: "select-time",
-            description: locales.getText("pisell2.appointment.select.time")
+            key: 'select-time',
+            description: locales.getText('pisell2.appointment.select.time')
           }, targetKey);
         } else {
           // 如果购物车里是session 商品，则只添加选择资源步骤
           appointmentBooking.addStep({
-            key: "select-resource",
-            description: locales.getText("pisell2.appointment.select.resource")
+            key: 'select-resource',
+            description: locales.getText('pisell2.appointment.select.resource')
           }, targetKey);
         }
       }
@@ -381,7 +381,6 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
                     //   //     getHolders();
                     //   //   }
                     //   // }
-
                     //   // 继续后续流程
                     //   checkHolder()
                     // }
@@ -434,7 +433,7 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
 
 /**
  * @title: 获取商品数据
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:12
@@ -525,7 +524,7 @@ export var useAppointmentBookingProduct = function useAppointmentBookingProduct(
 
 /**
  * @title: 更新购物车数据
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:12
@@ -612,7 +611,7 @@ export var useAppointmentBookingCart = function useAppointmentBookingCart() {
 
 /**
  * @title: 获取登录状态
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:14
@@ -640,7 +639,7 @@ export var useAppointmentBookingLogin = function useAppointmentBookingLogin() {
 
 /**
  * @title: 获取账户
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:15
@@ -790,7 +789,7 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
 
 /**
  * @title: 获取资源数据
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:29
@@ -855,7 +854,7 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
 
 /**
  * @title: 是否跳过资源选择步骤
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-21 11:47
@@ -937,13 +936,13 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
 
 /**
  * @title: 获取预约配置
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-24 18:15
  */
 export var useAppointmentBookingSetting = function useAppointmentBookingSetting() {
-  var _appointmentBooking$o4, _appointmentBooking$o5;
+  var _appointmentBooking$o4, _appointmentBooking$o5, _appointmentBooking$o6;
   var utils = contextUtils();
   var _ref28 = useAppointmentBookingContext(),
     appointmentBooking = _ref28.appointmentBooking;
@@ -977,6 +976,7 @@ export var useAppointmentBookingSetting = function useAppointmentBookingSetting(
     bookingSubject: bookingSubject,
     setOtherData: setOtherData,
     getOtherData: getOtherData,
-    formName: formName
+    formName: formName,
+    bookingSetting: (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o6 = appointmentBooking.otherParams) === null || _appointmentBooking$o6 === void 0 ? void 0 : _appointmentBooking$o6.bookingSetting) || {}
   };
 };

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

@@ -117,6 +117,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -236,6 +237,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -355,6 +357,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
 };
 export default _default;

package/es/components/appointmentBooking/locales.js

@@ -132,9 +132,10 @@ export default {
     'pisell2.text.goodpass.code': 'Code',
     'pisell2.text.goodpass.enter-code': 'Enter Code',
     'pisell2.text.goodpass.code-invalid': 'Current code is invalid',
-    'pisell2.text.goodpass.code-invalid-cart': "No eligible items in the cart",
+    'pisell2.text.goodpass.code-invalid-cart': 'No eligible items in the cart',
     'pisell2.text.goodpass.login': 'Login',
-    'pisell2.text.goodpass.login-tip': ' for member benefit Or use account credit'
+    'pisell2.text.goodpass.login-tip': ' for member benefit Or use account credit',
+    'pisell2.text.contact-info.title': 'Contact info'
   },
   'zh-CN': {
     'pisell2.event.calendar.limit.unavailable': '不可预约',
@@ -269,9 +270,10 @@ export default {
     'pisell2.text.goodpass.code': '券码',
     'pisell2.text.goodpass.enter-code': '请输入券码',
     'pisell2.text.goodpass.code-invalid': '当前券码不可用',
-    'pisell2.text.goodpass.code-invalid-cart': "当前购物车中无可用商品",
+    'pisell2.text.goodpass.code-invalid-cart': '当前购物车中无可用商品',
     'pisell2.text.goodpass.login': '登录',
-    'pisell2.text.goodpass.login-tip': '以获取会员福利或使用账户积分'
+    'pisell2.text.goodpass.login-tip': '以获取会员福利或使用账户积分',
+    'pisell2.text.contact-info.title': '联系信息'
   },
   'zh-HK': {
     'pisell2.event.calendar.limit.unavailable': '不可預約',
@@ -406,8 +408,9 @@ export default {
     'pisell2.text.goodpass.code': '券碼',
     'pisell2.text.goodpass.enter-code': '請輸入券碼',
     'pisell2.text.goodpass.code-invalid': '當前券碼不可用',
-    'pisell2.text.goodpass.code-invalid-cart': "當前購物車中無可用商品",
+    'pisell2.text.goodpass.code-invalid-cart': '當前購物車中無可用商品',
     'pisell2.text.goodpass.login': '登錄',
-    'pisell2.text.goodpass.login-tip': '以獲取會員福利或使用賬戶積分'
+    'pisell2.text.goodpass.login-tip': '以獲取會員福利或使用賬戶積分',
+    'pisell2.text.contact-info.title': '聯繫信息'
   }
 };

package/es/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/components/footer/index.js

@@ -176,7 +176,7 @@ var Footer = function Footer(props) {
 
   // info 是否有编辑
   var infoEdit = useMemo(function () {
-    var _state$client, _state$date, _state$pet, _state$service, _state$notes, _state$contacts;
+    var _state$client, _state$date, _state$pet, _state$service, _state$notes, _state$contacts, _state$contacts_info;
     if (!state.bookingId) {
       return true;
     }
@@ -198,6 +198,9 @@ var Footer = function Footer(props) {
     if ((_state$contacts = state.contacts) !== null && _state$contacts !== void 0 && _state$contacts.edit) {
       return true;
     }
+    if ((_state$contacts_info = state.contacts_info) !== null && _state$contacts_info !== void 0 && _state$contacts_info.edit) {
+      return true;
+    }
     return false;
   }, [state]);
 

package/es/components/booking/components/footer/utils.js

@@ -4,7 +4,7 @@ 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); }
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 import { flexibleObj, isNowTime, getNowTime } from "../../utils";
 import { isWalkIn } from "../../utils";
 import { getSumCapacity } from "../../info2/utilsByBooking";
@@ -12,10 +12,10 @@ import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 import { isArr, locales, sendWarningLog } from '@pisell/utils';
-import { PisellToast } from "@pisell/materials";
+import { PisellToast } from '@pisell/materials';
 var formatNote = function formatNote(data) {
   var _data$notes;
-  return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
+  return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || '';
 };
 var formatCustomer = function formatCustomer(data) {
   var _data$client, _data$client2, _data$client3, _data$client4, _data$client5, _data$client6;
@@ -34,7 +34,7 @@ var formatCustomer = function formatCustomer(data) {
 
 /**
  * @title: 套餐单规格信息
- * @description: 
+ * @description:
  * @param {any} option
  * @return {*}
  * @Author: zhiwei.Wang
@@ -46,9 +46,9 @@ export var formatProductOption = function formatProductOption(option) {
   }
   return option.map(function (d) {
     return {
-      "num": d.num,
-      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
-      "option_group_id": d.option_group_id
+      num: d.num,
+      option_group_item_id: d.product_option_item_id || d.option_group_item_id,
+      option_group_id: d.option_group_id
       // "add_price": Number(d?.add_price),
     };
   });
@@ -56,7 +56,7 @@ export var formatProductOption = function formatProductOption(option) {
 
 /**
  * @title: 添加套餐警告
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -77,7 +77,7 @@ var log = function log(data) {
 
 /**
  * @title: 套餐信息
- * @description: 
+ * @description:
  * @param {any} bundle
  * @return {*}
  * @Author: zhiwei.Wang
@@ -99,16 +99,16 @@ export var formatProductBundle = function formatProductBundle(bundle) {
   } catch (error) {}
   return bundle.map(function (d) {
     return {
-      "bundle_group_id": d.group_id,
-      "bundle_id": d.id,
-      "bundle_product_id": (d === null || d === void 0 ? void 0 : d._bundle_product_id) || (d === null || d === void 0 ? void 0 : d.product_id),
-      "bundle_variant_id": d.bundle_variant_id,
-      "num": d.num,
-      "extension_id": d.extension_id,
-      "extension_type": d.extension_type,
+      bundle_group_id: d.group_id,
+      bundle_id: d.id,
+      bundle_product_id: (d === null || d === void 0 ? void 0 : d._bundle_product_id) || (d === null || d === void 0 ? void 0 : d.product_id),
+      bundle_variant_id: d.bundle_variant_id,
+      num: d.num,
+      extension_id: d.extension_id,
+      extension_type: d.extension_type,
       // "price": Number(d?.price),
       // "price_type": d?.price_type,
-      "option": formatProductOption(d.option)
+      option: formatProductOption(d.option)
     };
   });
 };
@@ -189,7 +189,7 @@ var formatResource = function formatResource(service) {
 
 /**
  * @title: 格式化子预约的holder数据
- * @description: 
+ * @description:
  * @param {any} state
  * @param {any} item
  * @param {any} values
@@ -220,7 +220,7 @@ var formatHolders = function formatHolders(state, item, values) {
 
 /**
  * @title: 格式化商品单价
- * @description: 
+ * @description:
  * @param {any} item
  * @return {*}
  * @Author: WangHan
@@ -250,7 +250,7 @@ export var formatProductPrice = function formatProductPrice(item) {
   }
   return price;
 };
-var formatMetaData = function formatMetaData(item) {
+var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
   var _item$_extend8, _item$_extend9, _item$_extend11;
   var metadata = {};
   if ((_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.capacity) {
@@ -263,7 +263,7 @@ var formatMetaData = function formatMetaData(item) {
     var _item$_extend10;
     metadata.holder_id = (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id;
   }
-  if ((_item$_extend11 = item._extend) !== null && _item$_extend11 !== void 0 && _item$_extend11.multiDayPrices) {
+  if (isMultiDayPrices && (_item$_extend11 = item._extend) !== null && _item$_extend11 !== void 0 && _item$_extend11.multiDayPrices) {
     var _item$_extend12;
     metadata.multiDayPrices = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.multiDayPrices;
   }
@@ -304,7 +304,7 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
 
 /**
  * @title: 格式化商品数据
- * @description: 
+ * @description:
  * @param {any} item
  * @return {*}
  * @Author: WangHan
@@ -342,13 +342,13 @@ var formatProducts = function formatProducts(item, quantity) {
     "product_option_item": formatProductOption((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.option),
     "product_variant_id": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.product_variant_id) || 0,
     "discount_list": notManualDiscount,
-    metadata: formatMetaData(item)
+    metadata: formatMetaData(item, false)
   };
 };
 
 /**
  * @title: 格式化跨日预约下的普通商品
- * @description: 
+ * @description:
  * @param {any} data
  * @param {any} booking_item
  * @return {*}
@@ -374,7 +374,7 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
 /**
  * @title: 格式化跨日预约商品列表
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -424,7 +424,7 @@ var getHolderByIndex = function getHolderByIndex(holder, index) {
 
 /**
  * @title: 预约商品信息
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: zhiwei.Wang
@@ -454,11 +454,13 @@ var formatBookings = function formatBookings(data, values) {
   var dayParams = {};
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
-  list.forEach(function (item) {
+  var obj = {};
+  list.forEach(function (item, index) {
+    var _item$_extend25;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
-    var end_time = item._extend.endDate.format("HH:mm");
-    var start_time = item._extend.startDate.format("HH:mm");
+    var end_time = item._extend.endDate.format('HH:mm');
+    var start_time = item._extend.startDate.format('HH:mm');
 
     // 更新当前时间
     if (isNowTime(item._extend.start_time)) {
@@ -492,6 +494,11 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
+
+    // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
+    // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
+    // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.groupId];
     var booking = _objectSpread(_objectSpread({
       "product": formatProducts(item),
       "relation_products": formatRelationDetails(item._extend.relation_details),
@@ -512,19 +519,25 @@ var formatBookings = function formatBookings(data, values) {
         cacheItem: item
       }) : item._extend.number || 1,
       "resources": formatResource(item),
-      "metadata": formatMetaData(item)
+      // 当groupId第一次出现时，需要设置metadata.multiDayPrices， 否则不用
+      "metadata": formatMetaData(item, !isSetGroupId)
     }, eventOtherParams || {}), dayParams);
+
+    // 记录下每个GroupId第一次出现的时机
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
     if (isDay) {
       bookings.push(booking);
       return;
     }
     for (var i = 0; i < (item._extend.quantity || 1); i++) {
       bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
-        "product": formatProducts(item, 1),
-        "number": item._extend.capacity ? getSumCapacity({
+        product: formatProducts(item, 1),
+        number: item._extend.capacity ? getSumCapacity({
           cacheItem: item
         }, false) : item._extend.number || 1,
-        "holder": getHolderByIndex(booking.holder, i)
+        holder: getHolderByIndex(booking.holder, i)
       }));
     }
   });
@@ -533,7 +546,7 @@ var formatBookings = function formatBookings(data, values) {
 
 /**
  * @title: 普通商品
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -544,10 +557,10 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend25;
+    var _item$_extend26;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
@@ -574,7 +587,7 @@ var formatNormalProducts = function formatNormalProducts(data) {
 
 /**
  * @title: 预约主体信息
- * @description: 
+ * @description:
  * @param {any} state
  * @param {any} values
  * @return {*}
@@ -607,15 +620,15 @@ var formatHolder = function formatHolder(state, values) {
 
 // https://menutech.w.eolink.com/home/api-studio/inside/K2bI3n465fe7244b3dbd6679d87caedfbb0636bf8c29eda/api/2778666/detail/53001549?spaceKey=menutech
 export var formatValues = function formatValues(state) {
-  var _values, _values3;
+  var _values, _values3, _state$contacts_info;
   var values = {
-    type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
-    platform: state.isBookingTicket2 ? "pos" : "shop",
-    sales_channel: "my_pisel",
-    order_sales_channel: state.isBookingTicket2 ? "pos" : "online_store",
+    type: state.renderType === 'eventBooking' ? 'event_booking_v2' : 'appointment_booking',
+    platform: state.isBookingTicket2 ? 'pos' : 'shop',
+    sales_channel: 'my_pisel',
+    order_sales_channel: state.isBookingTicket2 ? 'pos' : 'online_store',
     bookings: [],
     customer_id: 1,
-    customer_name: "",
+    customer_name: '',
     holder: {},
     relation_products: [],
     metadata: {}
@@ -642,7 +655,7 @@ export var formatValues = function formatValues(state) {
   // 主体
   values.holder = formatHolder(state, values);
   if (isDay || isEvent) {
-    values.relation_products = formatRelationProducts(state, isDay ? "day" : "event");
+    values.relation_products = formatRelationProducts(state, isDay ? 'day' : 'event');
   } else {
     var _values$relation_prod;
     values.relation_products = formatNormalProducts(state);
@@ -671,6 +684,9 @@ export var formatValues = function formatValues(state) {
   if (!((_values3 = values) !== null && _values3 !== void 0 && (_values3 = _values3.bookings) !== null && _values3 !== void 0 && _values3.length)) {
     values.type = 'virtual';
   }
+
+  // 联系信息
+  values.contacts_info = ((_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.value) || null;
   return values;
 };
 
@@ -678,7 +694,7 @@ export var formatValues = function formatValues(state) {
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend26;
+    var _item$_extend27;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
@@ -686,7 +702,7 @@ export var checkHolderIsError = function checkHolderIsError(state) {
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 || (_item$_extend26 = _item$_extend26.holder_id) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.length) !== item._extend.quantity) {
+    if (item._extend.quantity > 1 && ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 || (_item$_extend27 = _item$_extend27.holder_id) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.length) !== item._extend.quantity) {
       return true;
     }
     return false;

package/es/components/booking/forms/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/info/clientVariant/hooks/useClientFn.js

@@ -52,7 +52,7 @@ var useClientFn = function useClientFn(_params) {
       num: 5,
       total: 0,
       search: '',
-      with: ['formRecord'],
+      with: ['formRecord', 'contactsInfo'],
       relation_form_id: state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.appointment_subject) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.form_id
     }),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -294,7 +294,7 @@ var useClientFn = function useClientFn(_params) {
     if (getIsWalkIn(item === null || item === void 0 ? void 0 : item.id)) {
       return locales.getText('pisell2.text.select-a-customer');
     }
-    var firstLastName = item.first_name || item.last_name ? "".concat(item.first_name, " ").concat(item.last_name) : "";
+    var firstLastName = item.first_name || item.last_name ? "".concat(item.first_name, " ").concat(item.last_name) : '';
     return item.name || (item.display_name || '').trim() || (item.nickname || '').trim() || firstLastName.trim() || '';
   }, [locales.localeMap]);
   useEffect(function () {

package/es/components/booking/info/clientVariant/vertical/index.js

@@ -262,7 +262,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
               case 7:
                 _context.next = 9;
                 return getClients({
-                  with: ['formRecord'],
+                  with: ['formRecord', 'contactsInfo'],
                   relation_form_id: boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id,
                   skip: 1,
                   num: 20,

package/es/components/booking/info/main.js

@@ -27,6 +27,7 @@ import "./index.less";
 import Notes from "./notes";
 import { Service2Cart } from "./service2";
 import { isDayBooking, isEventBooking, isTerminalDayBooking } from "./service2/utils";
+import ContactInfoMode from "../info2/service/contactInfoMode";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -37,7 +38,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state5, _context$appHelper4, _modal$state6;
+  var _modal$state2, _modal$state5, _context$appHelper4, _modal$state6, _modal$state7;
   var style = props.style,
     globalState = props.globalState,
     _props$modules = props.modules,
@@ -143,7 +144,7 @@ var Info = Provider(function (props) {
     bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode && !isTerminalDayBooking(modal.state)))
   }, /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, (modal === null || modal === void 0 || (_modal$state6 = modal.state) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.bookingConfig) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.config) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.cart_settings_tab) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.display_contact_info) === null || _modal$state6 === void 0 ? void 0 : _modal$state6.show_contact_info) === true ? /*#__PURE__*/React.createElement(ContactInfoMode, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,