@pisell/private-materials 6.2.28 → 6.2.30

package/es/components/booking/components/actionButtons/index.d.ts

@@ -24,6 +24,8 @@ interface ActionButtonsProps {
     }) => void;
     /** 是否禁用所有按钮 */
     disabled?: boolean;
+    /** 数据源，传递给 VoucherCard */
+    source?: any;
 }
 declare const ActionButtons: React.FC<ActionButtonsProps>;
 export default ActionButtons;

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

@@ -11,18 +11,20 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useEffect } from 'react';
 import { createPortal } from 'react-dom';
 import { Button } from 'antd';
-import { Trash01, Calculator, PlusCircle } from '@pisell/icon';
+import { Trash01, Calculator, PlusCircle, Sale03 } from '@pisell/icon';
 import { locales } from '@pisell/utils';
 import { PisellAdjustPrice } from '@pisell/materials';
 import dayjs from 'dayjs';
 import ClearCartModal from "../clearCartModal";
 import CustomiseItemModal from "../customiseItemModal";
+import VoucherModal from "../voucherModal";
 import { getSumTotal } from "../footer/amount";
 import { formatAmount } from '@pisell/utils';
 import "./index.less";
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
+import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -30,11 +32,12 @@ var createToastContent = function createToastContent(text) {
   }, text);
 };
 var ActionButtons = function ActionButtons(_ref) {
-  var _context$appHelper, _state$service2, _state$addons2, _context$appHelper2, _context$appHelper2$g;
+  var _context$appHelper, _state$service2, _state$addons2, _state$service4, _state$service6, _context$appHelper3, _context$appHelper4, _context$appHelper4$g;
   var state = _ref.state,
     dispatch = _ref.dispatch,
     _ref$disabled = _ref.disabled,
-    disabled = _ref$disabled === void 0 ? false : _ref$disabled;
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    source = _ref.source;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showClearModal = _useState2[0],
@@ -47,6 +50,10 @@ var ActionButtons = function ActionButtons(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     showCustomiseModal = _useState6[0],
     setShowCustomiseModal = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    showVoucherModal = _useState8[0],
+    setShowVoucherModal = _useState8[1];
   var context = useEngineContext();
   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 pisellOS = usePisellOS();
@@ -65,6 +72,8 @@ var ActionButtons = function ActionButtons(_ref) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+  var _useScanManager = useScanManager(),
+    clearAllScanListenersTaskQueue = _useScanManager.clearAllScanListenersTaskQueue;
 
   // 监听客户选择变化，清空手动折扣
   useEffect(function () {
@@ -120,6 +129,60 @@ var ActionButtons = function ActionButtons(_ref) {
     return originExpectAmount;
   }, [state, hasCartItems]);
 
+  // 折扣券列表状态
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    discountList = _useState10[0],
+    setDiscountList = _useState10[1];
+
+  // 计算已使用的券数量
+  var usedVouchersCount = useMemo(function () {
+    try {
+      var _state$service3;
+      if (!((_state$service3 = state.service) !== null && _state$service3 !== void 0 && (_state$service3 = _state$service3.value) !== null && _state$service3 !== void 0 && _state$service3.length)) {
+        return 0;
+      }
+      // 直接从全局折扣券列表中计算被选中的数量，避免重复计数
+      return discountList.filter(function (discount) {
+        return discount.isSelected;
+      }).length;
+    } catch (error) {
+      console.error('计算已使用券数量失败:', error);
+      return 0;
+    }
+  }, [discountList, (_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value]);
+
+  // 判断是否有券可用但手动取消使用（显示红色感叹号）
+  var shouldShowWarning = useMemo(function () {
+    try {
+      var _state$service5;
+      // 条件：购物车不为空 && discountList 长度大于 0，且没有 isSelected 的优惠券，且有 isManualSelect 的优惠券
+      return ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.value) === null || _state$service5 === void 0 ? void 0 : _state$service5.length) > 0 && discountList.length > 0 && !discountList.some(function (discount) {
+        return discount.isSelected;
+      }) && discountList.some(function (discount) {
+        return discount.isManualSelect;
+      });
+    } catch (error) {
+      console.error('判断警告状态失败:', error);
+      return false;
+    }
+  }, [discountList, (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value]);
+
+  // 监听折扣券列表变化
+  useEffect(function () {
+    var _context$appHelper2;
+    var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {},
+      pisellos = _ref2.pisellos;
+    if (!pisellos) return;
+    var onDiscountListChange = function onDiscountListChange(discount) {
+      setDiscountList(discount);
+    };
+    pisellos.effects.on('shopDiscount:onDiscountListChange', onDiscountListChange);
+    return function () {
+      pisellos.effects.off('shopDiscount:onDiscountListChange', onDiscountListChange);
+    };
+  }, [(_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.utils]);
+
   // 清空购物车按钮点击
   var handleClear = function handleClear() {
     setShowClearModal(true);
@@ -127,6 +190,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 仅清空商品
   var handleClearItemsOnly = function handleClearItemsOnly() {
+    clearAllScanListenersTaskQueue();
     if (!hasCartItems) {
       // 购物车为空时显示Toast提示
       Toast === null || Toast === void 0 || Toast.info(createToastContent(locales.getText('pisell2.clear-cart-modal.empty-cart-tip')));
@@ -161,6 +225,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
+    clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
       type: 'setService',
@@ -272,9 +337,14 @@ var ActionButtons = function ActionButtons(_ref) {
     setShowCustomiseModal(true);
   };
 
+  // GoodPass 券码管理
+  var handleGoodPassClick = function handleGoodPassClick() {
+    setShowVoucherModal(true);
+  };
+
   // 处理自定义商品保存
   var handleCustomiseItemSave = function handleCustomiseItemSave(data) {
-    var _state$service3;
+    var _state$service7;
     console.log('保存自定义商品:', data);
 
     // 创建自定义商品项，按照标准商品结构
@@ -318,7 +388,7 @@ var ActionButtons = function ActionButtons(_ref) {
     };
 
     // 添加到购物车（使用 service 来存储自定义商品）
-    var currentServices = (state === null || state === void 0 || (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.value) || [];
+    var currentServices = (state === null || state === void 0 || (_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : _state$service7.value) || [];
 
     // 直接添加自定义商品，不检查重复
     var updatedServices = [customItem].concat(_toConsumableArray(currentServices));
@@ -344,7 +414,15 @@ var ActionButtons = function ActionButtons(_ref) {
     onClick: handleClear,
     type: "text",
     disabled: isDisabledEdit
-  }, locales.getText('pisell2.action-buttons.clear')), /*#__PURE__*/React.createElement(Button, {
+  }), /*#__PURE__*/React.createElement(Button, {
+    className: "action-button customise-button",
+    icon: /*#__PURE__*/React.createElement(PlusCircle, {
+      size: 22
+    }),
+    onClick: handleCustomiseItem,
+    type: "text",
+    disabled: isDisabledEdit
+  }, locales.getText('pisell2.action-buttons.customise-item')), /*#__PURE__*/React.createElement(Button, {
     className: "action-button manuel-button",
     icon: /*#__PURE__*/React.createElement(Calculator, {
       size: 22
@@ -352,15 +430,20 @@ var ActionButtons = function ActionButtons(_ref) {
     onClick: handleManuelOrder,
     type: "text",
     disabled: isDisabledEdit
-  }, locales.getText('pisell2.action-buttons.manuel-order')), /*#__PURE__*/React.createElement(Button, {
-    className: "action-button customise-button",
-    icon: /*#__PURE__*/React.createElement(PlusCircle, {
+  }, locales.getText('pisell2.action-buttons.manuel-order')), /*#__PURE__*/React.createElement("div", {
+    className: "action-button-wrapper"
+  }, /*#__PURE__*/React.createElement(Button, {
+    className: "action-button goodpass-button",
+    icon: /*#__PURE__*/React.createElement(Sale03, {
       size: 22
     }),
-    onClick: handleCustomiseItem,
-    type: "text",
-    disabled: isDisabledEdit
-  }, locales.getText('pisell2.action-buttons.customise-item'))), /*#__PURE__*/React.createElement(ClearCartModal, {
+    onClick: handleGoodPassClick,
+    type: "text"
+  }, locales.getText('pisell2.text.goodpass')), usedVouchersCount > 0 && /*#__PURE__*/React.createElement("div", {
+    className: "voucher-badge"
+  }, usedVouchersCount), shouldShowWarning && /*#__PURE__*/React.createElement("div", {
+    className: "voucher-warning-icon"
+  }, "!"))), /*#__PURE__*/React.createElement(ClearCartModal, {
     visible: showClearModal,
     onCancel: function onCancel() {
       return setShowClearModal(false);
@@ -388,8 +471,16 @@ var ActionButtons = function ActionButtons(_ref) {
       return setShowCustomiseModal(false);
     },
     onSave: handleCustomiseItemSave,
-    currencySymbol: ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getSymbolic) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2)) || "$",
+    currencySymbol: ((_context$appHelper4 = context.appHelper) === null || _context$appHelper4 === void 0 || (_context$appHelper4 = _context$appHelper4.utils) === null || _context$appHelper4 === void 0 || (_context$appHelper4$g = _context$appHelper4.getSymbolic) === null || _context$appHelper4$g === void 0 ? void 0 : _context$appHelper4$g.call(_context$appHelper4)) || "$",
     disabled: isDisabledEdit
+  }), /*#__PURE__*/React.createElement(VoucherModal, {
+    visible: showVoucherModal,
+    onClose: function onClose() {
+      return setShowVoucherModal(false);
+    },
+    state: state,
+    dispatch: dispatch,
+    source: source
   }));
 };
 export default ActionButtons;

package/es/components/booking/components/actionButtons/index.less

@@ -6,6 +6,52 @@
   margin-top: 8px;
   padding: 0;
 
+  .action-button-wrapper {
+    position: relative;
+    flex: 1.4;
+    display: flex;
+    
+    .voucher-badge {
+      position: absolute;
+      top: -8px;
+      right: -8px;
+      width: 20px;
+      height: 20px;
+      border-radius: 50%;
+      background-color: #7F56DA;
+      color: white;
+      font-size: 12px;
+      font-weight: 600;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      z-index: 10;
+      min-width: 20px;
+      padding: 0 4px;
+      box-sizing: border-box;
+    }
+
+    .voucher-warning-icon {
+      position: absolute;
+      top: -6px;
+      right: -6px;
+      width: 18px;
+      height: 18px;
+      border-radius: 50%;
+      background-color: #ff4d4f;
+      color: white;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      z-index: 10;
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+
+      .anticon {
+        font-size: 10px;
+      }
+    }
+  }
+
   .action-button {
     display: flex;
     justify-content: center;
@@ -18,7 +64,7 @@
     color: white;
     background: #2C2C2C;
     border: 1px solid #2C2C2C;
-    border-radius: 4px;
+    border-radius: 8px;
     font-size: 12px;
     font-weight: 500;
     transition: all 0.2s ease;
@@ -44,9 +90,10 @@
       }
     }
 
-    // Clear 按钮更小
+    // Clear 按钮固定宽度
     &.clear-button {
-      flex: 0.8;
+      width: 44px;
+      flex: none;
       border-color: #FF4D4F;
       
       &:hover:not(:disabled) {
@@ -59,6 +106,7 @@
       flex: 1;
       border-color: #CC8E50;
       align-items: center;
+      padding: 0 4px;
       
       &:hover:not(:disabled) {
         border-color: #CC8E50;
@@ -82,12 +130,31 @@
 
     // Customise 按钮更大一些
     &.customise-button {
-      flex: 1.3;
+      flex: 1;
       border-color: #8157D5;
       
       &:hover:not(:disabled) {
         border-color: #8157D5;
       }
+
+      // Customise按钮文本支持换行，保持与图标水平对齐
+      span {
+        white-space: pre-line !important;
+        line-height: 1.15;
+        text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+
+    &.goodpass-button {
+      flex: 1.4;
+      border-color: #CC8E50;
+      
+      &:hover:not(:disabled) {
+        border-color: #CC8E50;
+      }
     }
 
     // 图标样式

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

@@ -38,6 +38,7 @@ import { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import { sendWarningLog } from '@pisell/utils';
 import dayjs from 'dayjs';
+import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 /**
  * @title: 底部
  * @description:
@@ -79,6 +80,8 @@ var Footer = function Footer(props) {
   var isBooking4Shop = useIsBooking4Shop(state);
   var appointmentProductRef = useRef(null);
   var context = useEngineContext();
+  var _useScanManager = useScanManager(),
+    disableAllScanListeners = _useScanManager.disableAllScanListeners;
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     isTerminal = _context$appHelper$ut.isTerminal,
     interaction = _context$appHelper$ut.interaction,
@@ -267,9 +270,10 @@ var Footer = function Footer(props) {
             return _context.abrupt("return");
           case 2:
             if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
-              _context.next = 4;
+              _context.next = 5;
               break;
             }
+            disableAllScanListeners();
             return _context.abrupt("return", interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 ? void 0 : _interaction$utils$po.call(_interaction$utils, {
               module: 'booking',
               key: 'booking_checkout',
@@ -280,7 +284,7 @@ var Footer = function Footer(props) {
                 newOrder: isNewOrder
               }
             }));
-          case 4:
+          case 5:
             state.action({
               type: 'pisell1.handlePayment',
               data: {
@@ -290,7 +294,7 @@ var Footer = function Footer(props) {
                 state === null || state === void 0 || state.callback();
               }
             });
-          case 5:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -953,7 +957,7 @@ var Footer = function Footer(props) {
       className: "pisell-lowcode__booking-footer-buttons-item",
       type: "primary",
       onClick: handleNote
-    }, locales.getText('pisell2.ticket-booking.notes')));
+    }, locales.getText('pisell2.ticket-booking.note')));
   }, []);
   var buttonMap = {
     checkout: checkoutButton,

package/es/components/booking/components/footer/index.less

@@ -1,6 +1,6 @@
 .pisell-lowcode__booking-footer-total {
   width: 100%;
-  padding-bottom: 16px;
+  padding-bottom: 8px;
   display: flex;
   align-items: flex-start;
   justify-content: space-between;
@@ -15,7 +15,8 @@
     display: flex;
     flex-direction: column;
 
-    .pisell-lowcode__booking-footer-left-total {}
+    .pisell-lowcode__booking-footer-left-total {
+    }
 
     .pisell-lowcode__booking-footer-left-arrears {
       font-size: 14px;

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

@@ -620,6 +620,7 @@ export var formatValues = function formatValues(state) {
     type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
     platform: state.isBookingTicket2 ? "pos" : "shop",
     sales_channel: "my_pisel",
+    order_sales_channel: state.isBookingTicket2 ? "pos" : "online_store",
     bookings: [],
     customer_id: 1,
     customer_name: "",

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

@@ -13,7 +13,7 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import VoucherCard from "../voucher";
 import ActionButtons from "../actionButtons";
 var TabPane = function TabPane(_ref) {
-  var _context$appHelper, _businessUtils$getApp, _businessUtils$getApp2, _state$service, _state$addons, _state$client, _state$service2, _state$addons2, _state$client2;
+  var _context$appHelper, _businessUtils$getApp, _businessUtils$getApp2, _state$service, _state$addons, _state$client;
   var children = _ref.children,
     header = _ref.header,
     footer = _ref.footer,
@@ -73,23 +73,9 @@ var TabPane = function TabPane(_ref) {
     style: {
       padding: 20
     }
-  }, children)), shouldShowTerminalVoucher && state && dispatch && /*#__PURE__*/React.createElement("div", {
+  }, children)), state && dispatch && (state === null || state === void 0 ? void 0 : state.isBookingTicket2) && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-tab-pane-voucher-section"
-  }, /*#__PURE__*/React.createElement(VoucherCard, {
-    state: _objectSpread(_objectSpread({}, state), {}, {
-      service: _objectSpread(_objectSpread({}, state.service || {}), {}, {
-        value: ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []
-      }),
-      addons: _objectSpread(_objectSpread({}, state.addons || {}), {}, {
-        value: ((_state$addons = state.addons) === null || _state$addons === void 0 ? void 0 : _state$addons.value) || []
-      }),
-      client: _objectSpread(_objectSpread({}, state.client || {}), {}, {
-        value: ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {}
-      })
-    }),
-    dispatch: dispatch,
-    source: source
-  }), /*#__PURE__*/React.createElement(ActionButtons, {
+  }, /*#__PURE__*/React.createElement(ActionButtons, {
     state: state,
     dispatch: dispatch
   })), /*#__PURE__*/React.createElement(AuthWrap, {
@@ -99,13 +85,13 @@ var TabPane = function TabPane(_ref) {
     }, shouldShowFooterVoucher && state && dispatch && /*#__PURE__*/React.createElement(VoucherCard, {
       state: _objectSpread(_objectSpread({}, state), {}, {
         service: _objectSpread(_objectSpread({}, state.service || {}), {}, {
-          value: ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []
+          value: ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []
         }),
         addons: _objectSpread(_objectSpread({}, state.addons || {}), {}, {
-          value: ((_state$addons2 = state.addons) === null || _state$addons2 === void 0 ? void 0 : _state$addons2.value) || []
+          value: ((_state$addons = state.addons) === null || _state$addons === void 0 ? void 0 : _state$addons.value) || []
         }),
         client: _objectSpread(_objectSpread({}, state.client || {}), {}, {
-          value: ((_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.value) || {}
+          value: ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {}
         })
       }),
       dispatch: dispatch,

package/es/components/booking/components/tabPane/index.less

@@ -50,7 +50,7 @@
 .pisell-lowcode__booking-tab-pane-voucher-section {
   display: flex;
   flex-direction: column;
-  padding: 8px 16px;
+  padding: 10px;
   position: relative;
   z-index: 3;
   background-color: #1b1b1b;

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

@@ -45,8 +45,10 @@ var VoucherCard = function VoucherCard(props) {
   var context = useEngineContext();
   var state = props.state,
     dispatch = props.dispatch,
-    source = props.source;
-  var _useState = useState(false),
+    source = props.source,
+    _props$isInModal = props.isInModal,
+    isInModal = _props$isInModal === void 0 ? false : _props$isInModal;
+  var _useState = useState(isInModal ? true : false),
     _useState2 = _slicedToArray(_useState, 2),
     showDetail = _useState2[0],
     setShowDetail = _useState2[1];
@@ -268,7 +270,7 @@ var VoucherCard = function VoucherCard(props) {
     className: "voucher-title"
   }, /*#__PURE__*/React.createElement("span", {
     className: "voucher-title-left"
-  }, locales.getText('pisell2.text.goodpass')), /*#__PURE__*/React.createElement("span", {
+  }, locales.getText('pisell2.text.goodpass')), !isInModal && /*#__PURE__*/React.createElement("span", {
     className: "voucher-title-right",
     onClick: function onClick() {
       console.log('showDetail: ', showDetail);
@@ -280,12 +282,13 @@ var VoucherCard = function VoucherCard(props) {
     })
   }))), /*#__PURE__*/React.createElement("div", {
     className: classNames('voucher-detail', {
-      show: showDetail
+      show: showDetail || isInModal
     })
   }, (availableData === null || availableData === void 0 ? void 0 : availableData.length) > 0 ? /*#__PURE__*/React.createElement(PisellGoodPassCard, {
     style: {
       width: '100%'
     },
+    isInModal: isInModal || false,
     dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
     mixedSort: mixedSort,
     onChange: function onChange(val) {

package/es/components/booking/components/voucherModal/index.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+import './index.less';
+interface VoucherModalProps {
+    /** 是否显示弹窗 */
+    visible: boolean;
+    /** 关闭弹窗回调 */
+    onClose: () => void;
+    /** booking 状态对象 */
+    state: any;
+    /** dispatch 函数 */
+    dispatch: (action: {
+        type: string;
+        payload?: any;
+    }) => void;
+    /** 数据源 */
+    source?: any;
+}
+declare const VoucherModal: React.FC<VoucherModalProps>;
+export default VoucherModal;

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

@@ -0,0 +1,47 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React from 'react';
+import { Modal } from 'antd';
+import VoucherCard from "../voucher";
+import "./index.less";
+var VoucherModal = function VoucherModal(_ref) {
+  var _state$service, _state$addons, _state$client;
+  var visible = _ref.visible,
+    onClose = _ref.onClose,
+    state = _ref.state,
+    dispatch = _ref.dispatch,
+    source = _ref.source;
+  return /*#__PURE__*/React.createElement(Modal, {
+    title: null,
+    open: visible,
+    onCancel: onClose,
+    footer: null,
+    width: 600,
+    className: "pisell-voucher-modal ".concat(!visible ? 'pisell-voucher-modal--hidden' : '')
+    // 移除 destroyOnClose，让内容始终渲染
+    ,
+    forceRender: true
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-voucher-modal-content"
+  }, /*#__PURE__*/React.createElement(VoucherCard, {
+    state: _objectSpread(_objectSpread({}, state), {}, {
+      service: _objectSpread(_objectSpread({}, state.service || {}), {}, {
+        value: ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []
+      }),
+      addons: _objectSpread(_objectSpread({}, state.addons || {}), {}, {
+        value: ((_state$addons = state.addons) === null || _state$addons === void 0 ? void 0 : _state$addons.value) || []
+      }),
+      client: _objectSpread(_objectSpread({}, state.client || {}), {}, {
+        value: ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {}
+      })
+    }),
+    dispatch: dispatch,
+    source: source,
+    isInModal: true
+  })));
+};
+export default VoucherModal;

package/es/components/booking/components/voucherModal/index.less

@@ -0,0 +1,23 @@
+.pisell-voucher-modal {
+  .ant-modal-body {
+    padding: 0;
+  }
+
+  .pisell-voucher-modal-content {
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+
+  // 隐藏状态下的样式优化
+  &.pisell-voucher-modal--hidden {
+    // 当弹窗隐藏时，可以通过一些样式来优化性能
+    // 例如暂停动画、降低 GPU 使用等
+    .pisell-voucher-modal-content {
+      // 暂停内容中的动画和过渡效果
+      * {
+        animation-play-state: paused !important;
+        transition: none !important;
+      }
+    }
+  }
+}

package/es/components/booking/forms/forms.js

@@ -168,7 +168,7 @@ var Forms = Provider(function (props) {
       return /*#__PURE__*/React.createElement("div", {
         className: "pisell-lowcode__booking-field-wrap",
         style: {
-          padding: hideTitle ? 0 : '12px 0 0'
+          padding: hideTitle ? 0 : '0'
         },
         key: d.form_id
       }, hideTitle ? null : /*#__PURE__*/React.createElement("div", {

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

@@ -42,7 +42,7 @@
 }
 .create-booking-page-info-wrap {
   position: initial !important;
-  padding: 0 16px !important;
+  padding: 0 10px !important;
   .booking-info-create-new {
     margin-top: 10px;
     color: var(--Base-Black, #000);

package/es/components/booking/info/pet/index.less

@@ -146,5 +146,5 @@
 }
 
 .pisell-lowcode__booking-pet-wraps {
-  margin-top: 16px;
+  margin-top: 12px;
 }

package/es/components/booking/info/service/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-service-wrap {
-  margin-top: 16px;
+  margin-top: 12px;
   .pisell-lowcode__booking-service-clear-btn {
     cursor: pointer;
     margin-top: -12px;