@pisell/private-materials 6.5.2 → 6.5.4

package/es/components/checkout/PaymentModal.js

@@ -20,9 +20,9 @@ import { locales } from '@pisell/utils';
 import { getLocale } from "../../utils/locales";
 import { useMemoizedFn } from 'ahooks';
 import { createPortal } from 'react-dom';
+import ReactDOM from 'react-dom';
 import checkoutLocales from "./locales";
-import { PisellContainer } from '@pisell/materials';
-import { PisellAdjustPrice } from '@pisell/materials';
+import { PisellContainer, PisellAdjustPrice, Icon, useToast, ConfigProvider } from '@pisell/materials';
 import useEngineContext from "../../hooks/useEngineContext";
 import NoteModal from "../../plus/noteModal";
 import SendPaymentLinkModal from "./components/SendPaymentLinkModal";
@@ -33,14 +33,12 @@ import PaymentOptionsModule from "./components/PaymentOptionsModule";
 import CashPaymentModule from "./components/CashPaymentModule";
 import AdditionalModule from "./components/AdditionalModule";
 import { getSumTotal } from "../booking/components/footer/amount";
-import { PaymentResultToastProvider, closePaymentResultToast } from "./components/PaymentResultToast";
+import { closePaymentResultToast, closeAllPaymentResultToasts, setTillButton } from "./components/PaymentResultToast";
 import { formatCurrency, calculateStatusClassName, calculateAutoCloseConfig, displayPaymentResultToast, createShowSuccessToast } from "./utils/PaymentResultToastUtils";
 import { Printer, FileCheck02, RefreshCw05, CreditCard02, MessageTextSquare02, ArrowLeft, DotsVertical } from '@pisell/icon';
 import { checkoutStyles } from "./styles";
 import PaymentMethods from "../pay/toB/paymentMethods";
-import { DeviceIconGroup } from "../../pro/comprehensiveSearch/components";
 import SearchAndClientModule from "./components/SearchAndClientModule";
-import useToast from "../../hooks/useToast";
 import "./index.less";
 import { WALLET_PASS_CODE_ARRAY, WALLET_PASS_CODE_MAP } from "./constants";
 import { cloneDeep } from 'lodash';
@@ -181,6 +179,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [paymentMethods]);
   var handleAddCashPayment = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(result) {
+      var _interaction$utils, _interaction$utils$po;
       var cashPaymentMethod;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -206,6 +205,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               rounding_amount: result.roundingAmount
             });
           case 3:
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'open_till',
+              metadata: {}
+            });
+            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 || _interaction$utils$po.call(_interaction$utils, {
+              module: 'till',
+              key: 'open_till',
+              data: {
+                type: 'cash' // cash 不需要验证钱箱权限
+              }
+            });
+          case 5:
           case "end":
             return _context.stop();
         }
@@ -508,48 +520,48 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           //     Toast?.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
           //   }
           // );
-          var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, function (data) {
-            console.log('orderPaymentAddedUnsubscribe>>>>', data);
-            var balanceDueAmount = checkoutModule.getBalanceDueAmount();
-            if (Number(balanceDueAmount) > 0) {
-              var autoCloseConfig = calculateAutoCloseConfig('partially_paid', false);
-              // 获取订单总金额
-              var _orderInfo = checkoutModule.getCurrentOrderInfo();
-
-              // 根据支付状态展示不同的 toast
-              displayPaymentResultToast({
-                paymentStatus: 'partially_paid',
-                orderTotalAmount: _orderInfo.totalAmount,
-                gapAmount: balanceDueAmount,
-                failureReason: '',
-                autoCloseConfig: autoCloseConfig,
-                actionButtons: generateActionButtons === null || generateActionButtons === void 0 ? void 0 : generateActionButtons('partially_paid')
-              }, _objectSpread(_objectSpread({}, paymentResultToastConfig), {}, {
-                onToastClose: function onToastClose() {
-                  closePaymentResultToast();
-                },
-                onCountdownComplete: function onCountdownComplete() {
-                  closePaymentResultToast();
+          var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, /*#__PURE__*/function () {
+            var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
+              var balanceDueAmount, autoCloseConfig, _orderInfo;
+              return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                while (1) switch (_context5.prev = _context5.next) {
+                  case 0:
+                    console.log('orderPaymentAddedUnsubscribe>>>>', data);
+                    balanceDueAmount = checkoutModule.getBalanceDueAmount();
+                    if (!(Number(balanceDueAmount) > 0)) {
+                      _context5.next = 7;
+                      break;
+                    }
+                    autoCloseConfig = calculateAutoCloseConfig('partially_paid', false); // 获取订单总金额
+                    _orderInfo = checkoutModule.getCurrentOrderInfo(); // 根据支付状态展示不同的 toast
+                    _context5.next = 7;
+                    return displayPaymentResultToast({
+                      paymentStatus: 'partially_paid',
+                      orderTotalAmount: _orderInfo.totalAmount,
+                      gapAmount: balanceDueAmount,
+                      failureReason: '',
+                      autoCloseConfig: autoCloseConfig,
+                      actionButtons: generateActionButtons === null || generateActionButtons === void 0 ? void 0 : generateActionButtons('partially_paid')
+                    }, _objectSpread(_objectSpread({}, paymentResultToastConfig), {}, {
+                      onToastClose: function onToastClose() {
+                        closePaymentResultToast();
+                      },
+                      onCountdownComplete: function onCountdownComplete() {
+                        closePaymentResultToast();
+                        // PaymentResultToast自己管理关闭，不需要额外调用
+                        // 不自动关闭Modal，让两个弹窗独立管理
+                      }
+                    }));
+                  case 7:
+                  case "end":
+                    return _context5.stop();
                 }
-              }));
-            }
-            // 判断是否为现金支付
-            var paymentMethodName = data.paymentMethodName || data.name || '';
-            var isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
-            if (isCashPayment) {
-              var _interaction$utils, _interaction$utils$po;
-              logger === null || logger === void 0 || logger.addLog({
-                type: 'info',
-                title: 'open_till',
-                metadata: {}
-              });
-              // handleToastClose();
-              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 || _interaction$utils$po.call(_interaction$utils, {
-                module: 'till',
-                key: 'open_till'
-              });
-            }
-          });
+              }, _callee5);
+            }));
+            return function (_x5) {
+              return _ref8.apply(this, arguments);
+            };
+          }());
           return function () {
             if (unsubscribe && typeof unsubscribe === 'function') {
               unsubscribe();
@@ -576,98 +588,100 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 处理金额修改
   var handleAmountChange = useCallback( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newAmount) {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(newAmount) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!checkoutModule) {
-              _context5.next = 10;
+              _context6.next = 10;
               break;
             }
-            _context5.prev = 1;
-            _context5.next = 4;
+            _context6.prev = 1;
+            _context6.next = 4;
             return checkoutModule.setStateAmountAsync(newAmount);
           case 4:
             setCustomAmount(newAmount);
-            _context5.next = 10;
+            _context6.next = 10;
             break;
           case 7:
-            _context5.prev = 7;
-            _context5.t0 = _context5["catch"](1);
-            console.error('Failed to set custom amount:', _context5.t0);
+            _context6.prev = 7;
+            _context6.t0 = _context6["catch"](1);
+            console.error('Failed to set custom amount:', _context6.t0);
           case 10:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5, null, [[1, 7]]);
+      }, _callee6, null, [[1, 7]]);
     }));
-    return function (_x5) {
-      return _ref8.apply(this, arguments);
+    return function (_x6) {
+      return _ref9.apply(this, arguments);
     };
   }(), [checkoutModule]);
 
   // 处理押金状态变更
   var handleDepositStatusChange = useCallback( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(isDeposit) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(isDeposit) {
       var depositStatus;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             if (!checkoutModule) {
-              _context6.next = 11;
+              _context7.next = 11;
               break;
             }
-            _context6.prev = 1;
+            _context7.prev = 1;
             depositStatus = isDeposit ? 1 : 0;
-            _context6.next = 5;
+            _context7.next = 5;
             return checkoutModule.updateOrderDepositStatusAsync(depositStatus);
           case 5:
             console.log("Deposit status updated to: ".concat(depositStatus, " (").concat(isDeposit ? 'deposit' : 'regular', ")"));
-            _context6.next = 11;
+            _context7.next = 11;
             break;
           case 8:
-            _context6.prev = 8;
-            _context6.t0 = _context6["catch"](1);
-            console.error('Failed to update deposit status:', _context6.t0);
+            _context7.prev = 8;
+            _context7.t0 = _context7["catch"](1);
+            console.error('Failed to update deposit status:', _context7.t0);
           case 11:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6, null, [[1, 8]]);
+      }, _callee7, null, [[1, 8]]);
     }));
-    return function (_x6) {
-      return _ref9.apply(this, arguments);
+    return function (_x7) {
+      return _ref10.apply(this, arguments);
     };
   }(), [checkoutModule]);
 
   // 当 walletpass 直接就满足订单支付时，触发此方法
   var handleWalletPassConfirmPay = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(action) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(action) {
       var result, _result$response, responseData, _responseData$payment, params;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             if (!(action === 'save-without-deduct')) {
-              _context7.next = 5;
+              _context8.next = 5;
               break;
             }
-            _context7.next = 3;
+            _context8.next = 3;
             return checkoutModule.updateVoucherPaymentItemsAsync([]);
           case 3:
-            _context7.next = 7;
+            _context8.next = 7;
             break;
           case 5:
             if (!(action === 'cancel')) {
-              _context7.next = 7;
+              _context8.next = 7;
               break;
             }
-            return _context7.abrupt("return");
+            return _context8.abrupt("return");
           case 7:
-            _context7.next = 9;
+            _context8.next = 9;
             return checkoutModule.manualSyncOrderAsync();
           case 9:
-            result = _context7.sent;
-            showSuccessToast === null || showSuccessToast === void 0 || showSuccessToast(result);
+            result = _context8.sent;
+            _context8.next = 12;
+            return showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(result);
+          case 12:
             if (result.success) {
               responseData = (_result$response = result.response) === null || _result$response === void 0 ? void 0 : _result$response.data; // 打印订单完整信息
               console.log('print_order_onOrderSynced>>>>', result);
@@ -689,74 +703,75 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               } catch (error) {
                 console.error('print_order_onOrderSynced_error>>>>', error);
               }
+              // 支付成功时关闭 PaymentModal
+              onPaymentCancel(true);
             }
-            // onPaymentCancel(true);
-          case 12:
+          case 13:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7);
+      }, _callee8);
     }));
-    return function handleWalletPassConfirmPay(_x7) {
-      return _ref10.apply(this, arguments);
+    return function handleWalletPassConfirmPay(_x8) {
+      return _ref11.apply(this, arguments);
     };
   }();
 
   // 处理 Save & Pay Later 的钱包余额确认
   var handleSavePayLater = useCallback( /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(action) {
+    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(action) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
             if (!(action === 'apply-deduct-now')) {
-              _context8.next = 4;
+              _context9.next = 4;
               break;
             }
             console.log('立即应用并扣除钱包余额，然后保存稍后付款');
             // 执行扣除逻辑
-            _context8.next = 13;
+            _context9.next = 13;
             break;
           case 4:
             if (!(action === 'save-without-deduct')) {
-              _context8.next = 10;
+              _context9.next = 10;
               break;
             }
             console.log('保存但不扣除钱包余额，稍后付款');
             // 保存但不扣除，先把 os 里 voucher_id 的 payment 删除
-            _context8.next = 8;
+            _context9.next = 8;
             return checkoutModule.updateVoucherPaymentItemsAsync([]);
           case 8:
-            _context8.next = 13;
+            _context9.next = 13;
             break;
           case 10:
             if (!(action === 'cancel')) {
-              _context8.next = 13;
+              _context9.next = 13;
               break;
             }
             console.log('取消保存稍后付款');
-            return _context8.abrupt("return");
+            return _context9.abrupt("return");
           case 13:
             if (!checkoutModule) {
-              _context8.next = 18;
+              _context9.next = 18;
               break;
             }
-            _context8.next = 16;
+            _context9.next = 16;
             return checkoutModule.saveForLaterPaymentAsync();
           case 16:
-            res = _context8.sent;
+            res = _context9.sent;
             if (res.success) {
               onPaymentCancel(true);
-              closePaymentResultToast();
+              // 不关闭PaymentResultToast，让Save & Pay Later操作后toast保持显示
             }
           case 18:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     }));
-    return function (_x8) {
-      return _ref11.apply(this, arguments);
+    return function (_x9) {
+      return _ref12.apply(this, arguments);
     };
   }(), [checkoutModule, onPaymentCancel]);
   var moduleConfig = {
@@ -824,13 +839,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }
   }, [state, showPriceAdjustModal]);
   var handleSelectWalletChange = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(select) {
+    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(select) {
       var voucherItems, data;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
             if (!walletPassDetail.isShow) {
-              _context9.next = 7;
+              _context10.next = 7;
               break;
             }
             voucherItems = [];
@@ -859,7 +874,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               title: 'handleSelectWalletChange checkoutModule updateVoucherPaymentItemsAsync',
               metadata: {}
             });
-            _context9.next = 6;
+            _context10.next = 6;
             return checkoutModule.updateVoucherPaymentItemsAsync(voucherItems);
           case 6:
             // 更新钱包卡券数据
@@ -869,21 +884,21 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             }
           case 7:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9);
+      }, _callee10);
     }));
-    return function (_x9) {
-      return _ref12.apply(this, arguments);
+    return function (_x10) {
+      return _ref13.apply(this, arguments);
     };
   }());
 
   // 手动折扣相关处理函数
   var handlePriceAdjustConfirm = /*#__PURE__*/function () {
-    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(newPrice) {
+    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(newPrice) {
       var ScheduleModule, _getSumTotal2, productAmount, discountAmount;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
             try {
               if (checkoutModule && orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
@@ -914,51 +929,51 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             setShowPriceAdjustModal(false);
           case 2:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10);
+      }, _callee11);
     }));
-    return function handlePriceAdjustConfirm(_x10) {
-      return _ref13.apply(this, arguments);
+    return function handlePriceAdjustConfirm(_x11) {
+      return _ref14.apply(this, arguments);
     };
   }();
   var handleButtonClick = /*#__PURE__*/function () {
-    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(key) {
+    var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(key) {
       var _savePayLaterHandlerR;
       var data, isSynced, orderId, params, _paymentItems;
-      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
             console.log('handleButtonClick', key);
-            _context11.t0 = key;
-            _context11.next = _context11.t0 === 'order-note' ? 4 : _context11.t0 === 'send-link' ? 6 : _context11.t0 === 'print-receipt' ? 8 : _context11.t0 === 'manual-discount' ? 24 : _context11.t0 === 'save-pay-later' ? 38 : 40;
+            _context12.t0 = key;
+            _context12.next = _context12.t0 === 'order-note' ? 4 : _context12.t0 === 'send-link' ? 6 : _context12.t0 === 'print-receipt' ? 8 : _context12.t0 === 'manual-discount' ? 24 : _context12.t0 === 'save-pay-later' ? 38 : 40;
             break;
           case 4:
             setNoteModalOpen(true);
-            return _context11.abrupt("break", 40);
+            return _context12.abrupt("break", 40);
           case 6:
             setPaymentLinkModalOpen(true);
-            return _context11.abrupt("break", 40);
+            return _context12.abrupt("break", 40);
           case 8:
-            _context11.next = 10;
+            _context12.next = 10;
             return checkoutModule.isCurrentOrderSynced();
           case 10:
-            isSynced = _context11.sent;
+            isSynced = _context12.sent;
             if (isSynced) {
-              _context11.next = 17;
+              _context12.next = 17;
               break;
             }
-            _context11.next = 14;
+            _context12.next = 14;
             return checkoutModule.manualSyncOrderAsync();
           case 14:
-            data = _context11.sent;
-            _context11.next = 21;
+            data = _context12.sent;
+            _context12.next = 21;
             break;
           case 17:
-            _context11.next = 19;
+            _context12.next = 19;
             return checkoutModule.getCurrentOrderId();
           case 19:
-            orderId = _context11.sent;
+            orderId = _context12.sent;
             data = {
               orderId: orderId
             };
@@ -983,47 +998,47 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 console.error('handleButtonClick_print-receipt_error>>>>', error);
               }
             }
-            return _context11.abrupt("break", 40);
+            return _context12.abrupt("break", 40);
           case 24:
             if (orderInfo !== null && orderInfo !== void 0 && orderInfo.totalAmount) {
-              _context11.next = 27;
+              _context12.next = 27;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.no-amount'));
-            return _context11.abrupt("return");
+            return _context12.abrupt("return");
           case 27:
-            _context11.next = 29;
+            _context12.next = 29;
             return checkoutModule.getCurrentOrderPaymentItemsAsync();
           case 29:
-            _paymentItems = _context11.sent;
+            _paymentItems = _context12.sent;
             if (!(_paymentItems !== null && _paymentItems !== void 0 && _paymentItems.length)) {
-              _context11.next = 33;
+              _context12.next = 33;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.has-payment-items'));
-            return _context11.abrupt("return");
+            return _context12.abrupt("return");
           case 33:
             if (!(Number(customAmount) <= 0 && Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) >= 0)) {
-              _context11.next = 36;
+              _context12.next = 36;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.manual-discount.no-amount'));
-            return _context11.abrupt("return");
+            return _context12.abrupt("return");
           case 36:
             setShowPriceAdjustModal(true);
-            return _context11.abrupt("break", 40);
+            return _context12.abrupt("break", 40);
           case 38:
             // 通过 ref 调用 SavePayLaterHandler 的处理方法
             (_savePayLaterHandlerR = savePayLaterHandlerRef.current) === null || _savePayLaterHandlerR === void 0 || _savePayLaterHandlerR.handleSavePayLaterClick();
-            return _context11.abrupt("break", 40);
+            return _context12.abrupt("break", 40);
           case 40:
           case "end":
-            return _context11.stop();
+            return _context12.stop();
         }
-      }, _callee11);
+      }, _callee12);
     }));
-    return function handleButtonClick(_x11) {
-      return _ref14.apply(this, arguments);
+    return function handleButtonClick(_x12) {
+      return _ref15.apply(this, arguments);
     };
   }();
 
@@ -1051,37 +1066,37 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
   };
   var handleSendCustomerPaymentLink = /*#__PURE__*/function () {
-    var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(data) {
+    var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(data) {
       var order, stateAmount, isCurrentOrderSynced, res;
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
             // 先检测订单是否同步过，如果没有，需要先手动下单
             // 如果是定金模式，则需要设置当前待付金额至 os 的 deposit_amount
             order = checkoutModule.getCurrentOrderInfo();
             if (!order.isDeposit) {
-              _context12.next = 5;
+              _context13.next = 5;
               break;
             }
             stateAmount = checkoutModule.getStateAmount();
-            _context12.next = 5;
+            _context13.next = 5;
             return checkoutModule.setDepositAmountAsync(stateAmount);
           case 5:
             isCurrentOrderSynced = checkoutModule.isCurrentOrderSynced();
             if (isCurrentOrderSynced) {
-              _context12.next = 9;
+              _context13.next = 9;
               break;
             }
-            _context12.next = 9;
+            _context13.next = 9;
             return checkoutModule.manualSyncOrderAsync();
           case 9:
-            _context12.next = 11;
+            _context13.next = 11;
             return checkoutModule.sendCustomerPayLinkAsync({
               emails: data.emails,
               order_ids: [checkoutModule.getCurrentOrderId()]
             });
           case 11:
-            res = _context12.sent;
+            res = _context13.sent;
             // 支付链接发送成功 转 toC，这边可以关掉了
             if (res.success) {
               Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.send-payment-link.success'));
@@ -1091,12 +1106,12 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             }
           case 13:
           case "end":
-            return _context12.stop();
+            return _context13.stop();
         }
-      }, _callee12);
+      }, _callee13);
     }));
-    return function handleSendCustomerPaymentLink(_x12) {
-      return _ref15.apply(this, arguments);
+    return function handleSendCustomerPaymentLink(_x13) {
+      return _ref16.apply(this, arguments);
     };
   }();
   var searchAndClientProps = useMemo(function () {
@@ -1108,31 +1123,44 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     return {};
   }, [paymentItems]);
   var roundingFunction = /*#__PURE__*/function () {
-    var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(amount) {
+    var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(amount) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            _context13.next = 2;
+            _context14.next = 2;
             return checkoutModule.roundAmountAsync(amount);
           case 2:
-            res = _context13.sent;
-            return _context13.abrupt("return", res);
+            res = _context14.sent;
+            return _context14.abrupt("return", res);
           case 4:
           case "end":
-            return _context13.stop();
+            return _context14.stop();
         }
-      }, _callee13);
+      }, _callee14);
     }));
-    return function roundingFunction(_x13) {
-      return _ref16.apply(this, arguments);
+    return function roundingFunction(_x14) {
+      return _ref17.apply(this, arguments);
     };
   }();
+
+  // 处理PaymentModal区域的点击事件
+  var handleModalClick = useCallback(function (event) {
+    // 关闭所有Toast
+    closeAllPaymentResultToasts();
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     ref: checkoutRef,
+    onClick: handleModalClick,
     style: _objectSpread(_objectSpread({}, checkoutStyles.container), {}, {
       maxHeight: dynamicMaxHeight
     })
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: '12px 16px',
+      border: '1px solid #d0d5dd',
+      borderRadius: 8
+    }
   }, /*#__PURE__*/React.createElement(SearchAndClientModule, _extends({
     onClientChange: function onClientChange() {
       // 同步记录客户信息变更情况
@@ -1146,7 +1174,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     ref: walletPassRef,
     paymentItems: paymentItems,
     onSelectChange: handleSelectWalletChange
-  }), /*#__PURE__*/React.createElement(AmountSummary, {
+  })), /*#__PURE__*/React.createElement(AmountSummary, {
     amountSymbol: state.amountSymbol,
     orderInfo: orderInfo || undefined,
     cartData: cartData,
@@ -1158,6 +1186,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     clientInfo: state === null || state === void 0 || (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.value,
     onAmountChange: handleAmountChange,
     onDepositStatusChange: handleDepositStatusChange,
+    onBalanceDueAmountClick: handleButtonClick,
     onConfirm: handleWalletPassConfirmPay,
     totalAmount: totalAmount
   }), /*#__PURE__*/React.createElement("div", {
@@ -1189,7 +1218,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     paymentMethods: paymentMethods,
     customAmount: customAmount,
     title: paymentOptionsTitle,
-    disabled: isOrderFree
+    disabled: isOrderFree,
+    showCashPayment: showCashPayment
   })), moduleConfig.showAdditionalModule && /*#__PURE__*/React.createElement("div", {
     className: showCashPayment ? '' : 'additional-module-container',
     style: showCashPayment ? {
@@ -1253,20 +1283,20 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
 // 主要的支付弹窗组件
 
-var PaymentModal = function PaymentModal(_ref17) {
+var PaymentModal = function PaymentModal(_ref18) {
   var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper;
-  var open = _ref17.open,
-    data = _ref17.data,
-    callback = _ref17.callback,
-    onClose = _ref17.onClose,
-    dispatch = _ref17.dispatch,
-    state = _ref17.state;
+  var open = _ref18.open,
+    data = _ref18.data,
+    callback = _ref18.callback,
+    onClose = _ref18.onClose,
+    dispatch = _ref18.dispatch,
+    state = _ref18.state;
   var context = useEngineContext();
   locales.init(checkoutLocales, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.locales) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getLocale) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2)) || ((_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.storage) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.get('umi_locale')) || 'en');
-  var _ref18 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
-    pisellos = _ref18.pisellos,
-    getData = _ref18.getData,
-    interaction = _ref18.interaction;
+  var _ref19 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    pisellos = _ref19.pisellos,
+    getData = _ref19.getData,
+    interaction = _ref19.interaction;
   var _useState21 = useState(null),
     _useState22 = _slicedToArray(_useState21, 2),
     orderInfo = _useState22[0],
@@ -1293,10 +1323,10 @@ var PaymentModal = function PaymentModal(_ref17) {
 
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
-    var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
       var checkoutModule, res;
-      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
           case 0:
             // TODO: 用户在这里实现重试逻辑
             // console.log('重试按钮被点击，请在这里添加重试逻辑');
@@ -1308,24 +1338,26 @@ var PaymentModal = function PaymentModal(_ref17) {
             //   // 失败保持弹窗打开，允许继续重试
             // }
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
-            _context14.next = 3;
+            _context15.next = 3;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.manualSyncOrderAsync();
           case 3:
-            res = _context14.sent;
+            res = _context15.sent;
             console.log(res);
-            if (res.success) {
-              setShowRetryModal(false);
-              showSuccessToast === null || showSuccessToast === void 0 || showSuccessToast(res);
-              // setShowRetryModal(false);
+            if (!res.success) {
+              _context15.next = 9;
+              break;
             }
-          case 6:
+            setShowRetryModal(false);
+            _context15.next = 9;
+            return showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(res);
+          case 9:
           case "end":
-            return _context14.stop();
+            return _context15.stop();
         }
-      }, _callee14);
+      }, _callee15);
     }));
     return function handleRetry() {
-      return _ref19.apply(this, arguments);
+      return _ref20.apply(this, arguments);
     };
   }();
 
@@ -1349,6 +1381,53 @@ var PaymentModal = function PaymentModal(_ref17) {
     };
   }, []);
 
+  // 初始化 tillButton 数据
+  useEffect(function () {
+    var _interaction$utils3;
+    var initTillButtonData = /*#__PURE__*/function () {
+      var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        var _interaction$utils2, _interaction$utils2$a, tillButtonData;
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
+            case 0:
+              console.log('准备获取tillButton数据');
+              _context16.prev = 1;
+              _context16.next = 4;
+              return interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$a = _interaction$utils2.asyncDataManager) === null || _interaction$utils2$a === void 0 ? void 0 : _interaction$utils2$a.call(_interaction$utils2, {
+                module: 'get',
+                key: 'till_button'
+              });
+            case 4:
+              tillButtonData = _context16.sent;
+              console.log('获取tillButton数据成功', tillButtonData);
+              if (tillButtonData) {
+                // 设置 tillButton 数据到全局 Toast 管理器
+                setTillButton(tillButtonData);
+                console.log('PaymentModal: tillButton data set successfully', tillButtonData);
+              }
+              _context16.next = 12;
+              break;
+            case 9:
+              _context16.prev = 9;
+              _context16.t0 = _context16["catch"](1);
+              console.error('PaymentModal: Failed to get till_button from asyncDataManager:', _context16.t0);
+            case 12:
+            case "end":
+              return _context16.stop();
+          }
+        }, _callee16, null, [[1, 9]]);
+      }));
+      return function initTillButtonData() {
+        return _ref21.apply(this, arguments);
+      };
+    }();
+
+    // 只在 PaymentModal 打开时初始化 tillButton 数据
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils3 = interaction.utils) !== null && _interaction$utils3 !== void 0 && _interaction$utils3.asyncDataManager) {
+      initTillButtonData();
+    }
+  }, [interaction]);
+
   // 计算元素最大高度: window.innerHeight * 0.9 - 72
   var dynamicMaxHeight = useMemo(function () {
     if (windowHeight === 0) return '600px'; // 默认值
@@ -1387,13 +1466,13 @@ var PaymentModal = function PaymentModal(_ref17) {
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
-    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(noteValue) {
+    var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(noteValue) {
       var checkoutModule, orderId, _checkoutModule$editO, _checkoutModule, _checkoutModule$updat;
-      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
+      return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+        while (1) switch (_context17.prev = _context17.next) {
           case 0:
             if (!(noteModalSource === 'payment-result-toast')) {
-              _context15.next = 6;
+              _context17.next = 6;
               break;
             }
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
@@ -1404,15 +1483,15 @@ var PaymentModal = function PaymentModal(_ref17) {
               Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.updated-successfully'));
             }
             setNoteModalOpen(false);
-            return _context15.abrupt("return");
+            return _context17.abrupt("return");
           case 6:
-            _context15.prev = 6;
+            _context17.prev = 6;
             _checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
             if (!_checkoutModule) {
-              _context15.next = 13;
+              _context17.next = 13;
               break;
             }
-            _context15.next = 11;
+            _context17.next = 11;
             return (_checkoutModule$updat = _checkoutModule.updateOrderNoteAsync) === null || _checkoutModule$updat === void 0 ? void 0 : _checkoutModule$updat.call(_checkoutModule, noteValue);
           case 11:
             setOrderNote(noteValue);
@@ -1438,38 +1517,38 @@ var PaymentModal = function PaymentModal(_ref17) {
               console.log('Note added from payment content');
               // 在支付内容中打开的，执行常规处理逻辑
             }
-            _context15.next = 21;
+            _context17.next = 21;
             break;
           case 17:
-            _context15.prev = 17;
-            _context15.t0 = _context15["catch"](6);
-            console.error('Failed to update order note:', _context15.t0);
+            _context17.prev = 17;
+            _context17.t0 = _context17["catch"](6);
+            console.error('Failed to update order note:', _context17.t0);
             Toast === null || Toast === void 0 || Toast.error(locales.getText('pisell2.checkout.order-note.update-failed'));
           case 21:
             setNoteModalOpen(false);
           case 22:
           case "end":
-            return _context15.stop();
+            return _context17.stop();
         }
-      }, _callee15, null, [[6, 17]]);
+      }, _callee17, null, [[6, 17]]);
     }));
-    return function handleNoteConfirm(_x14) {
-      return _ref20.apply(this, arguments);
+    return function handleNoteConfirm(_x15) {
+      return _ref22.apply(this, arguments);
     };
   }();
   var handleNoteDelete = /*#__PURE__*/function () {
-    var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+    var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
       var checkoutModule, _checkoutModule$updat2;
-      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
+      return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+        while (1) switch (_context18.prev = _context18.next) {
           case 0:
-            _context16.prev = 0;
+            _context18.prev = 0;
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
             if (!checkoutModule) {
-              _context16.next = 7;
+              _context18.next = 7;
               break;
             }
-            _context16.next = 5;
+            _context18.next = 5;
             return (_checkoutModule$updat2 = checkoutModule.updateOrderNoteAsync) === null || _checkoutModule$updat2 === void 0 ? void 0 : _checkoutModule$updat2.call(checkoutModule, '');
           case 5:
             setOrderNote('');
@@ -1485,23 +1564,23 @@ var PaymentModal = function PaymentModal(_ref17) {
                 }
               });
             }
-            _context16.next = 14;
+            _context18.next = 14;
             break;
           case 10:
-            _context16.prev = 10;
-            _context16.t0 = _context16["catch"](0);
-            console.error('Failed to delete order note:', _context16.t0);
+            _context18.prev = 10;
+            _context18.t0 = _context18["catch"](0);
+            console.error('Failed to delete order note:', _context18.t0);
             Toast === null || Toast === void 0 || Toast.error(locales.getText('pisell2.checkout.order-note.delete-failed'));
           case 14:
             setNoteModalOpen(false);
           case 15:
           case "end":
-            return _context16.stop();
+            return _context18.stop();
         }
-      }, _callee16, null, [[0, 10]]);
+      }, _callee18, null, [[0, 10]]);
     }));
     return function handleNoteDelete() {
-      return _ref21.apply(this, arguments);
+      return _ref23.apply(this, arguments);
     };
   }();
   var handleNoteCancel = function handleNoteCancel() {
@@ -1519,8 +1598,173 @@ var PaymentModal = function PaymentModal(_ref17) {
 
   // 处理从支付结果toast打开订单备注的事件
   var handleOrderNoteClickFromToast = function handleOrderNoteClickFromToast() {
-    setNoteModalSource('payment-result-toast');
-    setNoteModalOpen(true);
+    var _context$appHelper$ut5, _context$appHelper$ut6, _context$appHelper$ut7, _context$appHelper$ut8;
+    // 创建独立的Modal容器
+    var modalContainer = document.createElement('div');
+    document.body.appendChild(modalContainer);
+
+    // 获取当前的Toast实例，如果不可用则创建全局Toast函数
+    var showToast = function showToast(type, message) {
+      if (Toast && Toast[type]) {
+        Toast[type](message);
+      } else {
+        // 如果Toast不可用，尝试使用全局的消息提示
+        if (type === 'success') {
+          console.log('✅ Success:', message);
+          // 可以在这里添加其他全局提示方式
+        } else {
+          console.error('❌ Error:', message);
+          // 可以在这里添加其他全局提示方式
+        }
+      }
+    };
+    var handleNoteConfirm = /*#__PURE__*/function () {
+      var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(noteValue) {
+        var checkoutModule, orderId, _checkoutModule$editO2;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
+            case 0:
+              _context19.prev = 0;
+              checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
+              orderId = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
+              if (!(checkoutModule && orderId)) {
+                _context19.next = 8;
+                break;
+              }
+              _context19.next = 6;
+              return (_checkoutModule$editO2 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO2 === void 0 ? void 0 : _checkoutModule$editO2.call(checkoutModule, orderId, noteValue);
+            case 6:
+              setOrderNote(noteValue);
+              showToast('success', locales.getText('pisell2.checkout.order-note.updated-successfully'));
+            case 8:
+              _context19.next = 14;
+              break;
+            case 10:
+              _context19.prev = 10;
+              _context19.t0 = _context19["catch"](0);
+              console.error('Failed to update order note:', _context19.t0);
+              showToast('error', locales.getText('pisell2.checkout.order-note.update-failed'));
+            case 14:
+              // 清理DOM
+              ReactDOM.unmountComponentAtNode(modalContainer);
+              if (document.body.contains(modalContainer)) {
+                document.body.removeChild(modalContainer);
+              }
+            case 16:
+            case "end":
+              return _context19.stop();
+          }
+        }, _callee19, null, [[0, 10]]);
+      }));
+      return function handleNoteConfirm(_x16) {
+        return _ref24.apply(this, arguments);
+      };
+    }();
+    var handleNoteDelete = /*#__PURE__*/function () {
+      var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+        var checkoutModule, orderId, _checkoutModule$editO3;
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
+            case 0:
+              _context20.prev = 0;
+              checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
+              orderId = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.getCurrentOrderId();
+              if (!(checkoutModule && orderId)) {
+                _context20.next = 8;
+                break;
+              }
+              _context20.next = 6;
+              return (_checkoutModule$editO3 = checkoutModule.editOrderNoteByOrderIdAsync) === null || _checkoutModule$editO3 === void 0 ? void 0 : _checkoutModule$editO3.call(checkoutModule, orderId, '');
+            case 6:
+              setOrderNote('');
+              showToast('success', locales.getText('pisell2.checkout.order-note.deleted-successfully'));
+            case 8:
+              _context20.next = 14;
+              break;
+            case 10:
+              _context20.prev = 10;
+              _context20.t0 = _context20["catch"](0);
+              console.error('Failed to delete order note:', _context20.t0);
+              showToast('error', locales.getText('pisell2.checkout.order-note.delete-failed'));
+            case 14:
+              // 清理DOM
+              ReactDOM.unmountComponentAtNode(modalContainer);
+              if (document.body.contains(modalContainer)) {
+                document.body.removeChild(modalContainer);
+              }
+            case 16:
+            case "end":
+              return _context20.stop();
+          }
+        }, _callee20, null, [[0, 10]]);
+      }));
+      return function handleNoteDelete() {
+        return _ref25.apply(this, arguments);
+      };
+    }();
+    var handleNoteCancel = function handleNoteCancel() {
+      // 清理DOM
+      ReactDOM.unmountComponentAtNode(modalContainer);
+      if (document.body.contains(modalContainer)) {
+        document.body.removeChild(modalContainer);
+      }
+    };
+
+    // 获取当前语言环境
+    var currentLocale = ((_context$appHelper$ut5 = context.appHelper.utils) === null || _context$appHelper$ut5 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut5.getApp) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.call(_context$appHelper$ut5)) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut6 = _context$appHelper$ut6.locales) === null || _context$appHelper$ut6 === void 0 || (_context$appHelper$ut7 = _context$appHelper$ut6.getLocale) === null || _context$appHelper$ut7 === void 0 ? void 0 : _context$appHelper$ut7.call(_context$appHelper$ut6)) || ((_context$appHelper$ut8 = context.appHelper.utils) === null || _context$appHelper$ut8 === void 0 || (_context$appHelper$ut8 = _context$appHelper$ut8.storage) === null || _context$appHelper$ut8 === void 0 ? void 0 : _context$appHelper$ut8.get('umi_locale')) || 'en';
+
+    // 创建一个临时的Context Provider来传递正确的语言环境
+    var EngineContextProvider = function EngineContextProvider(_ref26) {
+      var _context$engine;
+      var children = _ref26.children;
+      var tempEngineContext = _objectSpread(_objectSpread({}, context), {}, {
+        engine: _objectSpread(_objectSpread({}, context.engine), {}, {
+          props: _objectSpread(_objectSpread({}, (_context$engine = context.engine) === null || _context$engine === void 0 ? void 0 : _context$engine.props), {}, {
+            locale: currentLocale
+          })
+        })
+      });
+
+      // 创建临时的Context
+      var TempContext = /*#__PURE__*/React.createContext(tempEngineContext);
+
+      // 临时设置全局上下文，确保useEngineContext能够获取到正确的语言环境
+      var originalContext = window.__injectedContext;
+      window.__injectedContext = tempEngineContext;
+      React.useEffect(function () {
+        return function () {
+          // 组件卸载时恢复原始上下文
+          window.__injectedContext = originalContext;
+        };
+      }, []);
+      return /*#__PURE__*/React.createElement(TempContext.Provider, {
+        value: tempEngineContext
+      }, children);
+    };
+    var orderNote = '';
+    try {
+      var checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
+      orderNote = checkoutModule.getOrderNote();
+    } catch (error) {
+      console.warn('Failed to get initial custom amount:', error);
+    }
+
+    // 渲染NoteModal
+    ReactDOM.render( /*#__PURE__*/React.createElement(EngineContextProvider, null, /*#__PURE__*/React.createElement(ConfigProvider, {
+      prefixCls: "pisell-lowcode",
+      theme: {
+        token: {
+          colorPrimary: '#7F56DA'
+        }
+      }
+    }, /*#__PURE__*/React.createElement(NoteModal, {
+      open: true,
+      title: locales.getText('pisell2.text.add-order-notes'),
+      value: orderNote,
+      onConfirm: handleNoteConfirm,
+      onDelete: handleNoteDelete,
+      onCancel: handleNoteCancel
+    }))), modalContainer);
   };
 
   // 创建本地翻译函数，优先使用 checkout 语言包
@@ -1550,14 +1794,19 @@ var PaymentModal = function PaymentModal(_ref17) {
     currentPaymentResultRef.current = result;
   };
 
-  // 创建toast关闭时的统一回调函数
+  // 创建toast关闭时的统一回调函数 - 现在只处理支付完成回调，不自动关闭Modal
   var handleToastClose = function handleToastClose() {
-    console.log('PaymentModal - Toast closed, executing callbacks and closing modal');
+    console.log('PaymentModal - Toast closed, executing payment completion callback');
     // 调用支付完成回调
     if (currentPaymentResultRef.current) {
       callback === null || callback === void 0 || callback(currentPaymentResultRef.current);
     }
-    // 关闭整个支付弹窗
+    // 不再自动关闭PaymentModal，让两个弹窗独立管理
+  };
+
+  // 专门用于关闭PaymentModal的函数
+  var handleModalClose = function handleModalClose() {
+    console.log('PaymentModal - Modal closing independently');
     onClose === null || onClose === void 0 || onClose(true);
   };
   var handlePaymentCancel = function handlePaymentCancel(reset) {
@@ -1567,33 +1816,42 @@ var PaymentModal = function PaymentModal(_ref17) {
     });
     var checkout = pisellos.getModule('checkout');
     checkout.cancelCurrentOrderAsync();
+    // 不关闭PaymentResultToast，让它独立存在
     onClose === null || onClose === void 0 || onClose(reset || false);
   };
 
   // 自定义头部组件
   var CustomHeader = function CustomHeader() {
     return /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'center',
-        width: '100%',
-        position: 'relative'
-      }
+      className: "payment-modal-custom-header"
     }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'center',
-        gap: '12px',
-        flex: '0 0 auto'
+      className: "header__left"
+    }, /*#__PURE__*/React.createElement(Button, {
+      icon: /*#__PURE__*/React.createElement(Icon, {
+        type: "pisell2-arrow-left",
+        size: 24
+      }),
+      size: "small",
+      type: "text",
+      onClick: function onClick() {
+        var checkout = pisellos.getModule('checkout');
+        if (checkout.isCurrentOrderSynced()) {
+          handlePaymentCancel(true);
+        } else {
+          handlePaymentCancel(false);
+        }
       }
-    }, /*#__PURE__*/React.createElement(DeviceIconGroup, null)), /*#__PURE__*/React.createElement("div", {
-      style: {
-        position: 'absolute',
-        left: '50%',
-        transform: 'translateX(-50%)',
-        fontWeight: '500'
+    })), /*#__PURE__*/React.createElement("div", {
+      className: "header__center"
+    }, translation('order.total'), "\uFF1A", formatCurrency(totalAmount, state === null || state === void 0 ? void 0 : state.amountSymbol)), /*#__PURE__*/React.createElement("div", {
+      className: "header__right"
+    }, /*#__PURE__*/React.createElement(Button, {
+      size: "small",
+      type: "link",
+      onClick: function onClick() {
+        return handlePaymentCancel(true);
       }
-    }, translation('order.total'), "\uFF1A", formatCurrency(totalAmount, state === null || state === void 0 ? void 0 : state.amountSymbol)));
+    }, locales.getText('order.start-new-order'))));
   };
 
   // 初始化订单备注
@@ -1610,23 +1868,23 @@ var PaymentModal = function PaymentModal(_ref17) {
   // 初始化checkout数据
   useEffect(function () {
     var initCheckoutData = /*#__PURE__*/function () {
-      var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+      var _ref27 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
         var checkout, _newData$subtotal_inf, shop_wallet_pass_id, newData, _orderInfo2, _data$subtotal_info, _orderInfo3;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              _context17.prev = 0;
+              _context22.prev = 0;
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated.current)) {
-                _context17.next = 18;
+                _context22.next = 18;
                 break;
               }
               isLocalOrderCreated.current = true;
-              _context17.next = 6;
+              _context22.next = 6;
               return getShopWalletPassId(interaction);
             case 6:
-              shop_wallet_pass_id = _context17.sent;
+              shop_wallet_pass_id = _context22.sent;
               checkout.setOtherParams({
                 is_price_include_tax: getData('is_price_include_tax'),
                 tax_rate: getData('tax_rate') || '10',
@@ -1641,7 +1899,7 @@ var PaymentModal = function PaymentModal(_ref17) {
               });
               newData = cloneDeep(data); // setTotalAmount(newData.total.expectAmount);
               // 先往 checkout 解决方案推送一条 local 数据
-              _context17.next = 11;
+              _context22.next = 11;
               return checkout.createLocalOrderAsync({
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf = newData.subtotal_info) === null || _newData$subtotal_inf === void 0 ? void 0 : _newData$subtotal_inf.subTotalList,
@@ -1665,123 +1923,152 @@ var PaymentModal = function PaymentModal(_ref17) {
                 unsubscribeRef.current = undefined;
               }
               // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
-              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', function (data) {
-                var _data$response, _responseData$payment2;
-                // 获取支付状态和相关信息
-                var responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data;
-                // 获取支付状态
-                var paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
-                if (data.isManual) return;
-                handlePaymentComplete(data);
-                // 如果正在显示现金支付 toast，跳过自动关闭逻辑
-                if (showingCashToastRef.current) {
-                  return;
-                }
-
-                // 获取订单总金额
-                var orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
-                var gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
-                var currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.current_change_given_amount) || 0);
-                // const changeDue = Number(responseData?.amount_gap || 0);
-                // 获取失败原因
-                var failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason;
-
-                // 根据支付状态弹出对应的支付结果toast
-                if (paymentStatus) {
-                  // 打印订单完整信息
-                  console.log('print_order_onOrderSynced>>>>', responseData);
-                  logger === null || logger === void 0 || logger.addLog({
-                    type: 'info',
-                    title: 'print_order_onOrderSynced',
-                    metadata: {
-                      responseData: responseData
-                    }
-                  });
-                  try {
-                    var _responseData$payment3;
-                    var params = {
-                      type: '99',
-                      // 打印订单全部信息
-                      data: {
-                        order_id: responseData.order_id,
-                        machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                        small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data,
-                        machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
-                      }
-                    };
-                    console.log('print_order_onOrderSynced_params>>>>', params);
-                    logger === null || logger === void 0 || logger.addLog({
-                      type: 'info',
-                      title: 'print_order_onOrderSynced_params',
-                      metadata: {
-                        params: params
-                      }
-                    });
-                    nativePrint(params, function (res) {
-                      console.log('print_order_onOrderSynced_res>>>>', res);
-                      logger === null || logger === void 0 || logger.addLog({
-                        type: 'info',
-                        title: 'print_order_onOrderSynced_res',
-                        metadata: {
-                          res: res
+              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', /*#__PURE__*/function () {
+                var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(data) {
+                  var _data$response, _responseData$payment2;
+                  var responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _interaction$utils4, _interaction$utils4$a, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, paymentResult;
+                  return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+                    while (1) switch (_context21.prev = _context21.next) {
+                      case 0:
+                        // 获取支付状态和相关信息
+                        responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data; // 获取支付状态
+                        paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
+                        if (!data.isManual) {
+                          _context21.next = 4;
+                          break;
+                        }
+                        return _context21.abrupt("return");
+                      case 4:
+                        handlePaymentComplete(data);
+                        // 如果正在显示现金支付 toast，跳过自动关闭逻辑
+                        if (!showingCashToastRef.current) {
+                          _context21.next = 7;
+                          break;
+                        }
+                        return _context21.abrupt("return");
+                      case 7:
+                        // 获取订单总金额
+                        orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
+                        gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
+                        currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.current_change_given_amount) || 0); // const changeDue = Number(responseData?.amount_gap || 0);
+                        // 获取失败原因
+                        failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason; // 根据支付状态弹出对应的支付结果toast
+                        if (!paymentStatus) {
+                          _context21.next = 27;
+                          break;
+                        }
+                        // 打印订单完整信息
+                        console.log('print_order_onOrderSynced>>>>', responseData);
+                        logger === null || logger === void 0 || logger.addLog({
+                          type: 'info',
+                          title: 'print_order_onOrderSynced',
+                          metadata: {
+                            responseData: responseData
+                          }
+                        });
+                        try {
+                          params = {
+                            type: '99',
+                            // 打印订单全部信息
+                            data: {
+                              order_id: responseData.order_id,
+                              machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
+                              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data,
+                              machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
+                            }
+                          };
+                          console.log('print_order_onOrderSynced_params>>>>', params);
+                          logger === null || logger === void 0 || logger.addLog({
+                            type: 'info',
+                            title: 'print_order_onOrderSynced_params',
+                            metadata: {
+                              params: params
+                            }
+                          });
+                          nativePrint(params, function (res) {
+                            console.log('print_order_onOrderSynced_res>>>>', res);
+                            logger === null || logger === void 0 || logger.addLog({
+                              type: 'info',
+                              title: 'print_order_onOrderSynced_res',
+                              metadata: {
+                                res: res
+                              }
+                            });
+                          });
+                        } catch (error) {
+                          console.error('print_order_onOrderSynced_error>>>>', error);
+                          logger === null || logger === void 0 || logger.addLog({
+                            type: 'info',
+                            title: 'print_order_onOrderSynced_error',
+                            metadata: {
+                              error: error
+                            }
+                          });
                         }
-                      });
-                    });
-                  } catch (error) {
-                    console.error('print_order_onOrderSynced_error>>>>', error);
-                    logger === null || logger === void 0 || logger.addLog({
-                      type: 'info',
-                      title: 'print_order_onOrderSynced_error',
-                      metadata: {
-                        error: error
-                      }
-                    });
-                  }
-
-                  // 确定支付状态
-                  var statusClassName = calculateStatusClassName(paymentStatus);
-                  var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
 
-                  // 根据支付状态展示不同的 toast
-                  displayPaymentResultToast({
-                    paymentStatus: paymentStatus,
-                    orderTotalAmount: orderTotalAmount,
-                    gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
-                    failureReason: failureReason,
-                    autoCloseConfig: autoCloseConfig,
-                    actionButtons: generateActionButtons(paymentStatus)
-                  }, paymentResultToastConfig);
+                        // 确定支付状态
+                        statusClassName = calculateStatusClassName(paymentStatus);
+                        autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
+                        _context21.next = 19;
+                        return interaction === null || interaction === void 0 || (_interaction$utils4 = interaction.utils) === null || _interaction$utils4 === void 0 || (_interaction$utils4$a = _interaction$utils4.asyncDataManager) === null || _interaction$utils4$a === void 0 ? void 0 : _interaction$utils4$a.call(_interaction$utils4, {
+                          module: 'get',
+                          key: 'auto_print_receipt'
+                        });
+                      case 19:
+                        enabledAutoPrint = _context21.sent;
+                        _context21.next = 22;
+                        return displayPaymentResultToast({
+                          paymentStatus: paymentStatus,
+                          orderTotalAmount: orderTotalAmount,
+                          gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
+                          failureReason: failureReason,
+                          autoCloseConfig: autoCloseConfig,
+                          actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
+                        }, paymentResultToastConfig);
+                      case 22:
+                        // 当支付状态为 paid 时，关闭 paymentModal
+                        if (paymentStatus === 'paid') {
+                          handleModalClose();
+                        }
 
-                  // 将支付结果信息传递给回调处理
-                  var paymentResult = _objectSpread(_objectSpread({}, data), {}, {
-                    toastInfo: {
-                      status: paymentStatus,
-                      amount: orderTotalAmount,
-                      gapAmount: currentChangeGivenAmount,
-                      failureReason: failureReason
+                        // 将支付结果信息传递给回调处理
+                        paymentResult = _objectSpread(_objectSpread({}, data), {}, {
+                          toastInfo: {
+                            status: paymentStatus,
+                            amount: orderTotalAmount,
+                            gapAmount: currentChangeGivenAmount,
+                            failureReason: failureReason
+                          }
+                        });
+                        handlePaymentComplete(paymentResult);
+                        _context21.next = 28;
+                        break;
+                      case 27:
+                        handlePaymentComplete(data);
+                      case 28:
+                      case "end":
+                        return _context21.stop();
                     }
-                  });
-                  handlePaymentComplete(paymentResult);
-                } else {
-                  handlePaymentComplete(data);
-                }
-                // 可以在这里执行同步完成后的业务逻辑
-                // 比如：通知其他系统、更新UI状态等
-              });
-              _context17.next = 29;
+                  }, _callee21);
+                }));
+                return function (_x17) {
+                  return _ref28.apply(this, arguments);
+                };
+              }());
+              _context22.next = 29;
               break;
             case 18:
               if (!isLocalOrderCreated.current) {
-                _context17.next = 29;
+                _context22.next = 29;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context17.next = 23;
+              _context22.next = 23;
               return checkout.cancelCurrentOrderAsync();
             case 23:
-              _context17.next = 25;
+              _context22.next = 25;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
@@ -1797,27 +2084,27 @@ var PaymentModal = function PaymentModal(_ref17) {
               setOrderInfo(_orderInfo3);
               isLocalOrderCreated.current = true;
             case 29:
-              _context17.next = 35;
+              _context22.next = 35;
               break;
             case 31:
-              _context17.prev = 31;
-              _context17.t0 = _context17["catch"](0);
-              console.error('Failed to initialize checkout data:', _context17.t0);
+              _context22.prev = 31;
+              _context22.t0 = _context22["catch"](0);
+              console.error('Failed to initialize checkout data:', _context22.t0);
               logger === null || logger === void 0 || logger.addLog({
                 type: 'error',
                 title: 'Failed to initialize checkout data',
                 metadata: {
-                  error: _context17.t0
+                  error: _context22.t0
                 }
               });
             case 35:
             case "end":
-              return _context17.stop();
+              return _context22.stop();
           }
-        }, _callee17, null, [[0, 31]]);
+        }, _callee22, null, [[0, 31]]);
       }));
       return function initCheckoutData() {
-        return _ref22.apply(this, arguments);
+        return _ref27.apply(this, arguments);
       };
     }();
     if (data) {
@@ -1846,36 +2133,35 @@ var PaymentModal = function PaymentModal(_ref17) {
   };
 
   // 支付结果弹窗按钮生成函数
-  var generateActionButtons = function generateActionButtons(paymentStatus) {
+  var generateActionButtons = function generateActionButtons(paymentStatus, enabledAutoPrint) {
     var getClassName = function getClassName(suffix) {
       return "payment-result-toast-".concat(suffix);
     };
 
     // 通用回调函数
     var handleDetailsClick = /*#__PURE__*/function () {
-      var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+      var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
         var _context$appHelper2;
-        var _context$appHelper$ut5, isTerminal, isWebPos, checkout, orderId;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        var _context$appHelper$ut9, isTerminal, isWebPos, checkout, orderId;
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               setTimeout(function () {
-                // 关闭支付结果toast
+                // 主动关闭PaymentResultToast
                 closePaymentResultToast();
-                // 关闭PaymentModal
-                handleToastClose();
+                // 不关闭PaymentModal，保持其打开状态
               }, 0);
-              _context$appHelper$ut5 = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils, isTerminal = _context$appHelper$ut5.isTerminal, isWebPos = _context$appHelper$ut5.isWebPos;
+              _context$appHelper$ut9 = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils, isTerminal = _context$appHelper$ut9.isTerminal, isWebPos = _context$appHelper$ut9.isWebPos;
               if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
-                _context18.next = 8;
+                _context23.next = 8;
                 break;
               }
               checkout = pisellos.getModule('checkout');
-              _context18.next = 6;
+              _context23.next = 6;
               return checkout.getCurrentOrderId();
             case 6:
-              orderId = _context18.sent;
-              return _context18.abrupt("return", interaction.utils.postMessageToApp({
+              orderId = _context23.sent;
+              return _context23.abrupt("return", interaction.utils.postMessageToApp({
                 module: 'booking',
                 key: 'view_order',
                 data: {
@@ -1885,50 +2171,55 @@ var PaymentModal = function PaymentModal(_ref17) {
               }));
             case 8:
             case "end":
-              return _context18.stop();
+              return _context23.stop();
           }
-        }, _callee18);
+        }, _callee23);
       }));
       return function handleDetailsClick() {
-        return _ref23.apply(this, arguments);
+        return _ref29.apply(this, arguments);
       };
     }();
     var handlePrintReceiptClick = /*#__PURE__*/function () {
-      var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+      var _ref30 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var checkoutModule, data, isSynced, orderId, params;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
+              setTimeout(function () {
+                // 主动关闭PaymentResultToast
+                closePaymentResultToast();
+                // 不关闭PaymentModal，保持其打开状态
+              }, 0);
               checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (checkoutModule) {
-                _context19.next = 3;
+                _context24.next = 4;
                 break;
               }
-              return _context19.abrupt("return");
-            case 3:
-              _context19.next = 5;
+              return _context24.abrupt("return");
+            case 4:
+              _context24.next = 6;
               return checkoutModule.isCurrentOrderSynced();
-            case 5:
-              isSynced = _context19.sent;
+            case 6:
+              isSynced = _context24.sent;
               if (isSynced) {
-                _context19.next = 12;
+                _context24.next = 13;
                 break;
               }
-              _context19.next = 9;
+              _context24.next = 10;
               return checkoutModule.manualSyncOrderAsync();
-            case 9:
-              data = _context19.sent;
-              _context19.next = 16;
+            case 10:
+              data = _context24.sent;
+              _context24.next = 17;
               break;
-            case 12:
-              _context19.next = 14;
+            case 13:
+              _context24.next = 15;
               return checkoutModule.getCurrentOrderId();
-            case 14:
-              orderId = _context19.sent;
+            case 15:
+              orderId = _context24.sent;
               data = {
                 orderId: orderId
               };
-            case 16:
+            case 17:
               // data.orderId 就是订单号，可以用来打印小票
               if (data.orderId) {
                 params = {
@@ -1948,14 +2239,14 @@ var PaymentModal = function PaymentModal(_ref17) {
                   console.error('handleButtonClick_print-receipt_error>>>>', error);
                 }
               }
-            case 17:
+            case 18:
             case "end":
-              return _context19.stop();
+              return _context24.stop();
           }
-        }, _callee19);
+        }, _callee24);
       }));
       return function handlePrintReceiptClick() {
-        return _ref24.apply(this, arguments);
+        return _ref30.apply(this, arguments);
       };
     }();
     var handleRetryClick = function handleRetryClick() {
@@ -1982,6 +2273,9 @@ var PaymentModal = function PaymentModal(_ref17) {
       closePaymentResultToast();
     };
     var handleOrderNoteClick = function handleOrderNoteClick() {
+      setTimeout(function () {
+        closePaymentResultToast();
+      }, 0);
       console.log(locales.getText('payment.result.actions.orderNoteClicked'));
       // 从支付结果toast打开NoteModal，使用传入的回调函数
       if (handleOrderNoteClickFromToast) {
@@ -1995,7 +2289,7 @@ var PaymentModal = function PaymentModal(_ref17) {
     switch (paymentStatus) {
       case 'paid':
         // 成功状态，显示查看详情和打印收据按钮
-        return [[{
+        return [[enabledAutoPrint ? {
           id: 'details',
           buttonProps: {
             className: getClassName('action-button'),
@@ -2005,7 +2299,7 @@ var PaymentModal = function PaymentModal(_ref17) {
             }),
             children: locales.getText('payment.result.details')
           }
-        }, {
+        } : {
           id: 'print',
           buttonProps: {
             className: getClassName('action-button'),
@@ -2036,20 +2330,14 @@ var PaymentModal = function PaymentModal(_ref17) {
       case 'partially_paid':
         // 部分支付状态
         return [[{
-          id: 'saveAsPartialPaid',
-          buttonProps: {
-            className: getClassName('action-button'),
-            onClick: handleSaveAsPartialPaidClick,
-            children: locales.getText('payment.result.saveAsPartialPaid')
-          }
-        }, {
-          id: 'continuePayment',
+          id: 'details',
           buttonProps: {
             className: getClassName('action-button'),
-            onClick: function onClick() {
-              closePaymentResultToast();
-            },
-            children: locales.getText('payment.result.continuePayment')
+            onClick: handleDetailsClick,
+            icon: /*#__PURE__*/React.createElement(FileCheck02, {
+              className: getClassName('action-icon')
+            }),
+            children: locales.getText('payment.result.details')
           }
         }, {
           id: 'more',
@@ -2178,7 +2466,7 @@ var PaymentModal = function PaymentModal(_ref17) {
 
   // 使用新的工具方法创建showSuccessToast函数
   var showSuccessToast = createShowSuccessToast(paymentResultToastConfig, generateActionButtons);
-  return /*#__PURE__*/React.createElement(PaymentResultToastProvider, null, /*#__PURE__*/React.createElement(PisellContainer
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellContainer
   // open={open}
   , {
     renderType: "modal",
@@ -2192,10 +2480,9 @@ var PaymentModal = function PaymentModal(_ref17) {
       destroyOnClose: false,
       maskClosable: false,
       footer: null,
-      closeIcon: null,
+      closeIcon: false,
       wrapClassName: "payment-modal-wrapper ".concat(!actualShowCashPayment ? 'no-cash-payment' : ''),
       size: 'large',
-      headerDivider: false,
       style: {
         height: 'auto'
       },
@@ -2203,7 +2490,7 @@ var PaymentModal = function PaymentModal(_ref17) {
         maxHeight: '100%',
         // 使用100%基于父元素，而不是视口的90%
         overflowY: 'auto',
-        padding: 0,
+        padding: 16,
         display: 'flex',
         flexDirection: 'column'
       }