@pisell/private-materials 6.4.71 → 6.4.72

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -22,8 +22,8 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
-import { getProductExtend } from "../../../booking/info2/service/addService/utils";
-import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
+import { getMultiDay, getProductExtend, isMultiDayProduct } from "../../../booking/info2/service/addService/utils";
+import { holderId, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
 import { useService } from "../../../booking/info/service/serviceManager";
 import ProductDisplayAdapter, { resolveProductDisplayConfig } from "../ProductDisplayAdapter";
@@ -35,6 +35,8 @@ import { useProducts } from "../../hooks/pisellos";
 import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } from "./utils";
 import { useToast } from '@pisell/materials';
 import { useIsActive } from "../../context/IsActiveContext";
+import { concatBookings, createBookingItemsByGroup } from "../../../booking/info/service2/Group/utils";
+import MultiDayTimeSelectModal from "./MultiDayTimeSelectModal";
 var productListLayout = {
   grid: true,
   config: '12:12'
@@ -77,6 +79,18 @@ var AddSerivce = function AddSerivce(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     firstLoading = _useState4[0],
     setFirstLoading = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    multiDayModalOpen = _useState6[0],
+    setMultiDayModalOpen = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    multiDayModalLoading = _useState8[0],
+    setMultiDayModalLoading = _useState8[1];
+  var _useState9 = useState(null),
+    _useState10 = _slicedToArray(_useState9, 2),
+    pendingMultiDayData = _useState10[0],
+    setPendingMultiDayData = _useState10[1];
   var stateRef = useRef(state);
   stateRef.current = state;
   var _useProducts = useProducts(notAvailableRef),
@@ -198,9 +212,227 @@ var AddSerivce = function AddSerivce(props) {
       executeCacheValues(productId, cacheValues, item, callback);
     }, 0);
   });
+
+  // 处理添加服务的逻辑（提取为独立函数，方便跨日商品确认后调用）
+  var processAddService = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item, _detail, e, notShowToast, startDate, endDate) {
+      var other, cacheItem, _total, _isEdit, _stateRef$current$ser, isMultiDay, getMultiDayCacheItem, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData, _window$openBookingEd, _window;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            other = JSON.parse(JSON.stringify(e));
+            other.session = e.session;
+            cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
+              product_id: item.id,
+              _id: getUniqueId(),
+              _key: e.key,
+              _extend: {
+                start_date: startDate,
+                quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
+                price: _detail.price,
+                product_name: item.title,
+                other: other,
+                end_date: endDate
+              },
+              new: 1
+            });
+            _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
+            cacheItem._extend.total = _total;
+            // 用于储存原价
+            cacheItem._extend.origin_total = _total;
+            _isEdit = !!stateRef.current.service.cacheItem;
+            if (_isEdit) {
+              cacheItem._id = (_stateRef$current$ser = stateRef.current.service.cacheItem) === null || _stateRef$current$ser === void 0 ? void 0 : _stateRef$current$ser._id;
+              cacheItem.new = 0;
+            }
+            // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
+            if (renderMode === 'current') {
+              // cacheItem._extend.resource = 0;
+              cacheItem.currentDefaultTime = stateRef.current.date.value.format('HH:mm');
+            }
+            cacheItem = getProductExtend({
+              cacheItem: cacheItem,
+              state: stateRef.current,
+              isDisabledTime: true
+            });
+            isMultiDay = isMultiDayProduct(cacheItem);
+            getMultiDayCacheItem = /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(isConcatBookings) {
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.next = 2;
+                      return getMultiDay({
+                        start_date: cacheItem._extend.start_date,
+                        end_date: cacheItem._extend.end_date,
+                        state: stateRef.current,
+                        cacheItem: cacheItem
+                      });
+                    case 2:
+                      cacheItem = _context.sent;
+                      cacheItem = createBookingItemsByGroup(cacheItem);
+                      if (isConcatBookings) {
+                        cacheItem = concatBookings(cacheItem);
+                      }
+                    case 5:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              }));
+              return function getMultiDayCacheItem(_x7) {
+                return _ref2.apply(this, arguments);
+              };
+            }();
+            if (stateRef.current.renderType === 'eventBooking') {
+              cacheItem.autoClose = false;
+            }
+            if (!cacheItem.autoClose) {
+              _context2.next = 26;
+              break;
+            }
+            cacheItem.autoClose = false;
+            cacheItem._serviceKey = genServiceKey(cacheItem);
+            if (!isMultiDay) {
+              _context2.next = 19;
+              break;
+            }
+            _context2.next = 19;
+            return getMultiDayCacheItem();
+          case 19:
+            _addService2 = addService(_toConsumableArray(stateRef.current.service.value), cacheItem, stateRef.current, isMultiDay), _list = _addService2.list, quantity = _addService2.quantity;
+            if (!notShowToast) {
+              handleAddToast(cacheItem.title, quantity || 1);
+            }
+            window.dispatchEvent(new CustomEvent('onAddNewService', {
+              detail: {
+                cacheItem: cacheItem
+              }
+            }));
+            try {
+              if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
+                val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
+                  return {
+                    product_id: s === null || s === void 0 ? void 0 : s.product_id,
+                    detailId: s === null || s === void 0 ? void 0 : s.id,
+                    detailProductId: s === null || s === void 0 ? void 0 : s.product_id,
+                    product_name: s === null || s === void 0 ? void 0 : s.title,
+                    price: s === null || s === void 0 ? void 0 : s.price,
+                    _id: s === null || s === void 0 ? void 0 : s._id,
+                    _key: s === null || s === void 0 ? void 0 : s._key,
+                    _serviceKey: s === null || s === void 0 ? void 0 : s._serviceKey
+                  };
+                });
+                sendData = {
+                  product_id: item === null || item === void 0 ? void 0 : item.id,
+                  detailId: _detail === null || _detail === void 0 ? void 0 : _detail.id,
+                  detailProductId: _detail === null || _detail === void 0 ? void 0 : _detail.product_id,
+                  product_name: item === null || item === void 0 ? void 0 : item.title,
+                  price: _detail === null || _detail === void 0 ? void 0 : _detail.price,
+                  serviceVal: val
+                };
+                sendWarningLog({
+                  title: 'addService',
+                  content: [{
+                    key: '添加数据',
+                    value: JSON.stringify(sendData)
+                  }, {
+                    key: '日期',
+                    value: dayjs().format('YYYY-MM-DD HH:mm:ss')
+                  }]
+                });
+              }
+            } catch (error) {}
+            dispatch({
+              type: 'setService',
+              payload: {
+                addModal: false,
+                value: _list,
+                edit: true,
+                changeService: false
+              }
+            });
+            _context2.next = 32;
+            break;
+          case 26:
+            (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
+            if (!isMultiDay) {
+              _context2.next = 30;
+              break;
+            }
+            _context2.next = 30;
+            return getMultiDayCacheItem(true);
+          case 30:
+            dispatch({
+              type: 'setService',
+              payload: {
+                editModal: true,
+                cacheItem: cacheItem,
+                addModal: !cacheItem.autoClose,
+                changeService: false
+              }
+            });
+            onEdit === null || onEdit === void 0 || onEdit(cacheItem);
+          case 32:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x, _x2, _x3, _x4, _x5, _x6) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+
+  // 处理跨日商品时间选择确认
+  var handleMultiDayConfirm = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(startDate, endDate, duration) {
+      var item, detail, e, notShowToast;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (pendingMultiDayData) {
+              _context3.next = 2;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 2:
+            setMultiDayModalLoading(true);
+            _context3.prev = 3;
+            item = pendingMultiDayData.item, detail = pendingMultiDayData.detail, e = pendingMultiDayData.e, notShowToast = pendingMultiDayData.notShowToast; // 使用选择的时间继续处理添加服务逻辑
+            _context3.next = 7;
+            return processAddService(item, detail, e, notShowToast, startDate, endDate);
+          case 7:
+            setPendingMultiDayData(null);
+            setMultiDayModalOpen(false);
+            _context3.next = 14;
+            break;
+          case 11:
+            _context3.prev = 11;
+            _context3.t0 = _context3["catch"](3);
+            console.error('添加跨日商品失败:', _context3.t0);
+          case 14:
+            _context3.prev = 14;
+            setMultiDayModalLoading(false);
+            return _context3.finish(14);
+          case 17:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[3, 11, 14, 17]]);
+    }));
+    return function (_x8, _x9, _x10) {
+      return _ref3.apply(this, arguments);
+    };
+  }());
+
+  // 处理跨日商品时间选择取消
+  var handleMultiDayCancel = useMemoizedFn(function () {
+    setMultiDayModalOpen(false);
+    setPendingMultiDayData(null);
+  });
   var handleSelectProduct = useMemoizedFn(function (item) {
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'select';
-    console.log('handleSelectProduct');
     if (!isNormalProductByDurationSchedule(item)) {
       var _state$service;
       if (!Array.isArray((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || !state.service.resourcesOrigin.length) {
@@ -240,19 +472,20 @@ var AddSerivce = function AddSerivce(props) {
       }
     }
     var callback = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e, extension_type, detail, notShowToast) {
-        var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _addService2, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData, _window$openBookingEd, _window;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(e, extension_type, detail, notShowToast) {
+        var data, _detail, isMultiDay;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              debugger;
               setCurrentProduct(null);
               // 防止选择商品弹窗多次触发callback
               if (!lock) {
-                _context.next = 3;
+                _context4.next = 4;
                 break;
               }
-              return _context.abrupt("return");
-            case 3:
+              return _context4.abrupt("return");
+            case 4:
               lock = true;
 
               // 2秒后解除
@@ -260,144 +493,57 @@ var AddSerivce = function AddSerivce(props) {
                 lock = false;
               }, 2000);
               if (isBooking4) {
-                _context.next = 11;
+                _context4.next = 12;
                 break;
               }
-              _context.next = 8;
+              _context4.next = 9;
               return createBookingData({
                 product: _objectSpread(_objectSpread({}, detail || item), {}, {
                   _params: e
                 })
               });
-            case 8:
-              data = _context.sent;
+            case 9:
+              data = _context4.sent;
               // 创建预约
               createBooking({
                 booking: data
               });
-              return _context.abrupt("return");
-            case 11:
+              return _context4.abrupt("return");
+            case 12:
               // info2 addService 逻辑
-              _detail = detail || item;
-              other = JSON.parse(JSON.stringify(e));
-              other.session = e.session;
-              cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
-                product_id: item.id,
-                _id: getUniqueId(),
-                _key: e.key,
-                _extend: {
-                  start_date: state.date.value,
-                  quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-                  price: _detail.price,
-                  product_name: item.title,
-                  other: other
-                },
-                new: 1
-              });
-              _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
-              cacheItem._extend.total = _total;
-              // 用于储存原价
-              cacheItem._extend.origin_total = _total;
-              _isEdit = !!state.service.cacheItem;
-              if (_isEdit) {
-                cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
-                cacheItem.new = 0;
-              }
-              // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
-              if (renderMode === 'current') {
-                // cacheItem._extend.resource = 0;
-                cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
+              _detail = detail || item; // 判断是否是跨日商品，如果是，先打开时间选择弹窗
+              isMultiDay = isMultiDayProduct(_detail || item);
+              if (!isMultiDay) {
+                _context4.next = 18;
+                break;
               }
-              cacheItem = getProductExtend({
-                cacheItem: cacheItem,
-                state: state,
-                isDisabledTime: true
+              // 保存待处理的数据
+              setPendingMultiDayData({
+                item: item,
+                detail: _detail,
+                e: e,
+                notShowToast: notShowToast
               });
-              if (state.renderType === 'eventBooking') {
-                cacheItem.autoClose = false;
-              }
-              if (cacheItem.autoClose) {
-                cacheItem.autoClose = false;
-                cacheItem._serviceKey = genServiceKey(cacheItem);
-                _addService2 = addService(_toConsumableArray(stateRef.current.service.value), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity;
-                if (!notShowToast) {
-                  handleAddToast(cacheItem.title, quantity || 1);
-                }
-                window.dispatchEvent(new CustomEvent('onAddNewService', {
-                  detail: {
-                    cacheItem: cacheItem
-                  }
-                }));
-                try {
-                  if (((_context$appHelper$ut4 = context.appHelper.utils.store) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut4.getState) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.global) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) === 2155) {
-                    val = _list === null || _list === void 0 ? void 0 : _list.map(function (s) {
-                      return {
-                        product_id: s === null || s === void 0 ? void 0 : s.product_id,
-                        detailId: s === null || s === void 0 ? void 0 : s.id,
-                        detailProductId: s === null || s === void 0 ? void 0 : s.product_id,
-                        product_name: s === null || s === void 0 ? void 0 : s.title,
-                        price: s === null || s === void 0 ? void 0 : s.price,
-                        _id: s === null || s === void 0 ? void 0 : s._id,
-                        _key: s === null || s === void 0 ? void 0 : s._key,
-                        _serviceKey: s === null || s === void 0 ? void 0 : s._serviceKey
-                      };
-                    });
-                    sendData = {
-                      product_id: item === null || item === void 0 ? void 0 : item.id,
-                      detailId: _detail === null || _detail === void 0 ? void 0 : _detail.id,
-                      detailProductId: _detail === null || _detail === void 0 ? void 0 : _detail.product_id,
-                      product_name: item === null || item === void 0 ? void 0 : item.title,
-                      price: _detail === null || _detail === void 0 ? void 0 : _detail.price,
-                      serviceVal: val
-                    };
-                    sendWarningLog({
-                      title: 'addService',
-                      content: [{
-                        key: '添加数据',
-                        value: JSON.stringify(sendData)
-                      }, {
-                        key: '日期',
-                        value: dayjs().format('YYYY-MM-DD HH:mm:ss')
-                      }]
-                    });
-                  }
-                } catch (error) {}
-                dispatch({
-                  type: 'setService',
-                  payload: {
-                    addModal: false,
-                    value: _list,
-                    edit: true,
-                    changeService: false
-                  }
-                });
-              } else {
-                (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
-                dispatch({
-                  type: 'setService',
-                  payload: {
-                    editModal: true,
-                    cacheItem: cacheItem,
-                    addModal: !cacheItem.autoClose,
-                    changeService: false
-                  }
-                });
-                onEdit === null || onEdit === void 0 || onEdit(cacheItem);
-              }
-            case 24:
+              // 打开时间选择弹窗
+              setMultiDayModalOpen(true);
+              return _context4.abrupt("return");
+            case 18:
+              _context4.next = 20;
+              return processAddService(item, _detail, e, notShowToast, state.date.value);
+            case 20:
             case "end":
-              return _context.stop();
+              return _context4.stop();
           }
-        }, _callee);
+        }, _callee4);
       }));
-      return function callback(_x, _x2, _x3, _x4) {
-        return _ref.apply(this, arguments);
+      return function callback(_x11, _x12, _x13, _x14) {
+        return _ref4.apply(this, arguments);
       };
     }();
 
     // 如果不需要打开弹窗, 直接添加数据
     if (cacheValues) {
-      var _stateRef$current$ser, _detail$_extend, _Toast$success2;
+      var _stateRef$current$ser2, _detail$_extend, _Toast$success2;
       var productId = item.id.toString();
 
       // 如果已经有pending的同商品，增加点击次数
@@ -409,7 +555,7 @@ var AddSerivce = function AddSerivce(props) {
         clickCountRef.current[productId] = 1;
       }
       var cacheItem = createSimpleCacheItem(item, cacheValues, state);
-      var detail = (_stateRef$current$ser = stateRef.current.service.value) === null || _stateRef$current$ser === void 0 ? void 0 : _stateRef$current$ser.find(function (val) {
+      var detail = (_stateRef$current$ser2 = stateRef.current.service.value) === null || _stateRef$current$ser2 === void 0 ? void 0 : _stateRef$current$ser2.find(function (val) {
         return isSameProduct(val, cacheItem);
       });
       var originalQuantity = (detail === null || detail === void 0 || (_detail$_extend = detail._extend) === null || _detail$_extend === void 0 ? void 0 : _detail$_extend.quantity) || 0;
@@ -448,16 +594,6 @@ var AddSerivce = function AddSerivce(props) {
   });
   var renderList = useMemo(function () {
     var _list = products || [];
-
-    // 跨日预约
-    if (isDaysBooking(state)) {
-      // 公共购物车下过滤掉预约商品
-      if (!holderId(state)) {
-        _list = _list.filter(function (item) {
-          return isNormalProductByDurationSchedule(item);
-        });
-      }
-    }
     return _list;
   }, [products, state === null || state === void 0 ? void 0 : state.activeCartId]);
   var currentDate = useMemo(function () {
@@ -496,6 +632,7 @@ var AddSerivce = function AddSerivce(props) {
   }, [productDisplayConfig]);
   return useMemo(function () {
     if (renderMode === 'current') {
+      var _pendingMultiDayData$;
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductDisplayAdapter, {
         config: finalDisplayConfig,
         dataSource: renderList,
@@ -504,9 +641,17 @@ var AddSerivce = function AddSerivce(props) {
         onSelectProduct: handleSelectProduct
       }), /*#__PURE__*/React.createElement(NotAvailable, {
         ref: notAvailableRef
+      }), /*#__PURE__*/React.createElement(MultiDayTimeSelectModal, {
+        open: multiDayModalOpen,
+        productName: pendingMultiDayData === null || pendingMultiDayData === void 0 || (_pendingMultiDayData$ = pendingMultiDayData.item) === null || _pendingMultiDayData$ === void 0 ? void 0 : _pendingMultiDayData$.title,
+        locale: state === null || state === void 0 ? void 0 : state.locale,
+        defaultStartDate: state.date.value,
+        loading: multiDayModalLoading,
+        onConfirm: handleMultiDayConfirm,
+        onCancel: handleMultiDayCancel
       }));
     }
     return null;
-  }, [firstLoading, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4, finalDisplayConfig]);
+  }, [firstLoading, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4, finalDisplayConfig, multiDayModalOpen, pendingMultiDayData, multiDayModalLoading]);
 };
 export default AddSerivce;

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -679,17 +679,20 @@ var TicketBooking = function TicketBooking(props) {
       })
     });
     setTimeout(function () {
-      var _state$modalState$ser;
-      if ((_state$modalState$ser = state.modalState.service) !== null && _state$modalState$ser !== void 0 && (_state$modalState$ser = _state$modalState$ser.value) !== null && _state$modalState$ser !== void 0 && _state$modalState$ser.length) {
-        var _state$bookingFunctio, _state$bookingFunctio2, _state$modalState$ser2;
-        var _list = (_state$bookingFunctio = state.bookingFunctions) === null || _state$bookingFunctio === void 0 || (_state$bookingFunctio2 = _state$bookingFunctio.updateServiceDate) === null || _state$bookingFunctio2 === void 0 ? void 0 : _state$bookingFunctio2.call(_state$bookingFunctio, (_state$modalState$ser2 = state.modalState.service) === null || _state$modalState$ser2 === void 0 ? void 0 : _state$modalState$ser2.value, date, false);
-        _setModalState({
-          service: _objectSpread(_objectSpread({}, state.modalState.service), {}, {
-            value: _list,
-            edit: true
-          })
-        });
-      }
+      // if (state.modalState.service?.value?.length) {
+      //   let _list = state.bookingFunctions?.updateServiceDate?.(
+      //     state.modalState.service?.value,
+      //     date,
+      //     false
+      //   );
+      //   _setModalState({
+      //     service: {
+      //       ...state.modalState.service,
+      //       value: _list,
+      //       edit: true,
+      //     },
+      //   });
+      // }
     }, 100);
   };
   var _setShopOpeningHours = function _setShopOpeningHours() {

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

@@ -15,9 +15,14 @@ export declare const restoreProductOtherData: (data: any) => {
     quantity: number;
 } | undefined;
 export declare const isSameProduct: (a: any, b: any) => boolean;
-export declare const addService: (list: any[], addItem: any, state: any) => {
+export declare const addService: (list: any[], addItem: any, state: any, isMultiDay?: boolean) => {
+    list: any[];
+    count: number;
+    quantity?: undefined;
+} | {
     list: any[];
     quantity: any;
+    count?: undefined;
 };
 export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
 export declare const getCartProductOverlay: (state: any) => any;

package/es/components/ticketBooking/utils/index.js

@@ -2,10 +2,14 @@ var _excluded = ["detail"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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; }
@@ -16,6 +20,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { isNormalProductByDurationSchedule } from "../../booking/info/service2/utils";
 import { isArr, getUniqueId } from '@pisell/utils';
+import { isMultiDayProduct } from "../../booking/info2/service/addService/utils";
 
 /** dayjs对象格式化为字符串时间 */
 export var formatDateToStr = function formatDateToStr(date) {
@@ -133,9 +138,18 @@ export var isSameProduct = function isSameProduct(a, b) {
   }
   return ((_a$_extend2 = a._extend) === null || _a$_extend2 === void 0 || (_a$_extend2 = _a$_extend2.other) === null || _a$_extend2 === void 0 ? void 0 : _a$_extend2.rowKey) === ((_b$_extend2 = b._extend) === null || _b$_extend2 === void 0 || (_b$_extend2 = _b$_extend2.other) === null || _b$_extend2 === void 0 ? void 0 : _b$_extend2.rowKey) && a._serviceKey === b._serviceKey;
 };
-export var addService = function addService(list, addItem, state) {
+export var addService = function addService(list, addItem, state, isMultiDay) {
   var value = list;
   var count;
+
+  // 跨日预约 不需要叠加
+  if (isMultiDay && isArr(addItem)) {
+    return {
+      list: [].concat(_toConsumableArray(addItem), _toConsumableArray(value)),
+      count: 1
+    };
+  }
+
   // 预约商品 并且配置商品卡片不叠加 直接添加
   if (!isNormalProductByDurationSchedule(addItem) && !getIsOverlayProduct(addItem, state)) {
     value.unshift(addItem);
@@ -232,6 +246,10 @@ export var getIsOverlayProduct = function getIsOverlayProduct(item, state) {
 // 获取购物车商品是否显示数量
 export var getIsShowNumber = function getIsShowNumber(item, state) {
   var isBookingTicket2 = state.isBookingTicket2;
+  // 跨日商品不允许选多个
+  if (isMultiDayProduct(item)) {
+    return false;
+  }
   return isNormalProductByDurationSchedule(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
 };
 

package/es/components/wallet/Detail/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    addWalletCard: any;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    walletDetailState: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/es/components/wallet/DiscountCard/model.d.ts

@@ -1,14 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-    setup?: 'menu' | 'list' | 'detail' | string;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;