@pisell/private-materials 6.2.9 → 6.2.10

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

@@ -13,8 +13,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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 { formatCustomer } from "../../utils";
-
 // 类型声明
 
 export var checkLogin = /*#__PURE__*/function () {
@@ -31,17 +29,14 @@ export var checkLogin = /*#__PURE__*/function () {
           openLoginModal({
             callback: function callback(status) {
               if (status === 'success') {
-                if (!isFormSubject) {
-                  var _utils$storage;
-                  var user = JSON.parse((utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('customer')) || '{}');
-                  var currentUser = formatCustomer(user);
-                  var meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find(function (d) {
-                    return !(d !== null && d !== void 0 && d.isGuest);
-                  });
-                  appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
-                } else {
-                  getHolders();
-                }
+                // if (!isFormSubject) {
+                //   const user = JSON.parse(utils?.storage?.get('customer') || '{}');
+                //   const currentUser = formatCustomer(user);
+                //   const meAccount = accountLists?.find((d: any) => !d?.isGuest);
+                //   appointmentBooking.setLoginAccount(meAccount?.id, currentUser);
+                // } else {
+                //   getHolders();
+                // }
               }
             }
           });

package/es/components/appointmentBooking/components/Content/index.js

@@ -1,9 +1,12 @@
-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 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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); }); }; }
+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); }
@@ -22,12 +25,20 @@ import TimeSlicing from "../TimeSlicing";
 import Guest from "../Guest";
 import Form from "../Form";
 import ConfirmInformation from "../ConfirmInformation";
+
+// 创建一个包装组件，将 forwardRef 组件转换为普通组件
+// const Services = (props: any) => {
+//   return <ServicesOriginal {...props} />;
+// };
 import { useAppointmentBookingContext } from "../../context";
 import PolicyModal from "../../deposit/components/PolicyModal";
-import { useAppointmentBookingCart, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingLogin, useAppointmentBookingAccount, useShopDiscount } from "../../hooks";
+import { useAppointmentBookingCart, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingLogin, useAppointmentBookingAccount, useShopDiscount, contextUtils } from "../../hooks";
 import "./index.less";
+import useComponents from "../../../../hooks/useComponents";
+import useEngineContext from "../../../../hooks/useEngineContext";
+import { formatCustomer } from "../../utils";
 var Layout = function Layout() {
-  var _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6, _currentStep$step8;
+  var _useEngineContext$eng2, _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6, _currentStep$step8;
   var stepRef = useRef();
   var _ref = useAppointmentBookingContext(),
     currentStep = _ref.currentStep,
@@ -52,6 +63,16 @@ var Layout = function Layout() {
     removeStep = _useAppointmentBookin4.removeStep;
   var _useShopDiscount = useShopDiscount(),
     shopDiscount = _useShopDiscount.shopDiscount;
+  var _useEngineContext$eng = (_useEngineContext$eng2 = useEngineContext().engine) === null || _useEngineContext$eng2 === void 0 ? void 0 : _useEngineContext$eng2.props,
+    customPageData = _useEngineContext$eng.customPageData;
+  var _useComponents = useComponents({
+      components: ['CustomComponent']
+    }),
+    _useComponents2 = _slicedToArray(_useComponents, 1),
+    CustomComponent = _useComponents2[0];
+
+  // 调试：检查 CustomComponent 是什么
+  console.log('CustomComponent:', CustomComponent, _typeof(CustomComponent), CustomComponent === null || CustomComponent === void 0 ? void 0 : CustomComponent.$$typeof);
 
   // 不要删除
   useAppointmentBookingCart();
@@ -60,6 +81,51 @@ var Layout = function Layout() {
     _useState2 = _slicedToArray(_useState, 2),
     params = _useState2[0],
     setParams = _useState2[1];
+  var utils = contextUtils();
+  var context = useEngineContext();
+  var pubsub = context.appHelper.utils.pubsub;
+  useEffect(function () {
+    var handleLoginSuccess = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var _utils$storage, user, currentUser, accountLists, meAccount;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (isFormSubject) {
+                _context.next = 10;
+                break;
+              }
+              user = JSON.parse((utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('customer')) || '{}');
+              currentUser = formatCustomer(user);
+              _context.next = 5;
+              return appointmentBooking.getAccounts();
+            case 5:
+              accountLists = _context.sent;
+              meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find(function (d) {
+                return !(d !== null && d !== void 0 && d.isGuest);
+              });
+              appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
+              _context.next = 11;
+              break;
+            case 10:
+              if (!isRetailTemplate) {
+                getHolders();
+              }
+            case 11:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function handleLoginSuccess() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    pubsub.subscribe('pisell1.login.success', handleLoginSuccess);
+    return function () {
+      pubsub.unsubscribe('pisell1.login.success');
+    };
+  }, []);
   useEffect(function () {
     appointmentBooking.removeStep('fill-form');
     return function () {
@@ -147,11 +213,24 @@ var Layout = function Layout() {
     } else {
       Com = components[key];
     }
-    return /*#__PURE__*/React.createElement(Com, {
-      onChange: setParams,
-      params: params,
-      ref: stepRef
-    });
+    if (key === 'select-service') {
+      return /*#__PURE__*/React.createElement(CustomComponent, {
+        block: customPageData === null || customPageData === void 0 ? void 0 : customPageData.block,
+        customComponents: {
+          product_list: /*#__PURE__*/React.createElement(Com, {
+            onChange: setParams,
+            params: params,
+            ref: stepRef
+          })
+        }
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(Com, {
+        onChange: setParams,
+        params: params,
+        ref: stepRef
+      });
+    }
   }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key]);
 
   /**

package/es/components/appointmentBooking/components/Services/index.js

@@ -179,7 +179,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                           if (type === 'duration' || appointmentBooking.isCartHasDurationProduct()) {
                             stepList = appointmentBooking.getStepList();
                             hasResourceStep = 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';
                             });
                             if (hasResourceStep) {
                               description = locales.getText('pisell2.appointment.select.time');
@@ -233,12 +233,17 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
     }
     return ((_productListBlock = productListBlock) === null || _productListBlock === void 0 ? void 0 : _productListBlock.setting) || {};
   }, [context]);
+  var _isMobile = useMemo(function () {
+    if (typeof isMobile === 'function') return isMobile();
+    return isMobile;
+  }, isMobile);
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-service-wrap"
   }, /*#__PURE__*/React.createElement(ProductSelect, {
     dataSource: products,
     onChange: handleSelectProduct,
-    scrollDom: isMobile() ? '.parallel-content-wrap' : '.parallel-booking-wrap',
+    scrollDom: _isMobile ? '.parallel-content-wrap' : '.parallel-booking-wrap',
+    offsetDom: _isMobile ? '' : '.pisell-section-headers',
     loading: productLoading,
     emptyDescription: locales.getText('pisell2.appointment.booking.empty.service'),
     token: {

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -26,7 +26,6 @@ import { locales } from '@pisell/utils';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellText, PisellToast } from '@pisell/materials';
 import { useAppointmentBooking, useShopDiscount, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
-import { formatCustomer } from "../../utils";
 import "../../../booking/components/voucher/index.less";
 import "./index.less";
 var ShopDiscountHooks = {
@@ -179,15 +178,16 @@ var VoucherCard = function VoucherCard(props) {
         if (!action) return;
         openLoginModal({
           callback: function callback(status) {
-            var _utils$store;
-            var user = (_utils$store = utils.store) === null || _utils$store === void 0 || (_utils$store = _utils$store.getState()) === null || _utils$store === void 0 || (_utils$store = _utils$store.global) === null || _utils$store === void 0 ? void 0 : _utils$store.userInfo;
-            var currentUser = formatCustomer(user);
-            var meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find(function (d) {
-              return !(d !== null && d !== void 0 && d.isGuest);
-            });
-            if (status === 'success') {
-              appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
-            }
+            // const user = utils.store?.getState()?.global?.userInfo;
+            // const currentUser = formatCustomer(user);
+            // const meAccount = accountLists?.find((d: any) => !d?.isGuest);
+
+            // if (status === 'success') {
+            //   // appointmentBooking.setLoginAccount(
+            //   //   meAccount?.id,
+            //   //   currentUser
+            //   // );
+            // }
           }
         });
       }

package/es/components/appointmentBooking/hooks.js

@@ -17,7 +17,7 @@ import { useState, useEffect, useMemo } from 'react';
 import { locales } from "@pisell/utils";
 import { usePisellOS } from "../../hooks/useEngineContext";
 import useEngineContext from "../../hooks/useEngineContext";
-import { sortResources, getCustomer, currentAppointmentBoard, currentRenderLists, getFormInsertBeforeKey, checkAndGoNext, checkAndMarkCartRenderError, formatCustomer, formatHolder, Toast } from "./utils";
+import { sortResources, getCustomer, currentAppointmentBoard, currentRenderLists, getFormInsertBeforeKey, checkAndGoNext, checkAndMarkCartRenderError, formatHolder, Toast } from "./utils";
 import { useAppointmentBookingContext } from "./context";
 import { scrollToFirstErrorCard } from "./components/Resource/utils";
 export var useAppointmentBooking = function useAppointmentBooking() {
@@ -347,43 +347,41 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
       // 检测是否登录
       var checkLogin = /*#__PURE__*/function () {
         var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-          var accountLists;
+          var pubsub;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
                 if (isLogin) {
-                  _context3.next = 7;
+                  _context3.next = 6;
                   break;
                 }
-                _context3.next = 3;
-                return appointmentBooking.getAccounts();
-              case 3:
-                accountLists = _context3.sent;
+                // const accountLists = await appointmentBooking.getAccounts()
+                pubsub = utils.pubsub;
+                pubsub.once('pisell1.login.success', function () {
+                  checkHolder();
+                });
                 return _context3.abrupt("return", openLoginModal({
                   callback: function callback(status) {
-                    if (status === 'success') {
-                      if (!isFormSubject) {
-                        var _utils$storage;
-                        var user = JSON.parse((utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('customer')) || '{}');
-                        var currentUser = formatCustomer(user);
-                        var meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find(function (d) {
-                          return !(d !== null && d !== void 0 && d.isGuest);
-                        });
-                        appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
-                      } else {
-                        if (!isRetailTemplate) {
-                          getHolders();
-                        }
-                      }
-
-                      // 继续后续流程
-                      checkHolder();
-                    }
+                    // if (status === 'success') {
+                    //   // if (!isFormSubject) {
+                    //   //   const user = JSON.parse(utils?.storage?.get('customer') || '{}');
+                    //   //   const currentUser = formatCustomer(user);
+                    //   //   const meAccount = accountLists?.find((d: any) => !d?.isGuest);
+                    //   //   appointmentBooking.setLoginAccount(meAccount?.id, currentUser);
+                    //   // } else {
+                    //   //   if (!isRetailTemplate) {
+                    //   //     getHolders();
+                    //   //   }
+                    //   // }
+
+                    //   // 继续后续流程
+                    //   checkHolder()
+                    // }
                   }
                 }));
-              case 7:
+              case 6:
                 return _context3.abrupt("return", checkHolder());
-              case 8:
+              case 7:
               case "end":
                 return _context3.stop();
             }
@@ -537,12 +535,12 @@ export var useAppointmentBookingCart = function useAppointmentBookingCart() {
     bookingSubject = _ref14.bookingSubject;
   var getCartAndSummary = /*#__PURE__*/function () {
     var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      var _utils$storage2;
+      var _utils$storage;
       var locale, symbol, carts, accountLists, newCarts, summary;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            locale = (utils === null || utils === void 0 || (_utils$storage2 = utils.storage) === null || _utils$storage2 === void 0 ? void 0 : _utils$storage2.get('umi_locale')) || 'en-US';
+            locale = (utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('umi_locale')) || 'en-US';
             symbol = (utils === null || utils === void 0 ? void 0 : utils.getSymbolic()) || '$';
             _context6.next = 4;
             return appointmentBooking.getCart();
@@ -621,7 +619,7 @@ export var useAppointmentBookingLogin = function useAppointmentBookingLogin() {
     utils.action({
       type: 'pisell1.login',
       data: {
-        type: 'plugin'
+        // type: 'plugin'
       },
       callback: callback
     });

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 {