@pisell/private-materials 6.7.9 → 6.8.1

package/lib/components/checkout/components/PaymentResultToast/index.less

@@ -17,6 +17,7 @@
   margin: 0 !important;
   pointer-events: none !important; // 让Toast Modal Wrap点击穿透
 
+  // 非 mask 模式下的样式
   .ant-modal {
     position: static !important;
     top: auto !important;
@@ -32,11 +33,47 @@
   }
 }
 
+// mask 模式下的全局样式（Modal 渲染到 body）
+.toast-modal-wrap-with-mask {
+  position: fixed !important;
+  top: 0 !important;
+  left: 0 !important;
+  right: 0 !important;
+  bottom: 0 !important;
+  width: 100vw !important;
+  height: 100vh !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  pointer-events: auto !important; // mask 模式下需要响应点击
+
+  .ant-modal-mask {
+    position: fixed !important;
+    top: 0 !important;
+    left: 0 !important;
+    right: 0 !important;
+    bottom: 0 !important;
+    width: 100vw !important;
+    height: 100vh !important;
+  }
+
+  .ant-modal {
+    position: relative !important;
+    top: auto !important;
+    left: auto !important;
+    transform: none !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    width: auto !important;
+    max-width: none !important;
+    pointer-events: auto !important; // Modal 内容可以响应点击
+  }
+}
+
 // Toast容器样式 - 用于多实例定位
 [data-toast-id] {
   z-index: 1000;
   position: fixed !important;
-  left: 96px !important;
   /* 注意：不设置bottom的!important，让JavaScript可以动态更新 */
   /* 移除强制的z-index设置，让Toast使用默认层级 */
   pointer-events: none !important; // 让Toast容器本身点击穿透
@@ -45,6 +82,23 @@
   width: auto !important;
   height: auto !important;
 
+  // 非 mask 模式下使用左下角定位
+  &:not([data-mask="true"]) {
+    left: 96px !important;
+  }
+
+  // mask 模式下，Modal 会渲染到 body，容器只作为占位符
+  // 不需要设置定位，因为 Modal 已经独立渲染
+  &[data-mask="true"] {
+    // 容器在 mask 模式下不需要定位，Modal 会独立渲染到 body
+    position: static !important;
+    left: auto !important;
+    top: auto !important;
+    bottom: auto !important;
+    right: auto !important;
+    transform: none !important;
+  }
+
   /* 新Toast进入动画 */
   &.toast-entering {
     opacity: 0;
@@ -81,42 +135,49 @@
   }
 
   // 强制覆盖Ant Design Modal的默认定位
-  .ant-modal-wrap {
-    position: static !important;
-    pointer-events: none !important; // 让Modal wrap点击穿透
-  }
+  // 非 mask 模式下使用 static 定位
+  &:not([data-mask="true"]) {
+    .ant-modal-wrap {
+      position: static !important;
+      pointer-events: none !important; // 让Modal wrap点击穿透
+    }
 
-  .ant-modal {
-    position: static !important;
-    top: auto !important;
-    left: auto !important;
-    transform: none !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    pointer-events: none !important; // 让Modal本身点击穿透
+    .ant-modal {
+      position: static !important;
+      top: auto !important;
+      left: auto !important;
+      transform: none !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      pointer-events: none !important; // 让Modal本身点击穿透
+    }
   }
 
+  // mask 模式下，Modal 会渲染到 body，容器内的样式不再需要
+  // 样式已通过全局 .toast-modal-wrap-with-mask 类名设置
 
-  // 覆盖所有可能的Ant Design Modal定位
-  .ant-modal-wrap {
-    position: static !important;
-    display: block !important;
-    overflow: visible !important;
-    pointer-events: none !important; // 让Modal wrap点击穿透
-  }
+  // 覆盖所有可能的Ant Design Modal定位（非 mask 模式）
+  &:not([data-mask="true"]) {
+    .ant-modal-wrap {
+      position: static !important;
+      display: block !important;
+      overflow: visible !important;
+      pointer-events: none !important; // 让Modal wrap点击穿透
+    }
 
-  .ant-modal {
-    position: static !important;
-    top: auto !important;
-    left: auto !important;
-    right: auto !important;
-    bottom: auto !important;
-    transform: none !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    width: 100% !important;
-    max-width: none !important;
-    pointer-events: none !important; // 让Modal点击穿透
+    .ant-modal {
+      position: static !important;
+      top: auto !important;
+      left: auto !important;
+      right: auto !important;
+      bottom: auto !important;
+      transform: none !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      width: 100% !important;
+      max-width: none !important;
+      pointer-events: none !important; // 让Modal点击穿透
+    }
   }
 
   // Toast进入动画
@@ -401,7 +462,7 @@
   // 副标题样式
   &-subtitle {
     &-text {
-      font-size: 30px; // 与图片一致
+      font-size: 48px; // 与图片一致
       font-weight: 600; // 与图片一致
       text-shadow: none; // 移除阴影
 

package/lib/components/checkout/components/SearchAndClientModule/index.js

@@ -48,7 +48,7 @@ var SearchAndClientModule = (props) => {
   const bookingTicket = (0, import_pisellos.useBookingTicket)();
   const handleSearch = (0, import_ahooks.useDebounceFn)(
     async (keyword) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       if (!!keyword) {
         setLoading(true);
         try {
@@ -61,9 +61,18 @@ var SearchAndClientModule = (props) => {
             return;
           }
           if ("type" in res && res.type == "walletCode") {
+            if (disabledSwitch) {
+              (_b = Toast == null ? void 0 : Toast.info) == null ? void 0 : _b.call(
+                Toast,
+                import_utils.locales.getText(
+                  "pisell2.checkout.client-card.tip.partially-paid"
+                )
+              );
+              return;
+            }
             const { customer, ...rest } = res.data;
             if (!customer) {
-              (_b = Toast == null ? void 0 : Toast.info) == null ? void 0 : _b.call(
+              (_c = Toast == null ? void 0 : Toast.info) == null ? void 0 : _c.call(
                 Toast,
                 import_utils.locales.getText("pisell2.checkout.wallet-pass-module.no-result")
               );
@@ -73,7 +82,7 @@ var SearchAndClientModule = (props) => {
               ...customer,
               latest_wallet_detail: rest
             };
-            (_d = (_c = clientCardRef.current) == null ? void 0 : _c.handleSetClient) == null ? void 0 : _d.call(_c, _customer, {
+            (_e = (_d = clientCardRef.current) == null ? void 0 : _d.handleSetClient) == null ? void 0 : _e.call(_d, _customer, {
               sameClientTip: import_utils.locales.getText(
                 "pisell2.checkout.client-card.tip.same-client"
               )
@@ -130,6 +139,23 @@ var SearchAndClientModule = (props) => {
         size: "default"
       }
     };
+    if (disabledSwitch === true) {
+      _props = {
+        open: false,
+        buttonProps: {
+          icon,
+          size: "default",
+          onClick: () => {
+            var _a;
+            (_a = Toast == null ? void 0 : Toast.info) == null ? void 0 : _a.call(
+              Toast,
+              import_utils.locales.getText("pisell2.checkout.client-card.tip.partially-paid")
+            );
+          },
+          style: { cursor: "not-allowed" }
+        }
+      };
+    }
     return _props;
   }, [Toast, disabledSwitch]);
   return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/checkout/index.less

@@ -71,7 +71,7 @@
     grid-template-rows: auto auto;
     gap: 8px 16px;
     background-color: #f6f2ff;
-    padding: 16px 16px 0 16px;
+    padding: 16px 16px 8px 16px;
     border-radius: 0 0 12px 12px;
     width: 100%; // 确保容器占满宽度
 

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

@@ -141,6 +141,7 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
+        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -154,6 +155,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -301,6 +303,7 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
+        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -322,6 +325,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -477,6 +481,7 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
+        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -490,6 +495,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;

package/lib/components/checkout/locales.js

@@ -192,6 +192,7 @@ var locales_default = {
     "pisell2.checkout.modal.close-price-adjustment": "Close price adjustment modal",
     "pisell2.checkout.modal.reset-price-adjustment": "Reset",
     "pisell2.checkout.modal.done-price-adjustment": "Done",
+    "pisell2.checkout.modal.price-adjustment-tips": "Changing amount will update order total",
     // Send Payment Link Modal
     "pisell2.checkout.send-payment-link.modal-title": "Send Payment Link",
     "pisell2.checkout.send-payment-link.email-address": "Email Address",
@@ -210,6 +211,7 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "The amount cannot be 0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "Order sync failed, please check your network",
+    "pisell2.checkout.order-create-failed": "Order create failed, please refresh app",
     "pisell2.checkout.sync-retry-hint": "Network error, please click the retry button to resync the order",
     "pisell2.checkout.tips": "Tips",
     "retry": "Retry",
@@ -381,6 +383,7 @@ var locales_default = {
     "pisell2.checkout.modal.close-price-adjustment": "关闭价格调整弹窗",
     "pisell2.checkout.modal.reset-price-adjustment": "重置",
     "pisell2.checkout.modal.done-price-adjustment": "完成",
+    "pisell2.checkout.modal.price-adjustment-tips": "修改金额将更新订单总额",
     // Send Payment Link Modal
     "pisell2.checkout.send-payment-link.modal-title": "发送支付链接",
     "pisell2.checkout.send-payment-link.email-address": "邮箱地址",
@@ -415,6 +418,7 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "金额不能为0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "订单同步失败，请检查网络",
+    "pisell2.checkout.order-create-failed": "订单创建失败，请重启APP",
     "pisell2.checkout.sync-retry-hint": "网络异常，请点击重试按钮重新同步订单",
     "pisell2.checkout.tips": "提示",
     "retry": "重试",
@@ -602,6 +606,7 @@ var locales_default = {
     "pisell2.checkout.modal.close-price-adjustment": "關閉價格調整彈窗",
     "pisell2.checkout.modal.reset-price-adjustment": "重置",
     "pisell2.checkout.modal.done-price-adjustment": "完成",
+    "pisell2.checkout.modal.price-adjustment-tips": "修改金額將更新訂單總額",
     // Send Payment Link Modal
     "pisell2.checkout.send-payment-link.modal-title": "發送支付鏈接",
     "pisell2.checkout.send-payment-link.email-address": "郵箱地址",
@@ -620,6 +625,7 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "金額不能為0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "訂單同步失敗，請檢查網絡",
+    "pisell2.checkout.order-create-failed": "订单创建失败，请重启APP",
     "pisell2.checkout.sync-retry-hint": "網絡異常，請點擊重試按鈕重新同步訂單",
     "pisell2.checkout.tips": "提示",
     "retry": "重試",

package/lib/components/checkout/plugin.d.ts

@@ -0,0 +1,2 @@
+declare const PaymentModalPlugin: any;
+export default PaymentModalPlugin;

package/lib/components/checkout/plugin.js

@@ -0,0 +1,263 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/checkout/plugin.tsx
+var plugin_exports = {};
+__export(plugin_exports, {
+  default: () => plugin_default
+});
+module.exports = __toCommonJS(plugin_exports);
+var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
+var import_react = __toESM(require("react"));
+var import_PaymentModal = __toESM(require("./PaymentModal"));
+var import_serve = require("../booking/editBookingModal/serve");
+var import_ticketBooking = require("../ticketBooking/components/ticketBooking");
+var import_utils = require("../../utils");
+var import_utils2 = require("../booking/components/footer/utils");
+var import_amount = require("../booking/components/footer/amount");
+var import_utils3 = require("@pisell/utils");
+var import_model = require("../booking/info/model");
+var import_materials = require("@pisell/materials");
+var PaymentModalContent = ({ state, dispatch }) => {
+  var _a, _b, _c;
+  const [dataReady, setDataReady] = (0, import_react.useState)(false);
+  const [data, setData] = (0, import_react.useState)(null);
+  const [client, setClient] = (0, import_react.useState)(null);
+  const context = (0, import_useEngineContext.default)();
+  const engineProps = ((_a = context.engine) == null ? void 0 : _a.props) || {};
+  import_utils.request.setRequest(context.appHelper.utils.request);
+  const { getData, pisellos } = context.appHelper.utils;
+  const Toast = (0, import_materials.useToast)();
+  const getDataFromHost = () => {
+    try {
+      const is_price_include_tax = getData("is_price_include_tax");
+      const tax_rate = getData("tax_rate") || "10";
+      const tax_title = getData("tax_title") || "GST";
+      const surcharge_list = getData("surcharge_list");
+      const schedule_list = getData("schedule_list");
+      let scheduleById = {};
+      if (Array.isArray(schedule_list)) {
+        for (let item of schedule_list) {
+          scheduleById[item.id] = item;
+        }
+      }
+      return {
+        is_price_include_tax,
+        tax_rate,
+        tax_title,
+        surcharge_list,
+        schedule_list,
+        scheduleById
+      };
+    } catch (error) {
+      console.error(error);
+      return {};
+    }
+  };
+  (0, import_react.useEffect)(() => {
+    if (!engineProps.order_id) return;
+    const getBookingDetail = async () => {
+      var _a2, _b2, _c2, _d;
+      (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast);
+      let bookingOrigin = await (0, import_serve._getBookingDetail)(engineProps.order_id);
+      let booking = (0, import_ticketBooking._formatBookingDetail)(bookingOrigin, {});
+      let values = (0, import_utils2.formatValues)(booking);
+      let ScheduleModule = context.appHelper.utils.pisellos.getModule("schedule");
+      let total = (0, import_amount.getSumTotal)(booking, {
+        isEdit: true,
+        ScheduleModule,
+        ...getDataFromHost()
+      });
+      total = {
+        ...total,
+        expectAmount: bookingOrigin.expect_amount,
+        actualPaidAmount: bookingOrigin.paid_amount,
+        dueAmount: bookingOrigin.total_amount,
+        notPaidAmount: bookingOrigin.amount_gap,
+        orderPaidAmount: bookingOrigin.order_paid_amount,
+        originExpectAmount: bookingOrigin.expect_amount,
+        shopDiscount: bookingOrigin.shop_discount,
+        roundingAmount: bookingOrigin.rounding_amount,
+        sumTotalAmount: bookingOrigin.total_amount,
+        tax: bookingOrigin.tax_fee,
+        productAmount: bookingOrigin.product_expect_amount,
+        paySurchargeFee: bookingOrigin.surcharge_fee,
+        taxInfo: {
+          title: bookingOrigin.tax_title,
+          rate: bookingOrigin.tax_rate,
+          is_price_include_tax: bookingOrigin.is_price_include_tax
+        }
+      };
+      const orderTotalList = [
+        // 订单已付金额
+        {
+          hidden: !booking.bookingId,
+          key: "custom_orderPaidAmount",
+          value: total.orderPaidAmount,
+          label: import_utils3.locales.getText("pisell2.text.amount-paid-on-order")
+        },
+        // 支付手续费
+        {
+          hidden: !booking.bookingId,
+          key: "custom_paySurchargeFee",
+          value: total.paySurchargeFee,
+          label: import_utils3.locales.getText("pisell1.text.payment-fee")
+        },
+        // 客户实付金额
+        {
+          hidden: !booking.bookingId,
+          key: "custom_actualPaidAmount",
+          value: total.actualPaidAmount,
+          label: import_utils3.locales.getText(
+            "pisell2.text.amount-actually-paid-by-the-customer"
+          )
+        },
+        // 退款金额
+        {
+          hidden: !booking.bookingId || !total.totalRefundAmount,
+          key: "custom_totalRefundAmount",
+          value: total.totalRefundAmount,
+          label: import_utils3.locales.getText("pisell2.text.refunded-amount")
+        }
+      ];
+      const subTotalList = [
+        // 小计
+        {
+          key: "sub_total",
+          value: total.productAmount
+        },
+        // 自定义手续费
+        ...total.surcharge || [],
+        // 税费
+        {
+          key: "tax",
+          value: total.tax,
+          tax: total.taxInfo
+        },
+        // 订单折扣（优惠券等）
+        {
+          key: "discount",
+          value: total.shopDiscount
+        },
+        // 手动折扣
+        // {
+        //   key: 'shop_discount',
+        //   value: Number(state.shop_discount) || 0,
+        //   label: locales.getText('pisell2.text.manual-price-adjustment'),
+        // },
+        // 总计
+        {
+          key: "expect_amount",
+          value: total.expectAmount,
+          label: import_utils3.locales.getText("pisell2.subtotal.total")
+        },
+        // 舍入金额
+        {
+          hidden: !total.roundingAmount,
+          key: "custom_roundingAmount",
+          value: total.roundingAmount,
+          label: import_utils3.locales.getText("pisell1.text.rounding")
+        }
+      ];
+      console.log(values);
+      const checkoutModule = await pisellos.getModule("checkout");
+      const paymentMethodList = await checkoutModule.getPaymentMethodsAsync();
+      const existPayment = (_c2 = (_b2 = bookingOrigin.payments) == null ? void 0 : _b2.filter((item) => item.status === "paid")) == null ? void 0 : _c2.map((item) => {
+        const paymentMethod = paymentMethodList.find((method) => method.code === item.payment_method);
+        return {
+          uuid: item.metadata.unique_payment_number,
+          custom_payment_id: paymentMethod.id,
+          order_payment_id: item.id,
+          name: paymentMethod == null ? void 0 : paymentMethod.name,
+          code: item.payment_method,
+          type: paymentMethod == null ? void 0 : paymentMethod.type,
+          amount: item.amount,
+          rounding_amount: item.rounding_amount,
+          status: "active",
+          order_payment_type: item.type,
+          metadata: item.metadata,
+          voucher_id: item.voucher_id,
+          service_charge: item.service_charge && typeof item.service_charge === "object" && !Array.isArray(item.service_charge) ? item.service_charge : {},
+          created_at: item.created_at,
+          updated_at: item.updated_at
+        };
+      });
+      console.log(values);
+      const modalData = {
+        order_info: values,
+        subtotal_info: {
+          subTotalList,
+          orderTotalList,
+          total
+        },
+        existPayment
+      };
+      if (dispatch) {
+        dispatch({
+          type: "setState",
+          payload: {
+            ...booking
+          }
+        });
+      }
+      setClient(booking.client);
+      setData(modalData);
+      setDataReady(true);
+      (_d = Toast == null ? void 0 : Toast.close) == null ? void 0 : _d.call(Toast);
+    };
+    getBookingDetail();
+  }, [engineProps.order_id]);
+  console.log(dataReady, "dataReady");
+  if (!dataReady) return null;
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_PaymentModal.default,
+    {
+      open: true,
+      editOrderId: engineProps.order_id,
+      data,
+      paymentResultDisplayMode: "toast",
+      shopDiscount: (_b = data == null ? void 0 : data.subtotal_info) == null ? void 0 : _b.shopDiscount,
+      client,
+      currentTotalPrice: (_c = data == null ? void 0 : data.total) == null ? void 0 : _c.productAmount,
+      config: engineProps == null ? void 0 : engineProps.config,
+      setEditCartMode: () => {
+        engineProps == null ? void 0 : engineProps.callback({ type: "close" });
+      },
+      onClose: (reset) => {
+        engineProps == null ? void 0 : engineProps.callback({ type: "close", reset });
+      },
+      callback: (result) => {
+        console.log(result);
+        debugger;
+        engineProps == null ? void 0 : engineProps.callback({ type: "callback", data: result });
+      }
+    }
+  );
+};
+var PaymentModalPlugin = (0, import_model.Provider)(PaymentModalContent);
+var plugin_default = PaymentModalPlugin;

package/lib/components/checkout/utils/PaymentResultToastUtils.d.ts

@@ -6,7 +6,6 @@ export interface PaymentResultToastConfig {
     getData: (key: string) => any;
     interaction: any;
     Toast: any;
-    state: any;
     onToastClose?: () => void;
 }
 export interface PaymentResultToastParams {

package/lib/components/checkout/utils/PaymentResultToastUtils.js

@@ -150,6 +150,7 @@ var displayPaymentResultToast = async (params, config) => {
   const { getData, onToastClose } = config;
   if (paymentStatus === "paid") {
     await (0, import_PaymentResultToast.showPaymentResultToastSuccess)({
+      mask: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       title: calculateTitle(paymentStatus),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -159,16 +160,18 @@ var displayPaymentResultToast = async (params, config) => {
       ),
       autoClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       autoCloseDelay: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoCloseDelay) || 3e3,
+      clickOutsideToClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       showCountdownProgress: true,
       actionButtons: actionButtons || [],
       onClose: onToastClose || (() => {
       }),
       // 提供默认空函数
-      closable: false
+      closable: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose)
       // 控制关闭按钮显示
     });
   } else if (paymentStatus === "partially_paid") {
     await (0, import_PaymentResultToast.showPaymentResultToastSuccess)({
+      mask: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       title: calculateTitle(paymentStatus),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -178,12 +181,16 @@ var displayPaymentResultToast = async (params, config) => {
       ),
       autoClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       actionButtons: actionButtons || [],
+      clickOutsideToClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
+      closable: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose),
+      // 控制关闭按钮显示
       onClose: onToastClose || (() => {
       })
       // 提供默认空函数
     });
   } else if (paymentStatus === "failed" || paymentStatus === "error") {
     await (0, import_PaymentResultToast.showPaymentResultToastFailed)({
+      mask: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       title: calculateTitle(paymentStatus, failureReason),
       subtitle: calculateSubtitle(
         paymentStatus,
@@ -193,6 +200,9 @@ var displayPaymentResultToast = async (params, config) => {
       ),
       autoClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
       actionButtons: actionButtons || [],
+      clickOutsideToClose: (autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose) || false,
+      closable: !(autoCloseConfig == null ? void 0 : autoCloseConfig.autoClose),
+      // 控制关闭按钮显示
       onClose: onToastClose || (() => {
       })
       // 提供默认空函数

package/lib/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接