@pisell/private-materials 6.5.27 → 6.6.2

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

@@ -3,12 +3,12 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _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 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -41,7 +41,7 @@ var createToastContent = function createToastContent(text) {
   }, text);
 };
 var ActionButtons = function ActionButtons(_ref) {
-  var _context$appHelper, _state$service2, _state$addons2, _state$service4, _state$service6, _context$appHelper3, _state$service8, _state$addons4, _context$appHelper4, _context$appHelper4$g;
+  var _context$appHelper, _state$service3, _state$addons2, _state$service5, _state$service7, _context$appHelper3, _state$service9, _state$addons4, _context$appHelper4, _context$appHelper4$g;
   var state = _ref.state,
     dispatch = _ref.dispatch,
     _ref$disabled = _ref.disabled,
@@ -77,6 +77,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 将选中的客户数据传递给状态管理
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
+    var _state$service;
     dispatch({
       type: 'setClient',
       payload: {
@@ -84,6 +85,21 @@ var ActionButtons = function ActionButtons(_ref) {
         edit: true
       }
     });
+    if (state !== null && state !== void 0 && (_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) {
+      // 还需要清空商品内的 holder 信息
+      dispatch({
+        type: 'setService',
+        payload: {
+          value: state.service.value.map(function (item) {
+            return _objectSpread(_objectSpread({}, item), {}, {
+              _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+                holder_id: []
+              })
+            });
+          })
+        }
+      });
+    }
   });
   var _useCustomer = useCustomer({
       changeCustomerToGlobalState: changeCustomerToGlobalState
@@ -155,9 +171,9 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 检查是否有购物车内容
   var hasCartItems = useMemo(function () {
-    var _state$service, _state$addons;
-    return ((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 || (_state$service = _state$service.value) === null || _state$service === void 0 ? void 0 : _state$service.length) || 0) + ((state === null || state === void 0 || (_state$addons = state.addons) === null || _state$addons === void 0 || (_state$addons = _state$addons.value) === null || _state$addons === void 0 ? void 0 : _state$addons.length) || 0) > 0;
-  }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value, state === null || state === void 0 || (_state$addons2 = state.addons) === null || _state$addons2 === void 0 ? void 0 : _state$addons2.value]);
+    var _state$service2, _state$addons;
+    return ((state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 || (_state$service2 = _state$service2.value) === null || _state$service2 === void 0 ? void 0 : _state$service2.length) || 0) + ((state === null || state === void 0 || (_state$addons = state.addons) === null || _state$addons === void 0 || (_state$addons = _state$addons.value) === null || _state$addons === void 0 ? void 0 : _state$addons.length) || 0) > 0;
+  }, [state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.value, state === null || state === void 0 || (_state$addons2 = state.addons) === null || _state$addons2 === void 0 ? void 0 : _state$addons2.value]);
 
   // 检查是否禁用编辑
   var isDisabledEdit = useMemo(function () {
@@ -194,8 +210,8 @@ var ActionButtons = function ActionButtons(_ref) {
   // 计算已使用的券数量
   var usedVouchersCount = useMemo(function () {
     try {
-      var _state$service3;
-      if (!((_state$service3 = state.service) !== null && _state$service3 !== void 0 && (_state$service3 = _state$service3.value) !== null && _state$service3 !== void 0 && _state$service3.length)) {
+      var _state$service4;
+      if (!((_state$service4 = state.service) !== null && _state$service4 !== void 0 && (_state$service4 = _state$service4.value) !== null && _state$service4 !== void 0 && _state$service4.length)) {
         return 0;
       }
       // 直接从全局折扣券列表中计算被选中的数量，避免重复计数
@@ -206,14 +222,14 @@ var ActionButtons = function ActionButtons(_ref) {
       console.error('计算已使用券数量失败:', error);
       return 0;
     }
-  }, [discountList, (_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value]);
+  }, [discountList, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
 
   // 判断是否有券可用但手动取消使用（显示红色感叹号）
   var shouldShowWarning = useMemo(function () {
     try {
-      var _state$service5;
+      var _state$service6;
       // 条件：购物车不为空 && discountList 长度大于 0，且没有 isSelected 的优惠券，且有 isManualSelect 的优惠券
-      return ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.value) === null || _state$service5 === void 0 ? void 0 : _state$service5.length) > 0 && discountList.length > 0 && !discountList.some(function (discount) {
+      return ((_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.value) === null || _state$service6 === void 0 ? void 0 : _state$service6.length) > 0 && discountList.length > 0 && !discountList.some(function (discount) {
         return discount.isSelected;
       }) && discountList.some(function (discount) {
         return discount.isManualSelect;
@@ -222,7 +238,7 @@ var ActionButtons = function ActionButtons(_ref) {
       console.error('判断警告状态失败:', error);
       return false;
     }
-  }, [discountList, (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value]);
+  }, [discountList, (_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : _state$service7.value]);
 
   // 监听折扣券列表变化
   useEffect(function () {
@@ -290,8 +306,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _shopDiscount$clear;
-    // (window as any)?.shopApi?.bookingTicket?.clearAllCart();
+    var _window;
+    (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.bookingTicket) === null || _window === void 0 || _window.clearAllCart();
     clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
@@ -358,8 +374,6 @@ var ActionButtons = function ActionButtons(_ref) {
     // TODO: 如果需要重置更多信息，可以在这里添加
     // 比如重置优惠券、表单数据、宠物信息等
 
-    // 清空商品券
-    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
     setShowClearModal(false);
     Toast === null || Toast === void 0 || Toast.success(createToastContent(locales.getText('pisell2.action-buttons.clear-success')));
   };
@@ -375,8 +389,8 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 商品清空后，重置折扣信息
   useEffect(function () {
-    var _state$service7, _state$addons3;
-    if (((_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.value) === null || _state$service7 === void 0 ? void 0 : _state$service7.length) === 0 && ((_state$addons3 = state.addons) === null || _state$addons3 === void 0 || (_state$addons3 = _state$addons3.value) === null || _state$addons3 === void 0 ? void 0 : _state$addons3.length) === 0) {
+    var _state$service8, _state$addons3;
+    if (((_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.value) === null || _state$service8 === void 0 ? void 0 : _state$service8.length) === 0 && ((_state$addons3 = state.addons) === null || _state$addons3 === void 0 || (_state$addons3 = _state$addons3.value) === null || _state$addons3 === void 0 ? void 0 : _state$addons3.length) === 0) {
       dispatch({
         type: 'setState',
         payload: {
@@ -384,7 +398,7 @@ var ActionButtons = function ActionButtons(_ref) {
         }
       });
     }
-  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : _state$service8.value, (_state$addons4 = state.addons) === null || _state$addons4 === void 0 ? void 0 : _state$addons4.value]);
+  }, [(_state$service9 = state.service) === null || _state$service9 === void 0 ? void 0 : _state$service9.value, (_state$addons4 = state.addons) === null || _state$addons4 === void 0 ? void 0 : _state$addons4.value]);
 
   // 处理价格调整完成
   var handlePriceAdjustConfirm = function handlePriceAdjustConfirm(discountAmount) {
@@ -413,7 +427,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 处理自定义商品保存
   var handleCustomiseItemSave = function handleCustomiseItemSave(data) {
-    var _state$service9;
+    var _state$service10;
     console.log('保存自定义商品:', data);
 
     // 创建自定义商品项，按照标准商品结构
@@ -457,7 +471,7 @@ var ActionButtons = function ActionButtons(_ref) {
     };
 
     // 添加到购物车（使用 service 来存储自定义商品）
-    var currentServices = (state === null || state === void 0 || (_state$service9 = state.service) === null || _state$service9 === void 0 ? void 0 : _state$service9.value) || [];
+    var currentServices = (state === null || state === void 0 || (_state$service10 = state.service) === null || _state$service10 === void 0 ? void 0 : _state$service10.value) || [];
 
     // 直接添加自定义商品，不检查重复
     var updatedServices = [customItem].concat(_toConsumableArray(currentServices));

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/amount.js

@@ -7,10 +7,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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 { getDiscountTime, flexibleObj } from "../../utils";
+import { flexibleObj, getDiscountTimeByDayMinutes } from "../../utils";
 import { formatAmount } from '@pisell/utils';
 import Decimal from 'decimal.js';
-import { isDayBooking, isDayBookingProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
+import { isDayBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
+import { isMultiDayProduct } from "../../info2/service/addService/utils";
 export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = new Decimal(0);
   var _iterator = _createForOfIteratorHelper(relation_details),
@@ -39,6 +40,8 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
   var duration = new Decimal(0);
   // 是否是跨日预约
   var isDay = isDayBooking(state);
+  var dayDuration = new Decimal(0);
+  var minuteDuration = new Decimal(0);
   if (isEdit) {
     // 计算总价  服务 和 附加商品
     if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
@@ -51,14 +54,18 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var item = _step2.value;
             // 跨日预约
-            if (isDay || isNormalProductByDurationSchedule(item)) {
+            if (isDay || isNormalProductByDurationSchedule(item) || isMultiDayProduct(item)) {
               var quantity = new Decimal(item._extend.quantity || 1);
               var itemTotal = new Decimal(item._extend.total || 0);
               price = price.add(itemTotal.mul(quantity));
 
               // 普通商品不能加到时长上
-              var _duration = isDayBookingProduct(item, state) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
-              duration = duration.add(_duration);
+              var _duration = !isNormalProductByDurationSchedule(item) ? new Decimal(item._extend.duration || 0) : new Decimal(0);
+              if (isDay || isMultiDayProduct(item)) {
+                dayDuration = dayDuration.add(_duration);
+              } else {
+                minuteDuration = minuteDuration.add(_duration);
+              }
             } else {
               var _quantity = new Decimal(item._extend.quantity || 1);
               var _itemTotal = new Decimal(item._extend.total || 0);
@@ -69,6 +76,11 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
               price = price.add(relationTotal);
               var itemDuration = new Decimal(flexibleObj.getValue(item._extend.duration) || 0);
               duration = duration.add(itemDuration);
+              if (isMultiDayProduct(item)) {
+                dayDuration = dayDuration.add(itemDuration);
+              } else {
+                minuteDuration = minuteDuration.add(itemDuration);
+              }
             }
           }
         } catch (err) {
@@ -102,20 +114,25 @@ var getProductExpectAmount = function getProductExpectAmount(state, isEdit) {
     var services = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || [];
     duration = services.reduce(function (pre, cur) {
       var current = new Decimal(0);
-      if (isDay) {
+      if (isDay || isMultiDayProduct(cur)) {
         // 普通商品不能加到时长上
-        var _duration2 = isDayBookingProduct(cur, state) ? new Decimal(cur._extend.duration || 0) : new Decimal(0);
+        var _duration2 = !isNormalProductByDurationSchedule(cur) ? new Decimal(cur._extend.duration || 0) : new Decimal(0);
         current = _duration2;
       } else {
         var _cur$_extend;
         current = new Decimal(flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0) || 0);
       }
+      if (isDay || isMultiDayProduct(cur)) {
+        dayDuration = dayDuration.add(current);
+      } else {
+        minuteDuration = minuteDuration.add(current);
+      }
       return pre.add(current);
     }, new Decimal(0));
   }
   return {
     productExpectAmount: price.toNumber(),
-    duration: getDiscountTime(duration.toNumber(), isDay)
+    duration: getDiscountTimeByDayMinutes(dayDuration.toNumber(), minuteDuration.toNumber())
   };
 };
 var getProductItemTax = function getProductItemTax(item, state, options) {