@pisell/private-materials 3.0.211 → 3.0.212

package/es/components/eventBooking/components/bookingDetailModal/index.js

@@ -2,7 +2,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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 _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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -46,6 +45,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     openCheckout = _useState6[0],
     setOpenCheckout = _useState6[1];
+  var isUserClickRef = useRef(false); // 添加用户点击标记
 
   /**
    * @title: 详情锚点
@@ -100,49 +100,103 @@ var BookingDetailModal = function BookingDetailModal(props) {
   useEffect(function () {
     if (!modalContentRef.current || !open) return;
     var handleScroll = function handleScroll() {
-      if (isScrolling) return;
+      if (isScrolling || isUserClickRef.current) return;
       var container = modalContentRef.current;
       if (!container) return;
       var scrollTop = container.scrollTop;
       var headerHeight = 58;
+      var containerHeight = container.clientHeight;
+      var scrollHeight = container.scrollHeight;
+      var lastOption = anchorOptions[anchorOptions.length - 1];
 
-      // 找到当前可见的区域
-      var _iterator = _createForOfIteratorHelper(anchorOptions),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var option = _step.value;
-          var element = document.getElementById(option.id);
-          if (element) {
-            var rect = element.getBoundingClientRect();
-            var elementTop = rect.top;
+      // 优先检查是否完全滚动到底部
+      var isExactBottom = Math.abs(scrollTop + containerHeight - scrollHeight) <= 1;
+      if (isExactBottom && activeTab !== lastOption.id) {
+        var _tabsRef$current;
+        setActiveTab(lastOption.id);
+        tabsRef === null || tabsRef === void 0 ? void 0 : (_tabsRef$current = tabsRef.current) === null || _tabsRef$current === void 0 ? void 0 : _tabsRef$current.scroll(lastOption.id);
+        return;
+      }
 
-            // 当元素进入视口顶部附近时
-            if (Math.abs(elementTop - headerHeight) < 50) {
-              if (activeTab !== option.id) {
-                var _tabsRef$current;
-                setActiveTab(option.id);
-                tabsRef === null || tabsRef === void 0 ? void 0 : (_tabsRef$current = tabsRef.current) === null || _tabsRef$current === void 0 ? void 0 : _tabsRef$current.scroll(option.id);
-              }
-              break;
-            }
-          }
+      // 其次检查是否接近底部
+      var isNearBottom = scrollTop + containerHeight + 100 >= scrollHeight;
+      var lastElement = document.getElementById(lastOption.id);
+      if (isNearBottom && lastElement) {
+        var rect = lastElement.getBoundingClientRect();
+        if (rect.top < containerHeight && activeTab !== lastOption.id) {
+          var _tabsRef$current2;
+          setActiveTab(lastOption.id);
+          tabsRef === null || tabsRef === void 0 ? void 0 : (_tabsRef$current2 = tabsRef.current) === null || _tabsRef$current2 === void 0 ? void 0 : _tabsRef$current2.scroll(lastOption.id);
+          return;
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+      }
+
+      // 找到当前在视口中的所有元素
+      var visibleElements = anchorOptions.map(function (option) {
+        var element = document.getElementById(option.id);
+        if (!element) return null;
+        var rect = element.getBoundingClientRect();
+        var elementTop = rect.top;
+        var elementBottom = rect.bottom;
+
+        // 元素顶部相对于视口顶部（考虑 header）的距离
+        var topDistance = Math.abs(elementTop - headerHeight);
+
+        // 元素是否在视口中
+        var isVisible = elementTop < containerHeight && elementBottom > headerHeight;
+        return {
+          id: option.id,
+          topDistance: topDistance,
+          isVisible: isVisible,
+          top: elementTop
+        };
+      }).filter(Boolean);
+
+      // 找到最接近顶部且可见的元素
+      var currentElement = visibleElements.filter(function (el) {
+        return el.isVisible;
+      }).sort(function (a, b) {
+        // 如果两个元素都在 header 下方，选择最靠近 header 的
+        if (a.top > headerHeight && b.top > headerHeight) {
+          return a.top - b.top;
+        }
+        // 如果两个元素都在 header 上方，选择最靠近 header 的
+        if (a.top < headerHeight && b.top < headerHeight) {
+          return b.top - a.top;
+        }
+        // 优先选择在 header 下方的元素
+        return a.top > headerHeight ? -1 : 1;
+      })[0];
+      if (currentElement && activeTab !== currentElement.id) {
+        var _tabsRef$current3;
+        setActiveTab(currentElement.id);
+        tabsRef === null || tabsRef === void 0 ? void 0 : (_tabsRef$current3 = tabsRef.current) === null || _tabsRef$current3 === void 0 ? void 0 : _tabsRef$current3.scroll(currentElement.id);
       }
     };
     var container = modalContentRef.current;
     container.addEventListener('scroll', handleScroll);
-
-    // 初始化时执行一次
-    setTimeout(handleScroll, 100);
     return function () {
       return container.removeEventListener('scroll', handleScroll);
     };
   }, [anchorOptions, activeTab, open, isScrolling]);
+  var handleTabChange = function handleTabChange(key) {
+    if (isUserClickRef.current) {
+      // 如果是用户点击，立即更新并禁用滚动监听
+      setActiveTab(key);
+      setIsScrolling(true); // 临时禁用滚动监听
+
+      // 延长禁用时间，确保滚动完全结束
+      setTimeout(function () {
+        setIsScrolling(false);
+        isUserClickRef.current = false; // 重置点击标记
+      }, 1200); // 稍微延长时间
+    } else {
+      // 如果是滚动触发，只在非滚动状态下更新
+      if (!isScrolling && !isUserClickRef.current) {
+        setActiveTab(key);
+      }
+    }
+  };
   var content = function content() {
     return /*#__PURE__*/React.createElement("div", {
       className: "booking-detail-modal-content",
@@ -153,9 +207,11 @@ var BookingDetailModal = function BookingDetailModal(props) {
       ref: tabsRef,
       options: anchorOptions,
       tab: activeTab,
-      onChange: function onChange(key) {
-        scrollToElement(key);
-        setActiveTab(key);
+      containerRef: modalContentRef,
+      onChange: handleTabChange,
+      onTabClick: function onTabClick() {
+        // 设置点击标记
+        isUserClickRef.current = true;
       }
     })), /*#__PURE__*/React.createElement("div", {
       className: "content-wrapper"
@@ -223,6 +279,16 @@ var BookingDetailModal = function BookingDetailModal(props) {
       return _ref.apply(this, arguments);
     };
   }();
+
+  // 监听弹窗打开/关闭状态，重置 activeTab
+  useEffect(function () {
+    if (open) {
+      setActiveTab('introduction');
+      // 重置其他相关状态
+      setIsScrolling(false);
+      isUserClickRef.current = false;
+    }
+  }, [open]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellModal, {
     open: open,
     title: locales.getText('pisell2.event.details'),

package/es/components/eventBooking/components/bookingDetailModal/index.less

@@ -12,7 +12,7 @@
       top: 0;
       z-index: 10;
       background: #fff;
-      padding: 0 !important;
+      padding: 0 16px !important;
       // padding: 16px;
     }
 

package/es/components/eventBooking/components/resourceDisplay/index.less

@@ -78,4 +78,18 @@
       line-height: 10px;
     }
   }
+
+  &-empty-avatar {
+    .pisell-lowcode-avatar-string {
+      position: relative;
+      left: 0;
+      height: 32px;
+      line-height: 32px;
+      transform: scale(1) !important;
+      .pisell-lowcode-image {
+        width: 32px;
+        height: 32px;
+      }
+    }
+  }
 }

package/es/components/eventBooking/index.js

@@ -40,7 +40,8 @@ var Content = function Content() {
     if (!form_id) return;
     getResourceList.run({
       form_id: form_id,
-      shop_id: shop_id
+      shop_id: shop_id,
+      form_data_status: 'active'
     });
   }, [form_id]);
   return getResourceList.data ? /*#__PURE__*/React.createElement("div", {

package/es/components/eventBooking/locales.d.ts

@@ -13,11 +13,12 @@ declare const _default: {
         'pisell2.event.close.continue': string;
         'pisell2.event.close.exit': string;
         'pisell2.event.step': (step: number) => string;
-        'pisell2.event.select.category': string;
+        'pisell2.event.select.category': (val: string) => string;
         'pisell2.event.select.campus': (val: string) => string;
         'pisell2.event.select.event': string;
         'pisell2.event.cart': string;
         'pisell2.event.total': string;
+        'pisell2.event.total.gst': (val: string, amount: any) => string;
         'pisell2.event.continue': string;
         'pisell2.event.details': string;
         'pisell2.event.introduction': string;
@@ -83,11 +84,12 @@ declare const _default: {
         'pisell2.event.close.continue': string;
         'pisell2.event.close.exit': string;
         'pisell2.event.step': (step: number) => string;
-        'pisell2.event.select.category': string;
+        'pisell2.event.select.category': (val: string) => string;
         'pisell2.event.select.event': string;
         'pisell2.event.select.campus': (val: string) => string;
         'pisell2.event.cart': string;
         'pisell2.event.total': string;
+        'pisell2.event.total.gst': (val: string, amount: any) => string;
         'pisell2.event.continue': string;
         'pisell2.event.details': string;
         'pisell2.event.introduction': string;
@@ -153,11 +155,12 @@ declare const _default: {
         'pisell2.event.close.continue': string;
         'pisell2.event.close.exit': string;
         'pisell2.event.step': (step: number) => string;
-        'pisell2.event.select.category': string;
+        'pisell2.event.select.category': (val: string) => string;
         'pisell2.event.select.event': string;
         'pisell2.event.select.campus': (val: string) => string;
         'pisell2.event.cart': string;
         'pisell2.event.total': string;
+        'pisell2.event.total.gst': (val: string, amount: any) => string;
         'pisell2.event.continue': string;
         'pisell2.event.details': string;
         'pisell2.event.introduction': string;

package/es/components/eventBooking/locales.js

@@ -15,13 +15,18 @@ export default {
     'pisell2.event.step': function pisell2EventStep(step) {
       return "Step ".concat(step);
     },
-    'pisell2.event.select.category': "Select category",
+    'pisell2.event.select.category': function pisell2EventSelectCategory(val) {
+      return "Select ".concat(val || 'resource');
+    },
     'pisell2.event.select.campus': function pisell2EventSelectCampus(val) {
-      return "Please choose ".concat(val || 'resource');
+      return "Please select ".concat(val || 'resource');
     },
-    'pisell2.event.select.event': "Select event",
+    'pisell2.event.select.event': "Select service",
     'pisell2.event.cart': "Cart",
     'pisell2.event.total': "Total",
+    'pisell2.event.total.gst': function pisell2EventTotalGst(val, amount) {
+      return "Including ".concat(val, " ").concat(amount);
+    },
     'pisell2.event.continue': "Continue",
     'pisell2.event.details': "Details",
     'pisell2.event.introduction': "Introduction",
@@ -93,13 +98,18 @@ export default {
     'pisell2.event.step': function pisell2EventStep(step) {
       return "\u6B65\u9AA4 ".concat(step);
     },
-    'pisell2.event.select.category': "选择分类",
-    'pisell2.event.select.event': "选择活动",
+    'pisell2.event.select.category': function pisell2EventSelectCategory(val) {
+      return "\u9009\u62E9".concat(val || '资源');
+    },
+    'pisell2.event.select.event': "选择服务",
     'pisell2.event.select.campus': function pisell2EventSelectCampus(val) {
       return "\u8BF7\u9009\u62E9".concat(val || '资源');
     },
     'pisell2.event.cart': "购物车",
     'pisell2.event.total': "总计",
+    'pisell2.event.total.gst': function pisell2EventTotalGst(val, amount) {
+      return "\u5305\u542B".concat(val, " ").concat(amount);
+    },
     'pisell2.event.continue': "继续",
     'pisell2.event.details': "详情",
     'pisell2.event.introduction': "介绍",
@@ -171,13 +181,18 @@ export default {
     'pisell2.event.step': function pisell2EventStep(step) {
       return "\u6B65\u9A5F ".concat(step);
     },
-    'pisell2.event.select.category': "選擇分類",
-    'pisell2.event.select.event': "選擇活動",
+    'pisell2.event.select.category': function pisell2EventSelectCategory(val) {
+      return "\u9078\u64C7".concat(val || '資源');
+    },
+    'pisell2.event.select.event': "選擇服務",
     'pisell2.event.select.campus': function pisell2EventSelectCampus(val) {
       return "\u8ACB\u9078\u64C7".concat(val || '資源');
     },
     'pisell2.event.cart': "購物車",
     'pisell2.event.total': "總計",
+    'pisell2.event.total.gst': function pisell2EventTotalGst(val, amount) {
+      return "\u5305\u542B".concat(val, " ").concat(amount);
+    },
     'pisell2.event.continue': "繼續",
     'pisell2.event.details': "詳情",
     'pisell2.event.introduction': "介紹",

package/es/components/eventBooking/utils.d.ts

@@ -34,3 +34,12 @@ export declare const getScheduleColors: (schedules: any[]) => string;
  * @Date: 2025-01-12 11:55
  */
 export declare const formatMonthDisplay: (dateString: string) => string;
+/**
+ * @title: 资源名称
+ * @description:
+ * @param {any} data
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-02-11 13:39
+ */
+export declare const resourceTitle: (data: any) => any;

package/es/components/eventBooking/utils.js

@@ -79,4 +79,21 @@ export var formatMonthDisplay = function formatMonthDisplay(dateString) {
     month: 'long',
     year: 'numeric'
   });
+};
+
+/**
+ * @title: 资源名称
+ * @description: 
+ * @param {any} data
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-02-11 13:39
+ */
+export var resourceTitle = function resourceTitle(data) {
+  var _data$initData, _data$initData$boardS, _data$initData$boardS2, _form$setting, _context$appHelper, _context$appHelper$ut, _translation;
+  var context = useEngineContext();
+  var form = data === null || data === void 0 ? void 0 : (_data$initData = data.initData) === null || _data$initData === void 0 ? void 0 : (_data$initData$boardS = _data$initData.boardSetting) === null || _data$initData$boardS === void 0 ? void 0 : (_data$initData$boardS2 = _data$initData$boardS.event_v2_form) === null || _data$initData$boardS2 === void 0 ? void 0 : _data$initData$boardS2.form;
+  var title = (form === null || form === void 0 ? void 0 : (_form$setting = form.setting) === null || _form$setting === void 0 ? void 0 : _form$setting.title) || (form === null || form === void 0 ? void 0 : form.title);
+  var translation = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.translation;
+  return (_translation = translation(title)) === null || _translation === void 0 ? void 0 : _translation.toLowerCase();
 };

package/lib/components/Sales/Cart/index.js

@@ -219,7 +219,7 @@ var CartProvider = ({ children }) => {
     });
   };
   const createCartItemData = () => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const _cartData = getCurrentData().cartData;
     if (_cartData.currentCartItem) {
       const {
@@ -256,6 +256,8 @@ var CartProvider = ({ children }) => {
         // 是否显示时间
         show_time: true,
         end_time: endTime ? (0, import_dayjs.default)(endTime || "").format("HH:mm") : "",
+        custom_day_count: ((_n = (_m = (_l = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _l.selectDate) == null ? void 0 : _m.dates) == null ? void 0 : _n.length) || 0,
+        is_charge_tax: bookingOptionData == null ? void 0 : bookingOptionData.is_charge_tax,
         _originData: {
           ..._cartData.currentCartItem._originData,
           product: {
@@ -281,9 +283,9 @@ var CartProvider = ({ children }) => {
       };
       if (holderItem == null ? void 0 : holderItem._originData) {
         newCartItem._originData.holder = {
-          customer_id: (_l = getUserInfo()) == null ? void 0 : _l.id,
-          form_id: (_m = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _m.form_id,
-          form_record: ((_n = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _n.form_record_id) ? [(_o = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _o.form_record_id] : null
+          customer_id: (_o = getUserInfo()) == null ? void 0 : _o.id,
+          form_id: (_p = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _p.form_id,
+          form_record: ((_q = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _q.form_record_id) ? [(_r = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _r.form_record_id] : null
         };
       }
       return newCartItem;

package/lib/components/Sales/Event/Detail.js

@@ -60,7 +60,7 @@ var EventDetailProvider = ({
     const introduction = {
       title: eventItem.title,
       price: eventItem.price,
-      images: [eventItem.image]
+      images: eventItem.image ? [eventItem.image] : []
     };
     eventRef.current = eventItem;
     _setDetail({ introduction });

package/lib/components/Sales/Init/index.d.ts

@@ -1,5 +1,9 @@
 import React from 'react';
 interface InitData {
+    boardSetting?: any;
+    form_id?: number;
+    shop_id?: number;
+    shop?: any;
 }
 interface InitContextType {
     getBoardSetting: any;

package/lib/components/Sales/Init/index.js

@@ -45,11 +45,13 @@ var import_Holder = __toESM(require("../Holder"));
 var import_Event = __toESM(require("../Event"));
 var import_Resource = __toESM(require("../Resource"));
 var import_Summary = __toESM(require("../Summary"));
+var import_Customer = require("../Customer");
 var InitContext = (0, import_react.createContext)(
   void 0
 );
 var InitProvider = ({ children }) => {
   const { data, setData, hooks, getCurrentData, getSessionStorage } = (0, import_SalesModel.useSales)();
+  const { appUtils } = (0, import_Customer.useCustomer)();
   const { useCustomInit } = hooks;
   const customInit = useCustomInit();
   const initData = (0, import_react.useMemo)(() => {
@@ -95,11 +97,12 @@ var InitProvider = ({ children }) => {
   const getBoardSetting = (0, import_ahooks.useRequest)(import_serve.getBoardSettingApi, {
     manual: true,
     onSuccess: (res) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       setInitData({
         boardSetting: res == null ? void 0 : res.data,
         form_id: (_d = (_c = (_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.config) == null ? void 0 : _b.resource) == null ? void 0 : _c.booking_event_v2_resource) == null ? void 0 : _d.form_id,
-        shop_id: (_e = res == null ? void 0 : res.data) == null ? void 0 : _e.shop_id
+        shop_id: (_e = res == null ? void 0 : res.data) == null ? void 0 : _e.shop_id,
+        shop: (_i = (_h = (_g = (_f = appUtils.getStore()) == null ? void 0 : _f.getState()) == null ? void 0 : _g.core) == null ? void 0 : _h.core) == null ? void 0 : _i.shop
       });
     }
   });

package/lib/components/Sales/Resource/serve.d.ts

@@ -1,4 +1,5 @@
 export declare const getResourceListApi: (params: {
     form_id: string;
     shop_id: string;
+    form_data_status: string;
 }) => Promise<any>;

package/lib/components/Sales/Summary/index.d.ts

@@ -4,6 +4,9 @@ interface SummaryData {
 interface SummaryContextType {
     subtotal: number | string;
     total: number | string;
+    taxTitle?: string;
+    totalTaxFee?: string;
+    isPriceIncludeTax?: 0 | 1;
 }
 interface SummaryProviderProps {
     children: React.ReactNode;

package/lib/components/Sales/Summary/index.js

@@ -38,6 +38,7 @@ module.exports = __toCommonJS(Summary_exports);
 var import_react = __toESM(require("react"));
 var import_Cart = require("../Cart");
 var import_utils = require("./utils");
+var import_Init = require("../Init");
 var defaultState = {};
 var SummaryContext = (0, import_react.createContext)(
   void 0
@@ -46,14 +47,21 @@ var SummaryProvider = ({
   children
 }) => {
   const { cartData } = (0, import_Cart.useCart)();
+  const { initData } = (0, import_Init.useInit)();
   const summaryData = (0, import_react.useMemo)(() => {
-    return (0, import_utils.calculatePriceDetails)(cartData.cartItems);
-  }, [cartData.cartItems]);
+    return (0, import_utils.calculatePriceDetails)(
+      (initData == null ? void 0 : initData.shop) || {},
+      cartData.cartItems
+    );
+  }, [cartData.cartItems, initData == null ? void 0 : initData.shop]);
   const contextValue = {
     // 商品总价
     subtotal: summaryData.subtotal,
     // 总金额
-    total: summaryData.total
+    total: summaryData.total,
+    taxTitle: summaryData.taxTitle,
+    totalTaxFee: summaryData.totalTaxFee,
+    isPriceIncludeTax: summaryData.isPriceIncludeTax
   };
   return /* @__PURE__ */ import_react.default.createElement(SummaryContext.Provider, { value: contextValue }, children);
 };

package/lib/components/Sales/Summary/serve.d.ts

@@ -1,2 +0,0 @@
-export declare const getHolderListApi: () => any;
-export declare const createHolderApi: (data: any) => any;

package/lib/components/Sales/Summary/serve.js

@@ -1,37 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/components/Sales/Summary/serve.ts
-var serve_exports = {};
-__export(serve_exports, {
-  createHolderApi: () => createHolderApi,
-  getHolderListApi: () => getHolderListApi
-});
-module.exports = __toCommonJS(serve_exports);
-var import_request = require("../../../utils/request");
-var getHolderListApi = () => {
-  return (0, import_request.get)("/api/holder/list");
-};
-var createHolderApi = (data) => {
-  return (0, import_request.post)("/api/holder/create", data);
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createHolderApi,
-  getHolderListApi
-});

package/lib/components/Sales/Summary/utils.d.ts

@@ -1,10 +1,15 @@
+import Decimal from 'decimal.js';
 interface CartItem {
     price: number | string;
     quantity?: number;
+    [k: string]: any;
 }
 interface PriceDetail {
     subtotal: string;
     total: string;
+    taxTitle?: string;
+    totalTaxFee?: string;
+    isPriceIncludeTax?: 0 | 1;
 }
 /**
  * 计算商品小计（不含其他费用）
@@ -12,11 +17,20 @@ interface PriceDetail {
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * @title: 单个商品的税费
+ * @description:
+ * 单个商品的税费 = 商品销售单价（折扣后） * 税率 * is_charge_tax /( 1+ 税率 * is_price_include_tax)
+ * $taxFee = $price * $taxRate * $isChargeTax / (1 + $taxRate * $isPriceIncludeTax);
+ * @return {*}
+ * @Author: xiangfeng.xue
+ */
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组
  * @param options - 其他费用配置
  * @returns 价格明细对象
  */
-export declare const calculatePriceDetails: (items: CartItem[]) => PriceDetail;
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => PriceDetail;
 export {};