@pisell/private-materials 3.4.4 → 3.4.6

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

@@ -3,13 +3,13 @@ import Info2 from "../info2";
 import Info1 from "./main";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { isBooking4Shop } from "./utils";
-import { Skeleton } from "antd";
+import { Skeleton } from 'antd';
 var APP = function APP(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5;
   var context = useEngineContext();
   var globalState = props.globalState;
-  var isBooking4 = isBooking4Shop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id, globalState === null || globalState === void 0 ? void 0 : globalState.renderType);
-  if (!((_context$appHelper$ut3 = context.appHelper.utils.store) !== null && _context$appHelper$ut3 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut3.getState) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.call(_context$appHelper$ut3)) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.global) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.globalConfig) !== null && _context$appHelper$ut4 !== void 0 && _context$appHelper$ut4.id)) {
+  var isBooking4 = isBooking4Shop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id, globalState === null || globalState === void 0 ? void 0 : globalState.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
+  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 && _context$appHelper$ut5.id)) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         padding: 16

package/es/components/booking/info/utils.d.ts

@@ -21,7 +21,7 @@ export declare const isInterval: (time1: number, time2: number, interval?: numbe
  * @Date: 2024-08-13 19:36
  */
 export declare const formatServiceListByTime: (list: any[]) => any[];
-export declare const isBooking4Shop: (shopId: number, renderType?: string) => boolean;
+export declare const isBooking4Shop: (shopId: number, renderType?: string, businessUtils?: any) => any;
 declare type DataEntry = {
     total: number;
     origin_total: number;

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

@@ -91,12 +91,14 @@ export var formatServiceListByTime = function formatServiceListByTime(list) {
     return list;
   }
 };
-export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
+export var isBooking4Shop = function isBooking4Shop(shopId, renderType, businessUtils) {
   if (renderType === 'eventBooking') {
     return false;
   }
   var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918, 6413];
-  return booking4Shops.includes(shopId);
+
+  // 固定的shopId 或者安装 Resource Kit 应用，则认为是booking4Shop
+  return booking4Shops.includes(shopId) || (businessUtils === null || businessUtils === void 0 ? void 0 : businessUtils.getAppByModal('resourcekit'));
 };
 function generateDateRange(start, end) {
   var dateRange = [];

package/es/components/booking/info2/service/addService/utils.js

@@ -370,7 +370,11 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
   var _resources = _toConsumableArray((cacheItem === null || cacheItem === void 0 || (_cacheItem$product_re = cacheItem.product_resource) === null || _cacheItem$product_re === void 0 ? void 0 : _cacheItem$product_re.resources) || []);
   var _ref8 = extraParams || {},
     _ref8$extraResources = _ref8.extraResources,
-    extraResources = _ref8$extraResources === void 0 ? [] : _ref8$extraResources;
+    extraResources = _ref8$extraResources === void 0 ? [] : _ref8$extraResources,
+    _ref8$resourcesOrigin = _ref8.resourcesOrigin,
+    resourcesOrigin = _ref8$resourcesOrigin === void 0 ? [] : _ref8$resourcesOrigin,
+    _ref8$resourceTab = _ref8.resourceTab,
+    resourceTab = _ref8$resourceTab === void 0 ? {} : _ref8$resourceTab;
   // 过滤出开启的资源
   _resources = _resources.filter(function (d) {
     return d.status == 1;
@@ -379,15 +383,29 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
     _step2;
   try {
     var _loop3 = function _loop3() {
+      var _resourceTab$item$cod;
       var item = _step2.value;
       var form_id = item.id;
+      // resource_tab -> 每个资源类型 -> resource_display_scope  { only_linked: '仅显示已关联资源' ｜ all: '全部' } 默认值 ‘only_linked’
+      var isAllResource = (resourceTab === null || resourceTab === void 0 || (_resourceTab$item$cod = resourceTab[item.code]) === null || _resourceTab$item$cod === void 0 ? void 0 : _resourceTab$item$cod.resource_display_scope) === 'all';
 
       // 将未绑定的资源，也放入 SelectOption 列表，避免出现仅展示id的情况
-      var extraResourceIds = extraResources.filter(function (_extraItem) {
-        return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
-      }).map(function (_extraItem) {
-        return _extraItem.id;
-      });
+      var extraResourceIds = [];
+
+      // 如果设置了全部资源 需要把未关联的资源进行补全
+      if (isAllResource) {
+        extraResourceIds = (resourcesOrigin || []).filter(function (d) {
+          return d.form_code === item.code;
+        }).map(function (d) {
+          return d.id;
+        });
+      } else {
+        extraResourceIds = extraResources.filter(function (_extraItem) {
+          return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
+        }).map(function (_extraItem) {
+          return _extraItem.id;
+        });
+      }
       extraResourceIds = Array.from(new Set(extraResourceIds));
 
       // 去重
@@ -415,7 +433,7 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
       };
 
       // 可选项
-      var optional_resource = [].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)).map(function (d) {
+      var optional_resource = Array.from(new Set([].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)))).map(function (d) {
         if (!resourcesOriginMap[d]) {
           return null;
         }
@@ -502,10 +520,13 @@ export var getProductExtend = function getProductExtend(_ref11) {
 
   // 资源总列表
   var resourcesOriginMap = state.service.resourcesOriginMap || {};
+  // const resourcesOrigin = state.s;
+
   _cacheItem._data = {};
 
   // 新商品
   if (isNew) {
+    var _state$bookingConfig3;
     // 时间切片
     _cacheItem._data.timeObj = getTimeObj({
       cacheItem: cacheItem,
@@ -520,7 +541,11 @@ export var getProductExtend = function getProductExtend(_ref11) {
     _cacheItem._data.capacitys = cacheItem.capacity;
 
     // 将商品关联的资源id还原资源列表
-    _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem);
+    _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
+      //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+      resourceTab: state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.resource_tab,
+      resourcesOrigin: state.service.resourcesOrigin
+    });
 
     // 默认容量
     _cacheItem._extend.capacity = setDefaultCapacitys({
@@ -592,6 +617,7 @@ export var getProductExtend = function getProductExtend(_ref11) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
+      var _state$bookingConfig4;
       var extraResources = [];
       // 日历中可以将预约拖入未绑定的资源中，需要兼容未绑定资源的 selectOption展示
       if (Array.isArray(_cacheItem._extend.event_resources)) {
@@ -603,7 +629,10 @@ export var getProductExtend = function getProductExtend(_ref11) {
         });
       }
       _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
-        extraResources: extraResources
+        extraResources: extraResources,
+        //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+        resourceTab: state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.resource_tab,
+        resourcesOrigin: state.service.resourcesOrigin
       });
     }
     if (!_cacheItem._data.resources) {

package/es/components/booking/info2/service/addTimeModal/index.js

@@ -498,7 +498,7 @@ var AddTimeModal = function AddTimeModal() {
   }();
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _context$appHelper$ut2, _context$appHelper$ut3;
+      var _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
       var loadingType,
         api,
         _args5 = arguments;
@@ -520,7 +520,7 @@ var AddTimeModal = function AddTimeModal() {
           case 5:
             loadingRef.current = true;
             setLoading(loadingType);
-            api = isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType) ? saveAddTimeProduct2 : saveAddTimeProduct;
+            api = isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils) ? saveAddTimeProduct2 : saveAddTimeProduct;
             _context5.prev = 8;
             _context5.next = 11;
             return api({

package/es/components/eventBooking/index.js

@@ -58,6 +58,20 @@ var Content = function Content() {
     }
     getResourceList.run(params);
   }, []);
+  useEffect(function () {
+    var setRealVH = function setRealVH() {
+      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
+      var vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
+    };
+
+    // 页面加载和窗口大小变化时都重新计算
+    setRealVH();
+    window.addEventListener('resize', setRealVH);
+    return function () {
+      window.removeEventListener('resize', setRealVH);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "event-booking-wrap ".concat(isMobile() ? 'event-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(Header, null), /*#__PURE__*/React.createElement(EventContent, null), isMobile() && (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) !== 'select-category' ? /*#__PURE__*/React.createElement(Footer, null) : null);

package/es/components/eventBooking/index.less

@@ -15,7 +15,7 @@
 
 .event-booking-mobile-wrap {
   background: #ffffff;
-  min-height: 100vh;
+  min-height: calc(var(--vh, 1vh) * 100);
   .pisell-section-headers-content {
     width: 100%;
   }

package/es/components/productSelect/components/TabProduct/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["showTab", "layout", "list", "onChange", "amountSymbol", "scrollDom", "value", "loading", "emptyDescription"];
+var _excluded = ["showTab", "layout", "list", "onChange", "amountSymbol", "scrollDom", "offsetDom", "value", "loading", "emptyDescription"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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(); }
@@ -16,7 +16,24 @@ import { useMemoizedFn, useDebounceFn } from 'ahooks';
 import { locales } from '@pisell/utils';
 import Tabs from "./tabs";
 import ProductGroup, { ProductGroupSkeleton } from "../productGroup";
-var io = null;
+// 获取元素相对于指定滚动容器的偏移量
+var getOffsetTopRelativeToScrollContainer = function getOffsetTopRelativeToScrollContainer(targetElement, scrollContainer) {
+  if (!targetElement || !scrollContainer) return 0;
+
+  // 如果目标元素就是滚动容器本身，返回0
+  if (targetElement === scrollContainer) {
+    return 0;
+  }
+
+  // 使用getBoundingClientRect计算相对偏移量
+  var targetRect = targetElement.getBoundingClientRect();
+  var containerRect = scrollContainer.getBoundingClientRect();
+
+  // targetRect.top - containerRect.top 得到目标元素相对于容器顶部的可视距离
+  // 考虑容器已经滚动的距离 再加上scrollContainer.scrollTop
+  // 这样得到的是目标元素在容器内容中的绝对位置
+  return targetRect.top - containerRect.top + scrollContainer.scrollTop;
+};
 var TabProduct = function TabProduct(props) {
   var _props$showTab = props.showTab,
     showTab = _props$showTab === void 0 ? true : _props$showTab,
@@ -26,6 +43,7 @@ var TabProduct = function TabProduct(props) {
     _props$amountSymbol = props.amountSymbol,
     amountSymbol = _props$amountSymbol === void 0 ? '$' : _props$amountSymbol,
     scrollDom = props.scrollDom,
+    offsetDom = props.offsetDom,
     currentProductId = props.value,
     loading = props.loading,
     emptyDescription = props.emptyDescription,
@@ -35,6 +53,8 @@ var TabProduct = function TabProduct(props) {
     _useState2 = _slicedToArray(_useState, 2),
     currentGroupId = _useState2[0],
     setCurrentGroupId = _useState2[1];
+  var tabLocatingRef = useRef(false);
+  var ioRef = useRef(null);
   useEffect(function () {
     if (list !== null && list !== void 0 && list.length) {
       setCurrentGroupId(list[0].id);
@@ -42,6 +62,11 @@ var TabProduct = function TabProduct(props) {
         handleObserver();
       });
     }
+
+    // 清理函数
+    return function () {
+      handleUnobserver();
+    };
   }, [list]);
 
   // 添加防抖的scroll函数
@@ -56,7 +81,7 @@ var TabProduct = function TabProduct(props) {
     var _marginTop = 270;
     var _marginBottom = window.innerHeight - 70 - 200 - 70;
     var _rootMargin = "".concat(_marginTop * -1, "px 0px ").concat(_marginBottom * -1, "px 0px");
-    io = new IntersectionObserver(function (entries) {
+    ioRef.current = new IntersectionObserver(function (entries) {
       var enteringEntries = entries.filter(function (entry) {
         return entry.isIntersecting;
       });
@@ -66,20 +91,24 @@ var TabProduct = function TabProduct(props) {
         var topMostEntry = enteringEntries.reduce(function (top, current) {
           return current.boundingClientRect.top < top.boundingClientRect.top ? current : top;
         });
-        var _topMostEntry$target$ = topMostEntry === null || topMostEntry === void 0 || (_topMostEntry$target = topMostEntry.target) === null || _topMostEntry$target === void 0 || (_topMostEntry$target = _topMostEntry$target.id) === null || _topMostEntry$target === void 0 ? void 0 : _topMostEntry$target.split('-'),
-          _topMostEntry$target$2 = _slicedToArray(_topMostEntry$target$, 2),
-          name = _topMostEntry$target$2[0],
-          id = _topMostEntry$target$2[1];
-        var newGroupId = Number(id);
-        setCurrentGroupId(newGroupId);
-        debouncedScroll.run(id);
-        // tabsRef?.current?.scroll(id);
+        var targetId = topMostEntry === null || topMostEntry === void 0 || (_topMostEntry$target = topMostEntry.target) === null || _topMostEntry$target === void 0 ? void 0 : _topMostEntry$target.id;
+        if (targetId) {
+          var _targetId$split = targetId.split('-'),
+            _targetId$split2 = _slicedToArray(_targetId$split, 2),
+            name = _targetId$split2[0],
+            id = _targetId$split2[1];
+          var newGroupId = Number(id);
+          if (!tabLocatingRef.current && !isNaN(newGroupId)) {
+            setCurrentGroupId(newGroupId);
+            debouncedScroll.run(id);
+          }
+        }
       }
     }, {
       root: null,
       rootMargin: _rootMargin
     });
-    if (list !== null && list !== void 0 && list.length) {
+    if (list !== null && list !== void 0 && list.length && ioRef.current) {
       var _iterator = _createForOfIteratorHelper(list),
         _step;
       try {
@@ -87,7 +116,7 @@ var TabProduct = function TabProduct(props) {
           var item = _step.value;
           var _item = document.querySelector("#list-".concat(item.id));
           if (_item) {
-            io.observe(_item);
+            ioRef.current.observe(_item);
           }
         }
       } catch (err) {
@@ -98,7 +127,7 @@ var TabProduct = function TabProduct(props) {
     }
   });
   var handleUnobserver = useMemoizedFn(function () {
-    if (list !== null && list !== void 0 && list.length && io) {
+    if (list !== null && list !== void 0 && list.length && ioRef.current) {
       var _iterator2 = _createForOfIteratorHelper(list),
         _step2;
       try {
@@ -106,7 +135,7 @@ var TabProduct = function TabProduct(props) {
           var item = _step2.value;
           var _item = document.querySelector("#list-".concat(item.id));
           if (_item) {
-            io.unobserve(_item);
+            ioRef.current.unobserve(_item);
           }
         }
       } catch (err) {
@@ -115,6 +144,11 @@ var TabProduct = function TabProduct(props) {
         _iterator2.f();
       }
     }
+    // 断开观察器连接
+    if (ioRef.current) {
+      ioRef.current.disconnect();
+      ioRef.current = null;
+    }
   });
   var renderContent = function renderContent() {
     if (loading) {
@@ -130,7 +164,7 @@ var TabProduct = function TabProduct(props) {
     return list.map(function (item, i) {
       return /*#__PURE__*/React.createElement("div", {
         id: "list-".concat(item.id),
-        key: i
+        key: "list-".concat(item.id)
       }, /*#__PURE__*/React.createElement(ProductGroup, _extends({
         onSelectProduct: onChange,
         currentProductId: currentProductId,
@@ -157,7 +191,7 @@ var TabProduct = function TabProduct(props) {
       shape: 'round'
     })));
   }, []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, showTab ? /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, showTab && list && list.length > 1 ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-product-select-tabs-wrapper"
   }, loading ? tabSkeleton : /*#__PURE__*/React.createElement(Tabs, {
     ref: tabsRef,
@@ -165,31 +199,61 @@ var TabProduct = function TabProduct(props) {
     rowKey: 'id',
     tab: currentGroupId,
     onChange: function onChange(e) {
-      var _document, _document2;
-      var comWrapper = document.querySelector('.pisell-product-select-wrapper');
-      var categoryDom = document.querySelector('.pisell-product-select-tabs-wrapper');
-      var wrapperOffsetTop = comWrapper.offsetTop;
-      var top = 0;
-      if (categoryDom) {
-        top = categoryDom.offsetHeight;
-      }
-      var dom = (_document = document) === null || _document === void 0 ? void 0 : _document.querySelector('#list-' + e);
-      var main = (_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.querySelector(scrollDom);
-      if (dom && main) {
-        var _list$;
-        if (e === ((_list$ = list[0]) === null || _list$ === void 0 ? void 0 : _list$.id)) {
-          main.scrollTop = 0;
-        } else {
-          main.scrollTop = dom.offsetTop - top - wrapperOffsetTop;
+      try {
+        var _document, _document2, _document3;
+        // 获取产品选择器包装容器
+        var productSelectWrapper = document.querySelector('.pisell-product-select-wrapper');
+        // 获取标签页包装容器
+        var tabsWrapper = document.querySelector('.pisell-product-select-tabs-wrapper');
+        // 计算标签页高度，用于滚动时的偏移
+        var tabsHeight = 0;
+        if (tabsWrapper) {
+          tabsHeight = tabsWrapper.offsetHeight;
         }
+
+        // 获取目标列表元素和滚动容器
+        var targetListElement = (_document = document) === null || _document === void 0 ? void 0 : _document.querySelector('#list-' + e);
+        var scrollContainer = scrollDom ? (_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.querySelector(scrollDom) : null;
+        // 获取额外偏移元素（如固定头部等）
+        var offsetElement = offsetDom ? (_document3 = document) === null || _document3 === void 0 ? void 0 : _document3.querySelector(offsetDom) : null;
+        var extraOffset = offsetElement ? offsetElement.clientHeight : 0;
+
+        // 停止观察器，防止滚动时触发tab切换
+        handleUnobserver();
+        // 标记正在进行tab定位，避免滚动时的干扰
+        tabLocatingRef.current = true;
+        if (targetListElement && scrollContainer) {
+          var _list$;
+          if (e === ((_list$ = list[0]) === null || _list$ === void 0 ? void 0 : _list$.id)) {
+            // 如果是第一个tab，滚动到产品选择器包装容器的位置
+            if (productSelectWrapper) {
+              var wrapperOffsetTop = getOffsetTopRelativeToScrollContainer(productSelectWrapper, scrollContainer);
+              scrollContainer.scrollTop = wrapperOffsetTop - extraOffset;
+            }
+          } else {
+            // 其他tab，滚动到对应列表元素位置，需要减去标签页高度
+            var listOffsetTop = getOffsetTopRelativeToScrollContainer(targetListElement, scrollContainer);
+            scrollContainer.scrollTop = listOffsetTop - tabsHeight - extraOffset;
+          }
+        }
+
+        // 更新当前选中的分组ID
+        setCurrentGroupId(e);
+        // 触发防抖滚动
+        debouncedScroll.run(e);
+        // 延迟恢复观察器
+        setTimeout(function () {
+          tabLocatingRef.current = false;
+          handleObserver();
+        }, 500);
+      } catch (error) {
+        console.error('Tab onChange error:', error);
+        // 即使出错也要恢复状态
+        tabLocatingRef.current = false;
+        setCurrentGroupId(e);
       }
-      handleUnobserver();
-      setCurrentGroupId(e);
-      setTimeout(function () {
-        handleObserver();
-      }, 1000);
     }
-  })) : null, /*#__PURE__*/React.createElement("div", {
+  })) : /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("br", null)), /*#__PURE__*/React.createElement("div", {
     className: "pisell-product-select-product-list"
   }, renderContent()));
 };

package/es/components/productSelect/components/TabProduct/tabs/index.less

@@ -107,6 +107,7 @@
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
+        user-select: none;
       }
 
       &:hover {

package/es/components/productSelect/index.d.ts

@@ -14,6 +14,8 @@ interface ProductSelectProps {
     value?: number;
     loading?: boolean;
     scrollDom?: string;
+    /** 某些设置了固定头部的情况 */
+    offsetDom?: string;
     style?: React.CSSProperties;
     emptyDescription?: string;
     token?: Partial<ProductSelectToken>;

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

@@ -33,7 +33,7 @@ import { addService, addServiceScroll, genServiceKey, getIsShowNumber } from "..
 import NotAvailable from "../notAvailable";
 import dayjs from 'dayjs';
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig2, _state$client2, _state$service3, _state$service4;
+  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$client2, _state$service3, _state$service4;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
@@ -56,7 +56,7 @@ var AddSerivce = function AddSerivce(props) {
     }),
     createBookingData = _useService.createBookingData,
     createBooking = _useService.createBooking;
-  var isBooking4 = isBooking4Shop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id, state === null || state === void 0 ? void 0 : state.renderType);
+  var isBooking4 = isBooking4Shop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id, state === null || state === void 0 ? void 0 : state.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
   var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
     currentProduct = _useState4[0],
@@ -291,7 +291,7 @@ var AddSerivce = function AddSerivce(props) {
       },
       callback: function () {
         var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e, extension_type, detail) {
-          var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _Toast$success, _addService, _list, quantity, _context$appHelper$ut3, _context$appHelper$ut4, val, sendData;
+          var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _Toast$success, _addService, _list, quantity, _context$appHelper$ut4, _context$appHelper$ut5, val, sendData;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -379,7 +379,7 @@ var AddSerivce = function AddSerivce(props) {
                   }, locales.getText('pisell2.ticket-booking.in-cart')(quantity || 1))));
                   addServiceScroll(e.rowKey, cacheItem);
                   try {
-                    if (((_context$appHelper$ut3 = context.appHelper.utils.store) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut3.getState) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.call(_context$appHelper$ut3)) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.global) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.id) === 2155) {
+                    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,

package/es/components/walletList/index.js

@@ -141,7 +141,7 @@ var DEFAULT_BALANCE = {
   discount_card_count: 0
 };
 var WalletList = Provider(function (props) {
-  var _utils$getStore, _dvaStore$core, _store$getState;
+  var _utils$getStore, _context$engine, _store$getState;
   var _props$globalState = props.globalState,
     globalState = _props$globalState === void 0 ? {} : _props$globalState; // 接收globalState属性
   var _useContext = useContext(Context),
@@ -152,8 +152,8 @@ var WalletList = Provider(function (props) {
     constants = _ref.constants,
     utils = _ref.utils;
   var dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState();
-  locales.init(localeTexts, (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en');
   // 添加组件挂载状态引用
+  locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en'); // 添加组件挂载状态引用
   var isMountedRef = useRef(true);
   var carouselRef = useRef(null);
   var store = utils.store;
@@ -587,7 +587,7 @@ var WalletList = Provider(function (props) {
     };
   }();
   var renderWalletCard = function renderWalletCard(item) {
-    var _dvaStore$core2;
+    var _dvaStore$core;
     var code = item.code,
       shop = item.shop,
       wallet = item.wallet,
@@ -643,7 +643,7 @@ var WalletList = Provider(function (props) {
       iconImg: icon,
       symbol: symbol,
       cardNo: code,
-      walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.translateLocale),
+      walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale),
       shopName: shopName,
       codeType: barcodetype,
       items: cardItems,

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

@@ -98,6 +98,7 @@ var CartItem = ({ onNext }) => {
         ...resourceOtherParams,
         errorList: null
       });
+      val.like_status = "like";
       appointmentBooking.updateCart({
         _id: e == null ? void 0 : e._id,
         resources: (0, import_utils2.updateCartResources)(e, val, currentSelectedResources)

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

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(100vh - 100px);
+  height: calc(var(--vh, 1vh) * 100 - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  >div {
+  > div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

package/lib/components/appointmentBooking/components/Cart/utils.js

@@ -25,7 +25,6 @@ __export(utils_exports, {
   handleAddHolder: () => handleAddHolder
 });
 module.exports = __toCommonJS(utils_exports);
-var import_utils = require("../../utils");
 var checkLogin = async ({
   isLogin,
   openLoginModal,
@@ -38,16 +37,7 @@ var checkLogin = async ({
   if (!isLogin) {
     openLoginModal({
       callback: (status) => {
-        var _a;
         if (status === "success") {
-          if (!isFormSubject) {
-            const user = JSON.parse(((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("customer")) || "{}");
-            const currentUser = (0, import_utils.formatCustomer)(user);
-            const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-            appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
-          } else {
-            getHolders();
-          }
         }
       }
     });