@pisell/private-materials 6.0.25 → 6.2.1

package/es/components/eventBooking/components/Provider/Event/index.js

@@ -7,10 +7,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import { Skeleton } from 'antd';
-import { useEvent, useSales, useEventDetail } from "../../../../Sales";
+import { useEvent, useSales, useEventDetail, useStep, useCustomer } from "../../../../Sales";
 import BookingServiceList from "../../bookingServiceList";
 import BookingDetailModal from "../../bookingDetailModal";
 import "./index.less";
+import useLoginUser from "../../../../../hooks/useLoginUser";
 var Event = function Event() {
   var _data$resourceData2;
   var _useEvent = useEvent(),
@@ -20,6 +21,8 @@ var Event = function Event() {
     getEventListByTitle = _useEvent.getEventListByTitle;
   var _useSales = useSales(),
     data = _useSales.data;
+  var _useStep = useStep(),
+    changeAutoOperate = _useStep.changeAutoOperate;
   var _useEventDetail = useEventDetail(),
     onOpenEventDetail = _useEventDetail.onOpenEventDetail,
     open = _useEventDetail.open;
@@ -27,19 +30,41 @@ var Event = function Event() {
     _useState2 = _slicedToArray(_useState, 2),
     lists = _useState2[0],
     setLists = _useState2[1];
+  var customer = useLoginUser();
+  var _useCustomer = useCustomer(),
+    appUtils = _useCustomer.appUtils;
   useEffect(function () {
-    setLists((eventData === null || eventData === void 0 ? void 0 : eventData.eventList) || []);
+    var _data$stepData;
+    var eventList = (eventData === null || eventData === void 0 ? void 0 : eventData.eventList) || [];
+    setLists(eventList);
+
+    // 如果只有一个event，则直接选择并打开详情
+    if ((eventList === null || eventList === void 0 ? void 0 : eventList.length) === 1 && data !== null && data !== void 0 && (_data$stepData = data.stepData) !== null && _data$stepData !== void 0 && _data$stepData.isAutoOperate) {
+      selectEvent(eventList[0]);
+      onOpenEventDetail(eventList[0]);
+      // 自动操作结束，防止刷新再次弹出来
+      changeAutoOperate(false);
+    }
   }, [eventData === null || eventData === void 0 ? void 0 : eventData.eventList]);
   useEffect(function () {
-    var _data$resourceData;
+    var _data$resourceData, _appUtils$getHistory, _history$location;
     var id = data === null || data === void 0 || (_data$resourceData = data.resourceData) === null || _data$resourceData === void 0 || (_data$resourceData = _data$resourceData.currentResourceItem) === null || _data$resourceData === void 0 ? void 0 : _data$resourceData.id;
     if (!id) return;
-    getEventList.run({
+    var history = (appUtils === null || appUtils === void 0 || (_appUtils$getHistory = appUtils.getHistory) === null || _appUtils$getHistory === void 0 ? void 0 : _appUtils$getHistory.call(appUtils)) || {};
+    var query = history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.query;
+    var params = {
       event_item_resource_id: id,
       skip: 1,
-      num: 100
-    });
-  }, [data === null || data === void 0 || (_data$resourceData2 = data.resourceData) === null || _data$resourceData2 === void 0 || (_data$resourceData2 = _data$resourceData2.currentResourceItem) === null || _data$resourceData2 === void 0 ? void 0 : _data$resourceData2.id]);
+      num: 100,
+      customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+      open_quotation: 1
+    };
+    if (query !== null && query !== void 0 && query.ids) {
+      var _query$ids;
+      params.ids = query === null || query === void 0 || (_query$ids = query.ids) === null || _query$ids === void 0 ? void 0 : _query$ids.split(',');
+    }
+    getEventList.run(params);
+  }, [data === null || data === void 0 || (_data$resourceData2 = data.resourceData) === null || _data$resourceData2 === void 0 || (_data$resourceData2 = _data$resourceData2.currentResourceItem) === null || _data$resourceData2 === void 0 ? void 0 : _data$resourceData2.id, customer === null || customer === void 0 ? void 0 : customer.id]);
 
   /**
    * @title: 点击选择event

package/es/components/eventBooking/components/Provider/Header/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

package/es/components/eventBooking/components/Provider/Resource/index.js

@@ -1,12 +1,12 @@
-import React from 'react';
-import { PisellViewGrid } from '@pisell/materials';
+import React, { useEffect } from 'react';
+import { PisellViewGrid, Skeleton } from '@pisell/materials';
 import { isMobile, locales } from '@pisell/utils';
 import { useResource, useSales, useCart, useStep } from "../../../../Sales";
 import ResourceDisplay from "../../resourceDisplay";
 import { resourceTitle } from "../../../utils";
 import "./index.less";
 var Resource = function Resource() {
-  var _data$resourceData;
+  var _data$resourceData2, _data$resourceData3, _data$resourceData4;
   var _useSales = useSales(),
     data = _useSales.data;
   var _useResource = useResource(),
@@ -16,6 +16,21 @@ var Resource = function Resource() {
     createCartItem = _useCart.createCartItem;
   var _useStep = useStep(),
     nextStep = _useStep.nextStep;
+  useEffect(function () {
+    var _data$resourceData, _resourceList$, _data$stepData;
+    var resourceList = (data === null || data === void 0 || (_data$resourceData = data.resourceData) === null || _data$resourceData === void 0 ? void 0 : _data$resourceData.resourceList) || [];
+    if ((resourceList === null || resourceList === void 0 ? void 0 : resourceList.length) <= 0) {
+      return;
+    }
+
+    // 如果只有一个资源，则直接选中并进入下一步
+    var resourceListChildren = (resourceList === null || resourceList === void 0 || (_resourceList$ = resourceList[0]) === null || _resourceList$ === void 0 ? void 0 : _resourceList$.children) || [];
+    if ((resourceList === null || resourceList === void 0 ? void 0 : resourceList.length) === 1 && (resourceListChildren === null || resourceListChildren === void 0 ? void 0 : resourceListChildren.length) === 1 && data !== null && data !== void 0 && (_data$stepData = data.stepData) !== null && _data$stepData !== void 0 && _data$stepData.isAutoOperate) {
+      createCartItem();
+      selectResource(resourceListChildren[0]);
+      nextStep();
+    }
+  }, [data === null || data === void 0 || (_data$resourceData2 = data.resourceData) === null || _data$resourceData2 === void 0 ? void 0 : _data$resourceData2.resourceList]);
 
   /**
    * @title: 选择资源
@@ -59,7 +74,13 @@ var Resource = function Resource() {
     className: "title"
   }, locales.getText('pisell2.event.select.campus')(resourceTitle(data))), /*#__PURE__*/React.createElement("div", {
     className: "content"
-  }, data === null || data === void 0 || (_data$resourceData = data.resourceData) === null || _data$resourceData === void 0 || (_data$resourceData = _data$resourceData.resourceList) === null || _data$resourceData === void 0 ? void 0 : _data$resourceData.map(function (item, index) {
+  }, !(data !== null && data !== void 0 && (_data$resourceData3 = data.resourceData) !== null && _data$resourceData3 !== void 0 && (_data$resourceData3 = _data$resourceData3.resourceList) !== null && _data$resourceData3 !== void 0 && _data$resourceData3.length) ? /*#__PURE__*/React.createElement(Skeleton, {
+    loading: true,
+    active: true,
+    paragraph: {
+      rows: 3
+    }
+  }) : data === null || data === void 0 || (_data$resourceData4 = data.resourceData) === null || _data$resourceData4 === void 0 || (_data$resourceData4 = _data$resourceData4.resourceList) === null || _data$resourceData4 === void 0 ? void 0 : _data$resourceData4.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       className: "content-item"
@@ -70,7 +91,7 @@ var Resource = function Resource() {
       columns: isMobile() ? 1 : 3,
       verticalGap: 20,
       horizontalGap: 20,
-      loading: getResourceList.loading,
+      loading: false,
       renderItem: renderItem,
       className: "content-grid"
     }));

package/es/components/eventBooking/components/Provider/SelectHolderModal.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const SelectHolderModal: (props: any) => JSX.Element;
 export default SelectHolderModal;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => JSX.Element;
 export default Status;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.less

@@ -16,7 +16,6 @@
 
   .sales-close-tip {
     color: #1b1b1b;
-    font-family: Inter;
     font-size: 14px;
     font-style: normal;
     font-weight: 400;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const DayItem: (props: any) => JSX.Element;
 export default DayItem;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => JSX.Element;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.less

@@ -21,7 +21,6 @@
   //   position: absolute;
   //   bottom: 54px;
   //   left: 0;
-  //   font-family: Inter;
   //   font-size: 12px;
   //   font-style: normal;
   //   font-weight: 600;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => JSX.Element;
 export default Status;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/SelectDate/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
-declare const _default: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/SelectDate/index.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { forwardRef, useImperativeHandle, useState, useRef } from 'react';
+import React, { forwardRef, useImperativeHandle, useState, useRef } from 'react';
 import classNames from 'classnames';
 import dayjs from 'dayjs';
 import { Iconfont } from '@pisell/materials';

package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts

@@ -1,2 +1,4 @@
-declare const BookingOptions: () => JSX.Element;
+declare const BookingOptions: (props: {
+    onChangeBookingOption?: ((bookingOption: any) => void) | undefined;
+}) => JSX.Element;
 export default BookingOptions;

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

@@ -3,12 +3,19 @@ import OpenCard from "../../OpenCard";
 import { PisellCheckboxGroup, PisellText } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import { useEventDetail } from "../../../../Sales";
-var BookingOptions = function BookingOptions() {
+import Decimal from 'decimal.js';
+import PisellPriceText from "../../../../productSelect/components/pisellPriceText";
+var BookingOptions = function BookingOptions(props) {
   var _detail$bookingOption, _detail$bookingOption2;
   var _useEventDetail = useEventDetail(),
     detail = _useEventDetail.detail,
     currentBookingOption = _useEventDetail.currentBookingOption,
     selectEventDetailBookingOptions = _useEventDetail.selectEventDetailBookingOptions;
+  var onChange = function onChange(value, item) {
+    var _props$onChangeBookin;
+    selectEventDetailBookingOptions(value);
+    props === null || props === void 0 || (_props$onChangeBookin = props.onChangeBookingOption) === null || _props$onChangeBookin === void 0 || _props$onChangeBookin.call(props, item);
+  };
   return /*#__PURE__*/React.createElement(OpenCard, {
     title: locales.getText('pisell2.event.booking.options'),
     showBorder: true,
@@ -22,17 +29,32 @@ var BookingOptions = function BookingOptions() {
     optionClassName: "option-item ".concat((detail === null || detail === void 0 || (_detail$bookingOption2 = detail.bookingOptions) === null || _detail$bookingOption2 === void 0 ? void 0 : _detail$bookingOption2.length) > 1 ? 'option-item-pointer' : ''),
     value: currentBookingOption,
     renderOption: function renderOption(option) {
+      var _ref = option._originData || {},
+        price = _ref.price,
+        is_bundle = _ref.is_bundle,
+        minimum_markup_price = _ref.minimum_markup_price;
+      if (!option._originData || !is_bundle) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "item"
+        }, /*#__PURE__*/React.createElement("span", null, option.label), /*#__PURE__*/React.createElement(PisellText.Amount, {
+          value: option.price,
+          showCurrencySymbol: true,
+          className: "price"
+        }));
+      }
+      var _price = price;
+      if (is_bundle) {
+        _price = new Decimal(price).plus(new Decimal(minimum_markup_price)).toFixed(2);
+      }
       return /*#__PURE__*/React.createElement("div", {
         className: "item"
-      }, /*#__PURE__*/React.createElement("span", null, option.label), /*#__PURE__*/React.createElement(PisellText.Amount, {
-        value: option.price,
-        showCurrencySymbol: true,
-        className: "price"
+      }, /*#__PURE__*/React.createElement("span", null, option.label), /*#__PURE__*/React.createElement(PisellPriceText, {
+        className: "price",
+        value: _price,
+        isMini: true
       }));
     },
-    onChange: function onChange(value) {
-      return selectEventDetailBookingOptions(value);
-    }
+    onChange: onChange
   }));
 };
 export default BookingOptions;

package/es/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Resource: (props: any) => JSX.Element;
 export default Resource;

package/es/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Schedule: () => JSX.Element;
 export default Schedule;

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

@@ -2,9 +2,11 @@ import React from 'react';
 import OpenCard from "../../OpenCard";
 import { locales } from '@pisell/utils';
 import ScheduleCalendar from "../../scheduleCalendar";
-import { useEventDetail } from "../../../../Sales";
+import { useEventDetail, useInit } from "../../../../Sales";
 var Schedule = function Schedule() {
   var _detail$selectDate;
+  var _useInit = useInit(),
+    initData = _useInit.initData;
   var _useEventDetail = useEventDetail(),
     detail = _useEventDetail.detail,
     getEventDetailSelectDate = _useEventDetail.getEventDetailSelectDate;
@@ -22,9 +24,10 @@ var Schedule = function Schedule() {
       if (!id) return;
       getEventDetailSelectDate.run(id, {
         days: 366,
-        start_date: "".concat(e, "-01")
+        start_date: "".concat(e, "-01-01")
       });
-    }
+    },
+    type: initData === null || initData === void 0 ? void 0 : initData.scheduleDisplayType
   }));
 };
 export default Schedule;

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

@@ -2,6 +2,11 @@ function _typeof(o) { "@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 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 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 _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); }
@@ -11,27 +16,35 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useRef, useState, useEffect } from 'react';
 import { PisellModal, PisellAnchor, PisellImageCarousels } from '@pisell/materials';
 import EventCard from "../eventCard";
-import { useCart, useEventDetail } from "../../../Sales";
+import { useCart, useEventDetail, useInit } from "../../../Sales";
 import { isMobile, locales } from '@pisell/utils';
 import Schedule from "./components/Schedule";
 import Resource from "./components/Resource";
 import BookingOptions from "./components/BookingOptions";
 import OrderProductModal from "../Provider/OrderProductModal/index";
 import "./index.less";
+import useEngineContext from "../../../../hooks/useEngineContext";
 var BookingDetailModal = function BookingDetailModal(props) {
-  var _detail$introduction2;
+  var _initData$boardSettin2, _detail$introduction2;
   var modalContentRef = useRef(null);
+  var context = useEngineContext();
+  var _ref = context.appHelper || {},
+    utils = _ref.utils;
   var tabsRef = useRef();
   var _props$open = props.open,
     open = _props$open === void 0 ? false : _props$open;
   var _useEventDetail = useEventDetail(),
     detail = _useEventDetail.detail,
     onCloseEventDetail = _useEventDetail.onCloseEventDetail,
-    onSelectEventDetail = _useEventDetail.onSelectEventDetail;
+    onSelectEventDetail = _useEventDetail.onSelectEventDetail,
+    selectEventDetailProductDetail = _useEventDetail.selectEventDetailProductDetail,
+    checkBeforeSelectEventDetail = _useEventDetail.checkBeforeSelectEventDetail;
   var _useCart = useCart(),
     addToCart = _useCart.addToCart,
     checkBeforeAddToCart = _useCart.checkBeforeAddToCart,
     checkBeforeAddToCartResquest = _useCart.checkBeforeAddToCartResquest;
+  var _useInit = useInit(),
+    initData = _useInit.initData;
   var _useState = useState('introduction'),
     _useState2 = _slicedToArray(_useState, 2),
     activeTab = _useState2[0],
@@ -48,6 +61,20 @@ var BookingDetailModal = function BookingDetailModal(props) {
   var isUserClickRef = useRef(false); // 添加用户点击标记
   var scrollTimeoutRef = useRef(null);
 
+  /**
+   * @title: 按钮确认文案
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-06-26 15:34
+   */
+  var buttonText = useMemo(function () {
+    var _initData$boardSettin, _utils$translation;
+    var config = (initData === null || initData === void 0 || (_initData$boardSettin = initData.boardSetting) === null || _initData$boardSettin === void 0 || (_initData$boardSettin = _initData$boardSettin.config) === null || _initData$boardSettin === void 0 ? void 0 : _initData$boardSettin.product_display_setting) || {};
+    return (utils === null || utils === void 0 || (_utils$translation = utils.translation) === null || _utils$translation === void 0 ? void 0 : _utils$translation.call(utils, config === null || config === void 0 ? void 0 : config.booking_event_v2_product_detail_button)) || locales.getText('pisell2.event.add.to.cart');
+  }, [initData === null || initData === void 0 || (_initData$boardSettin2 = initData.boardSetting) === null || _initData$boardSettin2 === void 0 || (_initData$boardSettin2 = _initData$boardSettin2.config) === null || _initData$boardSettin2 === void 0 ? void 0 : _initData$boardSettin2.product_display_setting]);
+
   /**
    * @title: 详情锚点
    * @description:
@@ -184,9 +211,9 @@ var BookingDetailModal = function BookingDetailModal(props) {
     };
   }, [anchorOptions, activeTab, isScrolling]);
   /**
-  * 处理tab切换
-  * @param key 切换的标签ID
-  */
+   * 处理tab切换
+   * @param key 切换的标签ID
+   */
   var handleTabChange = function handleTabChange(key) {
     // 设置当前激活的标签
     setActiveTab(typeof key === 'string' ? key : key.toString());
@@ -257,7 +284,44 @@ var BookingDetailModal = function BookingDetailModal(props) {
     }, /*#__PURE__*/React.createElement(Resource, null)), /*#__PURE__*/React.createElement("div", {
       "data-section": "booking_options",
       className: "content-section"
-    }, /*#__PURE__*/React.createElement(BookingOptions, null))));
+    }, /*#__PURE__*/React.createElement(BookingOptions, {
+      onChangeBookingOption: checkToOpenProductDetailModal
+    }))));
+  };
+
+  /**
+   * @title: 判断是否需要拉起商品详情弹窗
+   * @description: 如果是普通商品，则不需要拉起商品详情弹窗
+   * @param {any} bookingOption 选中的option
+   * @return {void}
+   */
+  var checkToOpenProductDetailModal = function checkToOpenProductDetailModal(bookingOption) {
+    var _bookingOption$_origi;
+    console.log('>>>>>>>', bookingOption);
+    if ((bookingOption === null || bookingOption === void 0 || (_bookingOption$_origi = bookingOption._originData) === null || _bookingOption$_origi === void 0 ? void 0 : _bookingOption$_origi.is_eject) !== 1) {
+      return;
+    }
+    utils === null || utils === void 0 || utils.action({
+      type: 'pisell1.productDetail',
+      data: {
+        detail: _objectSpread(_objectSpread({}, (bookingOption === null || bookingOption === void 0 ? void 0 : bookingOption._originData) || {}), {}, {
+          open_deposit: 1
+        }),
+        isOS: false
+      },
+      callback: function callback(data) {
+        if (data !== null && data !== void 0 && data.isCancel) {
+          return;
+        }
+        console.log('data>>>>>>', data);
+        var product = _objectSpread(_objectSpread({}, data), {}, {
+          options: (data === null || data === void 0 ? void 0 : data.option) || []
+        });
+        delete product.option;
+        selectEventDetailProductDetail(product);
+        handleOk();
+      }
+    });
   };
 
   /**
@@ -268,35 +332,46 @@ var BookingDetailModal = function BookingDetailModal(props) {
    * @Date: 2025-01-15 23:08
    */
   var handleOk = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var checkRes;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var result, checkRes;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            console.log('>>>>>>>', detail);
+            // 判断当前选中的option是否是普通商品，如果不是，需要拉起商品详情弹窗
+            result = checkBeforeSelectEventDetail();
+            if (result) {
+              _context.next = 5;
+              break;
+            }
+            // 拉起商品详情弹窗
+            checkToOpenProductDetailModal(detail === null || detail === void 0 ? void 0 : detail.selectedProduct);
+            return _context.abrupt("return");
+          case 5:
             onSelectEventDetail();
 
             // 检测商品是否可以下单
-            _context.next = 3;
+            _context.next = 8;
             return checkBeforeAddToCart();
-          case 3:
+          case 8:
             checkRes = _context.sent;
             if (!((checkRes === null || checkRes === void 0 ? void 0 : checkRes.result) === false)) {
-              _context.next = 7;
+              _context.next = 12;
               break;
             }
             setOpenCheckout(true);
             return _context.abrupt("return");
-          case 7:
+          case 12:
             // 加入购物车
             addToCart();
-          case 8:
+          case 13:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function handleOk() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
@@ -320,7 +395,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     destroyOnClose: true,
     className: "booking-detail-modal",
     onCancel: onCloseEventDetail,
-    okText: locales.getText('pisell2.event.add.to.cart'),
+    okText: buttonText,
     cancelVisible: false,
     onOk: handleOk,
     width: isMobile() ? '100%' : 600,

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

@@ -9,7 +9,9 @@ import { PisellHeaderProgressBar, PisellModal } from '@pisell/materials';
 import { useSales } from "../../../Sales";
 import { locales } from '@pisell/utils';
 import "./index.less";
+import useEngineContext from "../../../../hooks/useEngineContext";
 var ProgressBar = function ProgressBar(_ref) {
+  var _context$appHelper;
   var title = _ref.title,
     description = _ref.description,
     _ref$showClose = _ref.showClose,
@@ -29,6 +31,9 @@ var ProgressBar = function ProgressBar(_ref) {
     setOpen = _useState2[1];
   var _useSales = useSales(),
     removeSessionStorage = _useSales.removeSessionStorage;
+  var context = useEngineContext();
+  var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    interaction = _ref2.interaction;
 
   /**
    * @title: 点击关闭
@@ -54,10 +59,21 @@ var ProgressBar = function ProgressBar(_ref) {
    * @Date: 2025-02-10 17:46
    */
   var handleOk = function handleOk() {
+    var _interaction$utils, _interaction$utils$is;
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils)) {
+      interaction.utils.postMessageToApp({
+        module: 'global',
+        key: 'paymentResultAction',
+        data: {
+          actionType: 'backHome'
+        }
+      });
+      return;
+    }
     onClose === null || onClose === void 0 || onClose();
     setOpen(false);
     // 清空数据
-    removeSessionStorage();
+    removeSessionStorage === null || removeSessionStorage === void 0 || removeSessionStorage();
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellHeaderProgressBar, {
     className: "event-progress-bar",

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

@@ -55,11 +55,11 @@ var PisellResourceCard = function PisellResourceCard(_ref) {
   var renderAvatar = function renderAvatar() {
     if (!showImage) return null;
     return /*#__PURE__*/React.createElement(PisellAvatar, {
-      src: image,
+      src: image || undefined,
       shape: shape,
       size: size,
       useTextAvatar: !image,
-      children: /*#__PURE__*/React.createElement(Image, {
+      children: (rest === null || rest === void 0 ? void 0 : rest.children) || /*#__PURE__*/React.createElement(Image, {
         src: defaultImage,
         preview: false
       }),

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

@@ -1,5 +1,6 @@
 .pisell-resource-card {
   box-shadow: none;
+  height: 100%;
   &-content {
     display: flex;
     gap: 16px;

package/es/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type Item = any;
 interface ProductItemProps {

package/es/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts

@@ -6,6 +6,7 @@ declare type CalendarItemProps = {
     onSelect: (date: string, item?: CalendarDataItem) => void;
     onChange: (date: string, type: string) => void;
     isEdit: boolean;
+    type?: 'calendarView' | 'textList';
 };
 declare const CalendarItem: (props: CalendarItemProps) => JSX.Element;
 export default CalendarItem;