@pisell/private-materials 3.4.43 → 3.4.44

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/components/customSelect/index.js

@@ -424,7 +424,7 @@ var CustomSelect = function CustomSelect(props, ref) {
         marginTop: 16,
         height: 44
       },
-      placeholder: locales.getText('pisell2.text.search'),
+      placeholder: locales.getText('pisell2.booking.text.search-placeholder'),
       value: search,
       allowClear: true,
       onChange: function onChange(e) {

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
@@ -304,7 +304,7 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
 
 /**
  * @title: 格式化商品数据
- * @description: 
+ * @description:
  * @param {any} item
  * @return {*}
  * @Author: WangHan
@@ -325,30 +325,30 @@ var formatProducts = function formatProducts(item, quantity) {
     return item.type !== 'product';
   });
   return {
-    "num": quantity || item._extend.quantity,
-    "price": formatProductPrice(item),
-    "source_product_price": getSourceProductPrice(item),
-    "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
-    "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
-    "product_discount_reason": item._extend.discount_reason || '',
-    "is_charge_tax": item.is_charge_tax,
-    "note": (item === null || item === void 0 ? void 0 : item.note) || '',
-    "discountway": item._extend.discountway || "num",
-    "discount_per": item._extend.discount_per,
-    "discount_type": item._extend.discount_type || discount_type,
-    "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
-    "bundle_edit": item._extend.bundle_edit,
-    "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,
+    num: quantity || item._extend.quantity,
+    price: formatProductPrice(item),
+    source_product_price: getSourceProductPrice(item),
+    product_id: (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
+    discount_amount: notManualDiscount.length > 0 ? 0 : discount_amount,
+    product_discount_reason: item._extend.discount_reason || '',
+    is_charge_tax: item.is_charge_tax,
+    note: (item === null || item === void 0 ? void 0 : item.note) || '',
+    discountway: item._extend.discountway || 'num',
+    discount_per: item._extend.discount_per,
+    discount_type: item._extend.discount_type || discount_type,
+    order_detail_id: item._extend.order_detail_id || 0,
+    product_bundle: formatProductBundle((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
+    bundle_edit: item._extend.bundle_edit,
+    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, 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
@@ -455,12 +455,12 @@ var formatBookings = function formatBookings(data, values) {
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   var obj = {};
-  list.forEach(function (item, index) {
+  list.forEach(function (item) {
     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)) {
@@ -500,26 +500,25 @@ var formatBookings = function formatBookings(data, values) {
     // 后续出现不需要设置 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),
-      'id': item.booking_id || 0,
-      "relation_id": item._extend.relation_id || 0,
-      "like_status": item._extend.like_status || 'common',
-      "relation_type": item._extend.relation_type || '',
-      "is_all": false,
-      "schedule_id": item._extend.schedule_id || 0,
-      "end_time": end_time,
-      "sub_type": isDay ? 'days' : getSubType(item),
-      "select_date": start_date,
-      "start_time": start_time,
-      "end_date": end_date,
-      "start_date": start_date,
-      "duration": isDay ? 0 : flexibleObj.getValue(item._extend.duration),
-      "number": item._extend.capacity ? getSumCapacity({
+      product: formatProducts(item),
+      relation_products: formatRelationDetails(item._extend.relation_details),
+      id: item.booking_id || 0,
+      relation_id: item._extend.relation_id || 0,
+      like_status: item._extend.like_status || 'common',
+      relation_type: item._extend.relation_type || '',
+      is_all: false,
+      schedule_id: item._extend.schedule_id || 0,
+      end_time: end_time,
+      sub_type: isDay ? 'days' : getSubType(item),
+      select_date: start_date,
+      start_time: start_time,
+      end_date: end_date,
+      start_date: start_date,
+      duration: isDay ? 0 : flexibleObj.getValue(item._extend.duration),
+      number: item._extend.capacity ? getSumCapacity({
         cacheItem: item
       }) : item._extend.number || 1,
-      "resources": formatResource(item),
-      // 当groupId第一次出现时，需要设置metadata.multiDayPrices， 否则不用
+      resources: formatResource(item),
       "metadata": formatMetaData(item, !isSetGroupId)
     }, eventOtherParams || {}), dayParams);
 
@@ -533,11 +532,11 @@ var formatBookings = function formatBookings(data, values) {
     }
     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)
       }));
     }
   });
@@ -546,7 +545,7 @@ var formatBookings = function formatBookings(data, values) {
 
 /**
  * @title: 普通商品
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -587,7 +586,7 @@ var formatNormalProducts = function formatNormalProducts(data) {
 
 /**
  * @title: 预约主体信息
- * @description: 
+ * @description:
  * @param {any} state
  * @param {any} values
  * @return {*}
@@ -620,15 +619,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: {}
@@ -655,7 +654,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);
@@ -684,6 +683,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;
 };
 

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

@@ -9,7 +9,7 @@ import useSendModal from "./sendModal/useSendModal";
 import SendModal from "./sendModal";
 import { locales } from '@pisell/utils';
 var Footer = function Footer(_ref) {
-  var _state$client6, _state$form, _state$client7;
+  var _state$client2, _state$contacts_info2, _state$form, _state$client3;
   var state = _ref.state,
     reload = _ref.reload;
   var _useSendModal = useSendModal(state === null || state === void 0 ? void 0 : state.bookingId),
@@ -38,17 +38,31 @@ var Footer = function Footer(_ref) {
     };
   }();
   var defaultValues = useMemo(function () {
-    var _state$client, _state$client2, _state$client3, _state$client4, _state$client5;
+    var _state$contacts_info, _state$client;
+    // 优先取contacts_info中的phone和email，如果不存在则取客户信息中的phone和email
+    var _ref3 = ((_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.value) || {},
+      contactsEmail = _ref3.email,
+      contactsPhone = _ref3.phone;
+    var _ref4 = ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {},
+      clientEmail = _ref4.email,
+      clientPhone = _ref4.phone,
+      clientCode = _ref4.country_calling_code;
+    var email = contactsEmail || clientEmail;
+    var phone = (contactsPhone === null || contactsPhone === void 0 ? void 0 : contactsPhone.phone) || clientPhone;
+    var code = (contactsPhone === null || contactsPhone === void 0 ? void 0 : contactsPhone.country_calling_code) || clientCode || '+61';
+    if (!code.startsWith('+')) {
+      code = "+".concat(code);
+    }
     return {
-      sendSms: !!((_state$client = state.client) !== null && _state$client !== void 0 && (_state$client = _state$client.value) !== null && _state$client !== void 0 && _state$client.phone),
-      sendEmail: !!((_state$client2 = state.client) !== null && _state$client2 !== void 0 && (_state$client2 = _state$client2.value) !== null && _state$client2 !== void 0 && _state$client2.email),
-      email: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.email,
+      sendSms: !!phone,
+      sendEmail: !!email,
+      email: email,
       phone: {
-        code: (_state$client4 = state.client) === null || _state$client4 === void 0 || (_state$client4 = _state$client4.value) === null || _state$client4 === void 0 ? void 0 : _state$client4.country_calling_code,
-        phone: (_state$client5 = state.client) === null || _state$client5 === void 0 || (_state$client5 = _state$client5.value) === null || _state$client5 === void 0 ? void 0 : _state$client5.phone
+        code: code,
+        phone: phone
       }
     };
-  }, [(_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : _state$client6.value]);
+  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.value, (_state$contacts_info2 = state.contacts_info) === null || _state$contacts_info2 === void 0 ? void 0 : _state$contacts_info2.value]);
   if (!state.bookingId || !(state !== null && state !== void 0 && (_state$form = state.form) !== null && _state$form !== void 0 && _state$form.forms.length)) {
     return null;
   }
@@ -65,8 +79,8 @@ var Footer = function Footer(_ref) {
     block: true,
     type: "primary",
     onClick: handleOpen
-  }, locales.getText('pisell2.text.send-form-reminder')), /*#__PURE__*/React.createElement(SendModal, {
-    refreshKey: (_state$client7 = state.client) === null || _state$client7 === void 0 || (_state$client7 = _state$client7.value) === null || _state$client7 === void 0 ? void 0 : _state$client7.id,
+  }, locales.getText('pisell2.text.send-form-reminder')), open && /*#__PURE__*/React.createElement(SendModal, {
+    refreshKey: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id,
     open: open,
     onCancel: function onCancel() {
       return setOpen(false);

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;