@pisell/private-materials 3.3.53 → 3.3.55

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

@@ -20,6 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { getUniqueId, locales } from '@pisell/utils';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
+import { PisellToast } from '@pisell/materials';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { isSessionProduct, request, getProductTotalPrice, getIsEject } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
@@ -30,16 +31,16 @@ import { getProductDetail } from "../../../booking/info/service/serve";
 import { useService } from "../../../booking/info/service/serviceManager";
 import ProductSelect from "../../../productSelect";
 import "./index.less";
-import { addService, addServiceScroll } from "../../utils";
+import { addService } from "../../utils";
 import NotAvailable from "../notAvailable";
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig2, _state$client2, _state$service5, _state$service6;
+  var _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig2, _state$client2, _state$service5, _state$service6;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
     _props$renderMode = props.renderMode,
     renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode;
-  var _useState = useState(true),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
@@ -47,7 +48,6 @@ var AddSerivce = function AddSerivce(props) {
   var notAvailableRef = useRef(null);
   var isLoadedServiceRef = useRef(false);
   request.setRequest(context.appHelper.utils.request);
-  var Toast = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.Toast;
   var _useService = useService({
       renderMode: renderMode,
       onEdit: onEdit,
@@ -287,7 +287,7 @@ var AddSerivce = function AddSerivce(props) {
       },
       callback: function () {
         var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e, extension_type, detail) {
-          var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _Toast$success, _addService, _list, quantity;
+          var data, _detail, other, cacheItem, _total, _isEdit, _state$service$cacheI, _list;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -356,23 +356,17 @@ var AddSerivce = function AddSerivce(props) {
                 }
                 cacheItem = getProductExtend({
                   cacheItem: cacheItem,
-                  state: state,
-                  isDisabledTime: true
+                  state: state
                 });
                 if (state.renderType === 'eventBooking') {
                   cacheItem.autoClose = false;
                 }
                 if (cacheItem.autoClose) {
                   cacheItem.autoClose = false;
-                  _addService = addService(state.service.value, cacheItem), _list = _addService.list, quantity = _addService.quantity;
-                  Toast === null || Toast === void 0 || (_Toast$success = Toast.success) === null || _Toast$success === void 0 || _Toast$success.call(Toast, /*#__PURE__*/React.createElement("div", {
-                    className: "add-toast-wrap"
-                  }, /*#__PURE__*/React.createElement("div", {
-                    className: "add-toast-title"
-                  }, cacheItem.title), /*#__PURE__*/React.createElement("div", {
-                    className: "add-toast-quantity"
-                  }, locales.getText('pisell2.ticket-booking.in-cart')(quantity || 1))));
-                  addServiceScroll(e.rowKey, cacheItem);
+                  _list = addService(state.service.value, cacheItem);
+                  PisellToast({
+                    content: locales.getText('pisell2.ticket-booking.add-to-cart')
+                  });
                   dispatch({
                     type: 'setService',
                     payload: {

package/es/components/ticketBooking/components/addServiceVariant/index.less

@@ -1,10 +0,0 @@
-.add-toast-wrap {
-  width: 190px;
-  .add-toast-title {
-    margin-bottom: 12px;
-    line-height: 22px;
-  }
-  .add-toast-quantity {
-    font-size: 14px;
-  }
-}

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

@@ -286,7 +286,6 @@ var TicketBooking = function TicketBooking() {
         }
       }
     }
-    _modalState.service.value = [];
     _modalState.service.cacheItem = null;
     _modalState.service.addTimeModal = false;
     _modalState.service.changeService = false;
@@ -809,8 +808,7 @@ var TicketBooking = function TicketBooking() {
       locale: engineProps.locale,
       refreshData: _refreshData,
       setActiveTab: _setActiveTab,
-      clearAllValue: _clearAllValue,
-      drawerMask: true
+      clearAllValue: _clearAllValue
     }),
     setGlobalState: _setModalState,
     setState: setState,

package/es/components/ticketBooking/index.js

@@ -8,7 +8,6 @@ import React, { useLayoutEffect, useMemo, useRef } from 'react';
 import { Provider, createStore } from "./miniRedux";
 import { locales } from '@pisell/utils';
 import dayjs from 'dayjs';
-import { cloneDeep } from 'lodash';
 import TicketBooking from "./components/ticketBooking/index";
 import { request } from "../../utils";
 import useEngineContext from "../../hooks/useEngineContext";
@@ -142,7 +141,7 @@ export default (function (props) {
     request.setRequest(context.appHelper.utils.request);
   }, []);
   useMemo(function () {
-    var store = createStore(_objectSpread(_objectSpread({}, cloneDeep(initialState)), {}, {
+    var store = createStore(_objectSpread(_objectSpread({}, initialState), {}, {
       bookingConfigParams: bookingConfigParams,
       productExtensionType: productExtensionType
     }));

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

@@ -47,7 +47,6 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
-        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
     "zh-CN": {
         "pisell2.ticket-booking.info": string;
@@ -97,7 +96,6 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
-        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
     "zh-HK": {
         "pisell2.ticket-booking.info": string;
@@ -147,7 +145,6 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
-        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -46,10 +46,7 @@ export default {
     "pisell2.ticket-booking.create-new": "Create new",
     "pisell2.ticket-booking.add-to-cart": "Added to Cart",
     "pisell2.ticket-booking.not-available-title": "Sorry, Not available at current time.",
-    "pisell2.ticket-booking.not-available-ok": "OK",
-    "pisell2.ticket-booking.in-cart": function pisell2TicketBookingInCart(number) {
-      return "".concat(number, " in cart");
-    }
+    "pisell2.ticket-booking.not-available-ok": "OK"
   },
   "zh-CN": {
     "pisell2.ticket-booking.info": "信息",
@@ -98,10 +95,7 @@ export default {
     "pisell2.ticket-booking.create-new": "新建",
     "pisell2.ticket-booking.add-to-cart": "已加入购物车",
     "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售时间。",
-    "pisell2.ticket-booking.not-available-ok": "好的",
-    "pisell2.ticket-booking.in-cart": function pisell2TicketBookingInCart(number) {
-      return "\u5DF2\u6709".concat(number, "\u4EF6");
-    }
+    "pisell2.ticket-booking.not-available-ok": "好的"
   },
   "zh-HK": {
     "pisell2.ticket-booking.info": "資訊",
@@ -150,9 +144,6 @@ export default {
     "pisell2.ticket-booking.create-new": "新建",
     "pisell2.ticket-booking.add-to-cart": "已加入购物车",
     "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售時間。",
-    "pisell2.ticket-booking.not-available-ok": "好的",
-    "pisell2.ticket-booking.in-cart": function pisell2TicketBookingInCart(number) {
-      return "\u5DF2\u6709".concat(number, "\u4EF6");
-    }
+    "pisell2.ticket-booking.not-available-ok": "好的"
   }
 };

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

@@ -12,8 +12,4 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
-export declare const addService: (list: any[], addItem: any) => {
-    list: any[];
-    quantity: any;
-};
-export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
+export declare const addService: (list: any[], addItem: any) => any[];

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

@@ -109,26 +109,19 @@ var isSameProduct = function isSameProduct(a, b) {
 };
 export var addService = function addService(list, addItem) {
   var value = list;
-  var count;
   // 预约商品直接添加
   if (!isNormalProductByDurationSchedule(addItem)) {
     value.push(addItem);
-    count = addItem._extend.quantity;
   } else {
     // 非预约商品判断是否相同，相同合并
     var isNotSame = true;
     value = list.map(function (item) {
       if (isSameProduct(item, addItem)) {
-        var _item$_extend, _addItem$_extend, _item$_extend2;
+        var _item$_extend, _addItem$_extend;
         isNotSame = false;
-        var quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
-        count = quantity;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-            quantity: quantity,
-            other: _objectSpread(_objectSpread({}, ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other) || {}), {}, {
-              quantity: quantity
-            })
+            quantity: ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1)
           })
         });
       }
@@ -136,32 +129,7 @@ export var addService = function addService(list, addItem) {
     });
     if (isNotSame) {
       value.push(addItem);
-      count = addItem._extend.quantity;
     }
   }
-  return {
-    list: value,
-    quantity: count
-  };
-};
-export var addServiceScroll = function addServiceScroll(rowKey, cacheItem) {
-  var list = document.querySelectorAll("#rowKey-".concat(rowKey));
-  setTimeout(function () {
-    if (list.length && isNormalProductByDurationSchedule(cacheItem)) {
-      list[list.length - 1].scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      });
-    } else {
-      setTimeout(function () {
-        var bookingWrap = document.querySelectorAll(".booking-info-warp");
-        if (bookingWrap.length) {
-          bookingWrap[0].scrollTo({
-            top: 99999,
-            behavior: 'smooth'
-          });
-        }
-      }, 100);
-    }
-  });
+  return value;
 };

package/lib/components/appointmentBooking/components/Resource/index.js

@@ -40,7 +40,6 @@ var import_hooks = require("../../hooks");
 var import_context = require("../../context");
 var import_utils = require("../../utils");
 var import_guests = __toESM(require("../../assets/guests.svg"));
-var import_resource = __toESM(require("../../assets/resource.svg"));
 var import_utils2 = require("@pisell/utils");
 var import_index = require("./index.less");
 var Resource = (0, import_react.forwardRef)((props, ref) => {
@@ -51,14 +50,11 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
     resourceOtherParams,
     currentStep,
     setResourceOtherParams,
-    currentStepParams,
-    currentSelectedResources
+    currentStepParams
   } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
   const { updateStep, nextStep } = (0, import_hooks.useAppointmentBookingStep)();
-  const [loading, setLoading] = (0, import_react.useState)(false);
-  const utils = (0, import_hooks.contextUtils)();
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: async () => {
       setResourceOtherParams({
@@ -72,9 +68,6 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
     const { resources: resources2 } = getResourceList();
     return resources2 || [];
   }, []);
-  (0, import_react.useEffect)(() => {
-    setLoading(true);
-  }, []);
   (0, import_react.useEffect)(() => {
     const checkAndSkipResourceStep = async () => {
       var _a;
@@ -111,9 +104,7 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
     );
   }, [currentStepParams.key, resources]);
   const renderLists = (0, import_react.useMemo)(() => {
-    const appointmentCarts = carts.filter(
-      (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
-    );
+    const appointmentCarts = carts.filter((n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id)));
     if (appointmentCarts.length > 1 || !(appointmentCarts == null ? void 0 : appointmentCarts.length)) {
       return [];
     }
@@ -151,9 +142,7 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
     var _a;
     setSelectedResource(e.id);
     if (e.id) {
-      const index = carts.findIndex(
-        (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
-      );
+      const index = carts.findIndex((n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id)));
       return appointmentBooking.updateCart({
         _id: (_a = carts == null ? void 0 : carts[index]) == null ? void 0 : _a._id,
         resources: (0, import_utils.updateCartResources)(carts == null ? void 0 : carts[index], e)
@@ -162,41 +151,13 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
   };
   (0, import_react.useEffect)(() => {
     var _a, _b, _c;
-    const index = carts.findIndex(
-      (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
-    );
+    const index = carts.findIndex((n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id)));
     const selectedResource2 = (_c = (_b = (_a = carts == null ? void 0 : carts[index]) == null ? void 0 : _a._origin) == null ? void 0 : _b.resources) == null ? void 0 : _c.find(
       (item) => (item == null ? void 0 : item.form_id) === (appointmentBoard == null ? void 0 : appointmentBoard.form_id)
     );
     setSelectedResource((selectedResource2 == null ? void 0 : selectedResource2.id) || 0);
   }, [carts, appointmentBoard == null ? void 0 : appointmentBoard.form_id]);
-  (0, import_react.useEffect)(() => {
-    if (resourcesResult) {
-      setLoading(false);
-    }
-  }, [resourcesResult]);
-  const currentResourceName = (0, import_react.useMemo)(() => {
-    var _a;
-    const currentResource = (_a = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _a.currentSelectedResource;
-    const resourceItem = (currentResource == null ? void 0 : currentResource.resourceItem) || {};
-    const name = (0, import_utils.getResourceTitle)(
-      appointmentBooking,
-      resourceItem == null ? void 0 : resourceItem.code,
-      utils,
-      resourceItem
-    );
-    return name;
-  }, [currentSelectedResources]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-resource-wrap" }, loading ? /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true }) : !(resourcesResult == null ? void 0 : resourcesResult.length) ? /* @__PURE__ */ import_react.default.createElement(
-    import_materials.PisellEmpty,
-    {
-      description: import_utils2.locales.getText("pisell2.appointment.resource.tip")(
-        currentResourceName
-      ),
-      maxWidth: 400,
-      icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Image, { src: import_resource.default, preview: false, width: 44 })
-    }
-  ) : /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-resource-wrap" }, !(resourcesResult == null ? void 0 : resourcesResult.length) ? /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true }) : /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellCustomCheckboxGroup,
     {
       dataSource: resourcesResult,

package/lib/components/appointmentBooking/hooks.js

@@ -197,7 +197,6 @@ var useAppointmentBookingStep = () => {
         (0, import_utils3.scrollToFirstErrorCard)();
         return;
       }
-      let preKey = "";
       currentSelectedResources == null ? void 0 : currentSelectedResources.forEach((cart) => {
         var _a3, _b3;
         const selectedResource2 = cart == null ? void 0 : cart.currentSelectedResource;
@@ -208,8 +207,7 @@ var useAppointmentBookingStep = () => {
         if (formId) {
           const description = import_utils.locales.getText("pisell2.appointment.fill-form");
           const beforeKey = (0, import_utils2.getFormInsertBeforeKey)(currentKey, stepList2);
-          appointmentBooking.addStep({ key: formKey, description }, preKey || beforeKey);
-          preKey = formKey;
+          appointmentBooking.addStep({ key: formKey, description }, beforeKey);
         } else {
           appointmentBooking.removeStep(formKey);
         }
@@ -237,19 +235,12 @@ var useAppointmentBookingStep = () => {
     if (((_f = nextStep2 == null ? void 0 : nextStep2.key) == null ? void 0 : _f.startsWith("select-resource_")) || (nextStep2 == null ? void 0 : nextStep2.key) === "confirm-information") {
       const selectedResource = ((_g = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _g.currentSelectedResource) || {};
       const renderItem = (selectedResource == null ? void 0 : selectedResource.renderItem) || {};
-      const checkHolder = async () => {
+      const checkHolder = () => {
         setLoading(false);
         if (isRetailTemplate || (appointmentBooking == null ? void 0 : appointmentBooking.isCartAllNormalProducts())) {
           return appointmentBooking.next();
         }
-        let cartLists = carts || [];
-        if (!(carts == null ? void 0 : carts.length)) {
-          const newCarts = await appointmentBooking.getCart();
-          cartLists = newCarts || [];
-        } else {
-          cartLists = carts || [];
-        }
-        const appoimentCarts = cartLists.filter((n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id)));
+        const appoimentCarts = carts.filter((n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id)));
         const { hasError } = (0, import_utils2.checkAndGoNext)(isFormSubject, checkAccount, appoimentCarts);
         setIsErrorHolder(hasError);
         if (hasError) {

package/lib/components/appointmentBooking/locales.d.ts

@@ -106,7 +106,6 @@ declare const _default: {
         'pisell2.appointment.add-guests': string;
         'pisell2.appointment.policy': string;
         'pisell2.appointment.policy.confirm': string;
-        'pisell2.appointment.resource.tip': (val: string) => string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -224,7 +223,6 @@ declare const _default: {
         'pisell2.appointment.add-guests': string;
         'pisell2.appointment.policy': string;
         'pisell2.appointment.policy.confirm': string;
-        'pisell2.appointment.resource.tip': (val: string) => string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -342,7 +340,6 @@ declare const _default: {
         'pisell2.appointment.add-guests': string;
         'pisell2.appointment.policy': string;
         'pisell2.appointment.policy.confirm': string;
-        'pisell2.appointment.resource.tip': (val: string) => string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;

package/lib/components/appointmentBooking/locales.js

@@ -130,7 +130,6 @@ var locales_default = {
     "pisell2.appointment.add-guests": "Add guests",
     "pisell2.appointment.policy": "You have read and agreed to this policy",
     "pisell2.appointment.policy.confirm": "Confirm",
-    "pisell2.appointment.resource.tip": (val) => `Tip: Change ${val || "resource"} using the dropdown in the cart.`,
     "pisell2.text.apply": "Apply",
     "pisell2.text.goodpass": "GoodPass",
     "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
@@ -248,7 +247,6 @@ var locales_default = {
     "pisell2.appointment.add-guests": "添加预约人",
     "pisell2.appointment.policy": "您已仔细阅读并同意此协议",
     "pisell2.appointment.policy.confirm": "确定",
-    "pisell2.appointment.resource.tip": (val) => `提示：在右侧购物车中，通过下拉框修改“${val || "资源"}”`,
     "pisell2.text.apply": "应用",
     "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兑换券",
@@ -366,7 +364,6 @@ var locales_default = {
     "pisell2.appointment.add-guests": "添加預約人",
     "pisell2.appointment.policy": "您已仔細閱讀並同意此協議",
     "pisell2.appointment.policy.confirm": "確定",
-    "pisell2.appointment.resource.tip": (val) => `提示：在右側購物車中，透過下拉框修改“${val || "資源"}”`,
     "pisell2.text.apply": "應用",
     "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兌換券",

package/lib/components/booking/components/TabProduct/productItem/index.js

@@ -36,8 +36,6 @@ var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
 var import_classnames = __toESM(require("classnames"));
 var import_utils2 = require("../../../utils");
-var import_decimal = __toESM(require("decimal.js"));
-var import_pisellPriceText = __toESM(require("../../../../productSelect/components/pisellPriceText"));
 var import_index = require("./index.less");
 var ProductItem = ({
   item,
@@ -46,11 +44,6 @@ var ProductItem = ({
   style,
   className
 }) => {
-  const { price, is_bundle, minimum_markup_price } = item;
-  let _price = price;
-  if (is_bundle) {
-    _price = new import_decimal.default(price).plus(new import_decimal.default(minimum_markup_price)).toFixed(2);
-  }
   const stockText = (0, import_react.useMemo)(() => {
     if (item.is_track === 0) {
       return false;
@@ -80,7 +73,7 @@ var ProductItem = ({
         className: "server-product-title"
       },
       item.title
-    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, (0, import_utils2.getDiscountTime)(item.service_times)), stockText && /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, stockText), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-price" }, /* @__PURE__ */ import_react.default.createElement(import_pisellPriceText.default, { value: _price, isMini: is_bundle })))
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, (0, import_utils2.getDiscountTime)(item.service_times)), stockText && /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, stockText), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-price" }, (0, import_utils.formatAmount)(item.price, 2, amountSymbol)))
   );
 };
 var productItem_default = ProductItem;

package/lib/components/booking/components/drawer/index.js

@@ -38,7 +38,7 @@ var import_ArrowLeft = __toESM(require("@pisell/icon/es/ArrowLeft"));
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var Drawer = (props) => {
-  const { hideScrollBar = true, showGoBack = true, mask = false } = props;
+  const { hideScrollBar = true, showGoBack = true } = props;
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
@@ -52,7 +52,7 @@ var Drawer = (props) => {
       title: false,
       bodyStyle: { padding: 0 },
       push: false,
-      mask
+      mask: false
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title-wrap") }, /* @__PURE__ */ import_react.default.createElement(
       "div",

package/lib/components/booking/components/voucher/index.js

@@ -101,28 +101,24 @@ var VoucherCard = (props) => {
     });
     return val;
   }, [state.service.value]);
-  const { run } = (0, import_ahooks.useDebounceFn)(
-    () => {
-      var _a2, _b2;
-      if (productRef.current === state.service.value || !((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
-        return;
-      }
-      if (isBooking4Shop) {
-        const val = shopDiscount.calcDiscount(state.service.value);
-        productRef.current = val.productList;
-        dispatch({
-          type: "setService",
-          payload: {
-            ...services,
-            value: ((val == null ? void 0 : val.productList) || []).filter(Boolean)
-          }
-        });
-      }
-    },
-    { wait: 500 }
-  );
   (0, import_react.useEffect)(() => {
-    run();
+    var _a2, _b2;
+    if (productRef.current === state.service.value || !((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
+      return;
+    }
+    if (isBooking4Shop) {
+      const val = shopDiscount.calcDiscount(state.service.value);
+      console.log("input: ", state.service.value);
+      console.log("output: ", val);
+      productRef.current = val.productList;
+      dispatch({
+        type: "setService",
+        payload: {
+          ...services,
+          value: ((val == null ? void 0 : val.productList) || []).filter(Boolean)
+        }
+      });
+    }
   }, [JSON.stringify(serviceMemo), isBooking4Shop]);
   const fn = (0, import_ahooks.useMemoizedFn)((result) => {
     var _a2;
@@ -139,18 +135,18 @@ var VoucherCard = (props) => {
   });
   (0, import_react.useEffect)(() => {
     if (!isBooking4Shop) return;
+    pisellos.effects.on(ShopDiscountHooks.onScanCustomerChange, (customer) => {
+      dispatch({
+        type: "setClient",
+        payload: {
+          value: customer
+        }
+      });
+    });
     pisellos.effects.on(
-      ShopDiscountHooks.onScanCustomerChange,
-      (customer) => {
-        dispatch({
-          type: "setClient",
-          payload: {
-            value: customer
-          }
-        });
-      }
+      ShopDiscountHooks.onLoadPrepareCalcResult,
+      fn
     );
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
     pisellos.effects.on(
       ShopDiscountHooks.onDiscountListChange,
       (discount) => {

package/lib/components/booking/info/client/index.js

@@ -306,8 +306,7 @@ var Client = () => {
         isPreview: false,
         drawerProps: {
           title: import_utils.locales.getText("pisell2.text.select-customer"),
-          destroyOnClose: true,
-          mask: state.drawerMask
+          destroyOnClose: true
         },
         mode: "single",
         createItemText: import_utils.locales.getText("pisell2.text.create-new-customer"),

package/lib/components/booking/info/pet/index.js

@@ -463,9 +463,6 @@ var Pet = (props) => {
             ...((_c3 = (_b3 = (_a3 = state.pet) == null ? void 0 : _a3.formData) == null ? void 0 : _b3[0]) == null ? void 0 : _c3.options) || []
           ]);
         },
-        drawerProps: {
-          mask: state.drawerMask
-        },
         getHolders,
         addCallbackService: addCallback,
         loading: valueLoading,

package/lib/components/booking/info/service2/utils.js

@@ -454,7 +454,7 @@ var isAllNormalProductByState = (state) => {
   return isAllNormalProduct(state.service.value);
 };
 var getGeneralParams = (item, state, isParallelResource) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g;
   const { pet, service } = state;
   const { holders = [], formData } = pet || {};
   const parallelResourceOtherParams = {};
@@ -519,7 +519,6 @@ var getGeneralParams = (item, state, isParallelResource) => {
     holder_id: (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.holder_id,
     start_date: !isNormalProduct ? (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.startDate : "",
     end_date: !isNormalProduct ? ((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.endDate) || ((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.end_date) : "",
-    rowKey: `rowKey-${(_i = (_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.rowKey}`,
     ...parallelResourceOtherParams
   };
 };
@@ -544,6 +543,7 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
     const generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+    console.log(isNormalProduct, "isNormalProduct");
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,

package/lib/components/booking/info2/index.js

@@ -92,7 +92,7 @@ var Info = (0, import_model.Provider)((props) => {
       });
     }
   }, []);
-  (0, import_react.useMemo)(() => {
+  (0, import_react.useEffect)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
@@ -165,12 +165,9 @@ var Info = (0, import_model.Provider)((props) => {
     try {
       setTimeout(async () => {
         var _a2;
-        let data = await (0, import_serve.getResourceList)(
-          {
-            date: currentDate
-          },
-          (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.bookingId
-        );
+        let data = await (0, import_serve.getResourceList)({
+          date: currentDate
+        }, (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.bookingId);
         data.date = currentDate;
         localStorage.setItem("bookingResourceList", JSON.stringify(data));
         modal.dispatch({

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -77,7 +77,7 @@ export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export declare const getProductExtend: ({ cacheItem, state, isDisabledTime }: any) => any;
+export declare const getProductExtend: ({ cacheItem, state }: any) => any;
 /**
  * @title: 格式化服务列表
  * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据