@pisell/private-materials 6.5.27 → 6.5.29

package/lib/components/booking/model.js

@@ -57,6 +57,9 @@ var apis = {
   },
   getFormData: () => {
     return [];
+  },
+  getContactsInfo: () => {
+    return null;
   }
 };
 var walkInData = {

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/lib/components/checkout/PaymentModal.js

@@ -113,12 +113,18 @@ var PaymentContent = (0, import_react.forwardRef)(
     const [balanceDueAmount, setBalanceDueAmount] = (0, import_react.useState)("");
     const [balanceDueTotalAmount, setBalanceDueTotalAmount] = (0, import_react.useState)("");
     const [recommendAmounts, setRecommendAmounts] = (0, import_react.useState)([]);
+    const [showSplitPaymentKeyboard, setShowSplitPaymentKeyboard] = (0, import_react.useState)(false);
     const paymentMethodsRef = (0, import_react.useRef)(null);
     const [paymentMethods, setPaymentMethods] = (0, import_react.useState)([]);
     const [showCashPayment, setShowCashPayment] = (0, import_react.useState)(false);
     const [paymentOptionsTitle, setPaymentOptionsTitle] = (0, import_react.useState)(
       import_utils.locales.getText("cards.and.digitals") || "Cards & Digitals"
     );
+    const paymentOptionList = (0, import_react.useMemo)(() => {
+      return paymentMethods.filter(
+        (item) => !(item.type === "app" && item.code === "EFTPOS_LINKLY") && (["custom"].includes(item.type) || import_PaymentOptionsModule.SHOW_METHODS_CODE.includes(item.code))
+      );
+    }, [paymentMethods]);
     const clientChangedRef = (0, import_react.useRef)(false);
     const walletPassRef = (0, import_react.useRef)(null);
     const [paymentItems, setPaymentItems] = (0, import_react.useState)([]);
@@ -420,13 +426,11 @@ var PaymentContent = (0, import_react.forwardRef)(
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitStart,
-              executeIfActive(
-                () => {
-                  var _a2;
-                  setSyncingLock(true);
-                  (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
-                }
-              )
+              executeIfActive(() => {
+                var _a2;
+                setSyncingLock(true);
+                (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
+              })
             );
             const orderSubmitEndUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitEnd,
@@ -450,7 +454,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
               executeIfActive(async (data) => {
-                var _a2, _b2;
+                var _a2, _b2, _c2, _d, _e;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
                 const orderInfo2 = checkoutModule.getCurrentOrderInfo();
                 updateOrderInfo == null ? void 0 : updateOrderInfo(orderInfo2);
@@ -475,6 +479,12 @@ var PaymentContent = (0, import_react.forwardRef)(
                     totalAmount2 = totalAmount2.add(serviceChargeTotal);
                   }
                   console.log(totalAmount2, paymentItems2);
+                  const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+                  if (!isToastMode) {
+                    autoCloseConfig.autoClose = false;
+                    autoCloseConfig.autoCloseDelay = 0;
+                    autoCloseConfig.maskClosable = false;
+                  }
                   await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                     {
                       paymentStatus: "partially_paid",
@@ -503,7 +513,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                     title: "open_till",
                     metadata: {}
                   });
-                  (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+                  (_e = (_d = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d.postMessageToApp) == null ? void 0 : _e.call(_d, {
                     module: "till",
                     key: "open_till",
                     data: {
@@ -747,6 +757,9 @@ var PaymentContent = (0, import_react.forwardRef)(
         case "send-link":
           setPaymentLinkModalOpen(true);
           break;
+        case "split-payment":
+          setShowSplitPaymentKeyboard(true);
+          break;
         case "print-receipt":
           let data;
           const isSynced = await checkoutModule.isCurrentOrderSynced();
@@ -861,7 +874,11 @@ var PaymentContent = (0, import_react.forwardRef)(
       return res;
     };
     const handleModalClick = (0, import_react.useCallback)((event) => {
-      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+      var _a2, _b2, _c2;
+      const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+      if (isToastMode) {
+        (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+      }
     }, []);
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
@@ -933,7 +950,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           {
             style: showCashPayment ? {
               gridColumn: "1",
-              gridRow: "1"
+              gridRow: (paymentOptionList == null ? void 0 : paymentOptionList.length) === 1 ? "span 2" : "1"
             } : {}
           },
           /* @__PURE__ */ import_react.default.createElement(
@@ -949,17 +966,18 @@ var PaymentContent = (0, import_react.forwardRef)(
               customAmount,
               roundingFunction,
               balanceDueAmount,
-              balanceDueTotalAmount
+              balanceDueTotalAmount,
+              shortcutsSize: (paymentOptionList == null ? void 0 : paymentOptionList.length) === 3 || (paymentOptionList == null ? void 0 : paymentOptionList.length) === 1 ? "large" : "default"
             }
           )
         ),
-        moduleConfig.showPaymentOptions && /* @__PURE__ */ import_react.default.createElement(
+        moduleConfig.showPaymentOptions && (paymentOptionList == null ? void 0 : paymentOptionList.length) > 0 && /* @__PURE__ */ import_react.default.createElement(
           "div",
           {
             className: showCashPayment ? "" : "payment-options-module-container",
             style: showCashPayment ? {
               gridColumn: "2",
-              gridRow: "1 / 3"
+              gridRow: (paymentOptionList == null ? void 0 : paymentOptionList.length) > 3 ? "1 / 3" : "1"
             } : {}
           },
           /* @__PURE__ */ import_react.default.createElement(
@@ -981,8 +999,8 @@ var PaymentContent = (0, import_react.forwardRef)(
           {
             className: showCashPayment ? "" : "additional-module-container",
             style: showCashPayment ? {
-              gridColumn: "1",
-              gridRow: "2"
+              gridColumn: (paymentOptionList == null ? void 0 : paymentOptionList.length) > 3 ? "1" : (paymentOptionList == null ? void 0 : paymentOptionList.length) <= 1 ? "2" : "span 2",
+              gridRow: (paymentOptionList == null ? void 0 : paymentOptionList.length) === 0 ? "1" : "2"
             } : {}
           },
           /* @__PURE__ */ import_react.default.createElement(
@@ -993,7 +1011,9 @@ var PaymentContent = (0, import_react.forwardRef)(
               handleButtonClick,
               hasOrderNote: !!orderNote && orderNote.trim().length > 0,
               disabled: isOrderFree,
-              showCashPayment
+              showCashPayment,
+              isFullWidth: !((paymentOptionList == null ? void 0 : paymentOptionList.length) > 3 || (paymentOptionList == null ? void 0 : paymentOptionList.length) <= 1),
+              showMore: !(showCashPayment && (paymentOptionList == null ? void 0 : paymentOptionList.length) === 0)
             }
           )
         )
@@ -1025,6 +1045,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             open: showPriceAdjustModal,
             onCancel: () => setShowPriceAdjustModal(false)
           },
+          tips: import_utils.locales.getText("pisell2.checkout.modal.price-adjustment-tips") || "Changing amount will update order total",
           selectType: "dark",
           originalValue: currentTotalPrice,
           defaultValue: currentTotalPriceAfterDiscount,
@@ -1042,6 +1063,39 @@ var PaymentContent = (0, import_react.forwardRef)(
           walletPassData,
           onSavePayLater: handleSavePayLater
         }
+      ),
+      /* @__PURE__ */ import_react.default.createElement(
+        import_priceKeyboard.PaymentKeyboard,
+        {
+          containerProps: {
+            renderType: "modal",
+            open: showSplitPaymentKeyboard,
+            onCancel: () => setShowSplitPaymentKeyboard(false)
+          },
+          paymentOriginalValue: balanceDueAmount,
+          paymentDefaultValue: String(customAmount || 0),
+          enableExceedMaxAmount: false,
+          payment: {
+            enable: true
+          },
+          surcharge: {
+            enable: false
+          },
+          surchargeDefaultValue: {
+            percent: "0",
+            fixed: "0"
+          },
+          selectType: "light",
+          onChange: (value) => {
+            console.log(value);
+          },
+          doneText: import_utils.locales.getText("confirm") || "确认",
+          onPay: (args) => {
+            console.log(args);
+            setShowSplitPaymentKeyboard(false);
+            handleAmountChange(String(args.amount));
+          }
+        }
       )
     );
   }
@@ -1068,6 +1122,7 @@ var PaymentModal = ({
   const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
   const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
+  const [showCreateErrorModal, setShowCreateErrorModal] = (0, import_react.useState)(false);
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
@@ -1474,7 +1529,7 @@ var PaymentModal = ({
           unsubscribeRef.current = checkout.core.effects.on(
             "checkout:onOrderSynced",
             executeIfActive(async (data2) => {
-              var _a3, _b3, _c3, _d3, _e2;
+              var _a3, _b3, _c3, _d3, _e2, _f2, _g2, _h2;
               const currentOrderId = checkout.getCurrentOrderId();
               setCurrentEditOrderId(currentOrderId);
               const responseData = (_a3 = data2.response) == null ? void 0 : _a3.data;
@@ -1553,6 +1608,12 @@ var PaymentModal = ({
                   }));
                 }
                 const orderInfo3 = checkout.getCurrentOrderInfo();
+                const isToastMode = ((_h2 = (_g2 = (_f2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f2.config) == null ? void 0 : _g2.payment_setting) == null ? void 0 : _h2.payment_result_display_mode) !== "modal";
+                if (!isToastMode) {
+                  autoCloseConfig.autoClose = false;
+                  autoCloseConfig.autoCloseDelay = 0;
+                  autoCloseConfig.maskClosable = false;
+                }
                 await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                   {
                     paymentStatus,
@@ -1627,6 +1688,7 @@ var PaymentModal = ({
             error
           }
         });
+        setShowCreateErrorModal(true);
       }
     };
     if (data) {
@@ -2059,6 +2121,34 @@ var PaymentModal = ({
       },
       import_utils.locales.getText("retry") || "重试"
     ))
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellContainer,
+    {
+      renderType: "modal",
+      props: {
+        open: showCreateErrorModal,
+        title: import_utils.locales.getText("pisell2.checkout.tips"),
+        footer: null,
+        keyboard: false,
+        onCancel: () => {
+          setShowCreateErrorModal(false);
+        }
+        // 禁用关闭
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "center", padding: "20px" } }, /* @__PURE__ */ import_react.default.createElement("div", { style: { marginBottom: "16px", fontSize: "16px" } }, import_utils.locales.getText("pisell2.checkout.order-create-failed")), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        type: "primary",
+        size: "large",
+        onClick: () => {
+          setShowCreateErrorModal(false);
+          window.location.reload();
+        },
+        style: { width: "100%", marginTop: "80px" }
+      },
+      import_utils.locales.getText("confirm") || "确认"
+    ))
   ));
 };
 var PaymentModal_default = PaymentModal;

package/lib/components/checkout/components/AdditionalModule/index.d.ts

@@ -8,6 +8,8 @@ interface AdditionalModuleProps {
     hasOrderNote?: boolean;
     disabled?: boolean;
     showCashPayment?: boolean;
+    isFullWidth?: boolean;
+    showMore?: boolean;
 }
-declare function AdditionalModule({ orderInfo, customAmount, handleButtonClick, hasOrderNote, disabled, showCashPayment, }: AdditionalModuleProps): JSX.Element;
+declare function AdditionalModule({ orderInfo, customAmount, handleButtonClick, hasOrderNote, disabled, showCashPayment, isFullWidth, showMore }: AdditionalModuleProps): JSX.Element;
 export default AdditionalModule;

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

@@ -47,7 +47,9 @@ function AdditionalModule({
   handleButtonClick,
   hasOrderNote = false,
   disabled = false,
-  showCashPayment = false
+  showCashPayment = false,
+  isFullWidth = false,
+  showMore = true
 }) {
   import_utils.locales.init(import_locales2.default, (0, import_locales.getLocale)());
   const moreMenuItems = [
@@ -55,11 +57,16 @@ function AdditionalModule({
       key: "send-link",
       label: import_utils.locales.getText("pisell2.text.send-link"),
       icon: /* @__PURE__ */ import_react.default.createElement(import_icons.LinkOutlined, null)
+    },
+    {
+      key: "print-receipt",
+      label: import_utils.locales.getText("pisell2.text.print-receipt"),
+      icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-printer" })
     }
   ];
   const Toast = (0, import_useToast.default)();
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module" }, showCashPayment && /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-title" }, import_utils.locales.getText("pisell2.text.others")), /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-buttons-container" }, showCashPayment ? (
-    // Grid布局模式：两行布局（显示现金支付模块时）
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module" }, showCashPayment && /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-title" }, import_utils.locales.getText("pisell2.text.others")), /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-buttons-container" }, showCashPayment && !isFullWidth ? (
+    // Grid布局模式：两行布局（显示现金支付模块且非全宽时）
     /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-button-row" }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
       {
@@ -83,18 +90,18 @@ function AdditionalModule({
       {
         className: "additional-module-button-base purple-theme",
         onClick: () => {
-          handleButtonClick("print-receipt");
+          handleButtonClick("split-payment");
         },
         icon: /* @__PURE__ */ import_react.default.createElement(
           import_materials.Icon,
           {
-            type: "pisell2-printer",
+            type: "pisell2-coins-01",
             className: "additional-module-button-icon"
           }
         ),
         size: "large"
       },
-      import_utils.locales.getText("pisell2.text.print-receipt")
+      import_utils.locales.getText("split.payment")
     )), /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-button-row" }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
       {
@@ -126,7 +133,7 @@ function AdditionalModule({
         icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ClockCircleOutlined, { className: "additional-module-button-icon" })
       },
       import_utils.locales.getText("pisell2.text.save-pay-later")
-    ), /* @__PURE__ */ import_react.default.createElement(
+    ), showMore && /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,
       {
         menu: {
@@ -143,6 +150,8 @@ function AdditionalModule({
                   )
                 );
               }
+            } else if (key === "split-payment") {
+              handleButtonClick("split-payment");
             }
           }
         },
@@ -163,9 +172,33 @@ function AdditionalModule({
           icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-dots-vertical", size: 20 })
         }
       )
+    )), !showMore && /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-button-row" }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        className: "additional-module-button-base purple-theme",
+        onClick: () => {
+          handleButtonClick("send-link");
+        },
+        disabled,
+        size: "large",
+        icon: /* @__PURE__ */ import_react.default.createElement(import_icons.LinkOutlined, null)
+      },
+      import_utils.locales.getText("pisell2.text.send-link")
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        className: "additional-module-button-base purple-theme",
+        onClick: () => {
+          handleButtonClick("print-receipt");
+        },
+        disabled,
+        size: "large",
+        icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-printer" })
+      },
+      import_utils.locales.getText("pisell2.text.print-receipt")
     )))
   ) : (
-    // Flex布局模式：一行布局（不显示现金支付模块时）
+    // Flex布局模式：一行布局（不显示现金支付模块或强制全宽时）
     /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-button-row" }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
       {
@@ -189,18 +222,18 @@ function AdditionalModule({
       {
         className: "additional-module-button-base purple-theme",
         onClick: () => {
-          handleButtonClick("print-receipt");
+          handleButtonClick("split-payment");
         },
         size: "large",
         icon: /* @__PURE__ */ import_react.default.createElement(
           import_materials.Icon,
           {
-            type: "pisell2-printer",
+            type: "pisell2-coins-01",
             className: "additional-module-button-icon"
           }
         )
       },
-      import_utils.locales.getText("pisell2.text.print-receipt")
+      import_utils.locales.getText("split.payment")
     ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
       {

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

@@ -42,7 +42,6 @@ var import_decimal = __toESM(require("decimal.js"));
 var import_locales = __toESM(require("../../locales"));
 var import_PaymentDetailModal = __toESM(require("../PaymentDetailModal"));
 var import_pisellSimplePriceKeyboardPopover = __toESM(require("../../../../pro/pisellSimplePriceKeyboardPopover"));
-var import_priceKeyboard = require("../../../../pro/priceKeyboard");
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
@@ -365,12 +364,12 @@ function AmountSummary({
     let balanceAmountValue = parseFormattedAmount(getBalanceDueAmount());
     let balanceDecimal = new import_decimal.default(balanceAmountValue);
     const syncedVoucherAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
-      if (item.isSynced && (paymentType === "regular" && item.order_payment_type !== "deposit" || paymentType === "deposit" && item.order_payment_type === "deposit")) {
+      if ((item.isSynced || item.voucher_id) && (paymentType === "regular" && item.order_payment_type !== "deposit" || paymentType === "deposit" && item.order_payment_type === "deposit")) {
         return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
       }
       return acc;
     }, new import_decimal.default(0)).toNumber();
-    balanceDecimal = balanceDecimal.minus(syncedVoucherAmount);
+    balanceDecimal = new import_decimal.default(Math.abs(balanceDecimal.minus(new import_decimal.default(syncedVoucherAmount)).toNumber()));
     const finalBalanceAmount = (0, import_utils.formatAmountWithOptions)(
       balanceDecimal.toNumber(),
       amountSymbol,
@@ -467,8 +466,9 @@ function AmountSummary({
     return balanceDueAmount !== customAmount && Number(balanceDueAmount) > 0 && Number(customAmount) > 0;
   }, [customAmount, balanceDueAmount]);
   const handleChangeDepositAmount = (value) => {
-    console.log("handleChangeDepositAmount", value);
-    checkoutModule == null ? void 0 : checkoutModule.setDepositAmountAsync(value);
+    const valueStr = String(value);
+    console.log("handleChangeDepositAmount", valueStr);
+    checkoutModule == null ? void 0 : checkoutModule.setDepositAmountAsync(valueStr);
   };
   const hasDepositPayment = (0, import_react.useMemo)(() => {
     return paymentItems == null ? void 0 : paymentItems.some((item) => item.order_payment_type === "deposit" && item.status !== "voided");
@@ -594,47 +594,6 @@ function AmountSummary({
         ))
       )
     ),
-    !shouldShowConfirmMode() && (showCancelSplitPayment ? /* @__PURE__ */ import_react2.default.createElement(import_antd.Button, { className: (0, import_classnames.default)("cancel-split-payment-button"), onClick: () => onAmountChange == null ? void 0 : onAmountChange(balanceDueAmount) }, getText("split.cancel") || "取消部\n分支付") : /* @__PURE__ */ import_react2.default.createElement(
-      import_antd.Popover,
-      {
-        content: /* @__PURE__ */ import_react2.default.createElement("div", { onClick: (e) => e.stopPropagation() }, /* @__PURE__ */ import_react2.default.createElement(
-          import_priceKeyboard.PaymentKeyboard,
-          {
-            paymentOriginalValue: balanceDueAmount,
-            paymentDefaultValue: String(customAmount || 0),
-            enableExceedMaxAmount: false,
-            payment: {
-              enable: true
-            },
-            surcharge: {
-              enable: false
-            },
-            surchargeDefaultValue: {
-              percent: "0",
-              fixed: "0"
-            },
-            selectType: "light",
-            onChange: (value) => {
-              console.log(value);
-            },
-            doneText: getText("confirm"),
-            onPay: (args) => {
-              console.log(args);
-              setIsKeyboardVisible(false);
-              handleKeyboardConfirm(args.amount);
-            }
-          }
-        )),
-        trigger: "click",
-        open: isKeyboardVisible,
-        onOpenChange: setIsKeyboardVisible,
-        placement: "bottom",
-        overlayClassName: "payment-keyboard-popover",
-        arrow: true,
-        destroyTooltipOnHide: true
-      },
-      /* @__PURE__ */ import_react2.default.createElement(import_antd.Button, { className: (0, import_classnames.default)("split-payment-button") }, getText("split.payment") || "拆分支付")
-    )),
     /* @__PURE__ */ import_react2.default.createElement(
       import_materials.PisellModal,
       {

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

@@ -226,7 +226,7 @@
     border-radius: 16px;
     padding: 0 16px 0 16px;
     color: #1a1a1a;
-    width: 350px;
+    width: 400px;
     min-width: 200px;
     height: 80px;
     display: flex;

package/lib/components/checkout/components/CashPaymentModule/index.d.ts

@@ -15,10 +15,12 @@ export interface CashPaymentModuleProps {
     balanceDueAmount?: string;
     balanceDueTotalAmount?: string;
     syncingLock?: boolean;
+    shortcutsSize?: 'default' | 'large';
 }
 export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表，默认5个推荐金额
 disabled, // 禁用状态
 roundingFunction, balanceDueAmount, // 当前阶段剩余支付金额（定金或普通支付）
 balanceDueTotalAmount, // 完整订单剩余待付金额
-syncingLock, }: CashPaymentModuleProps): JSX.Element;
+syncingLock, // 是否锁定
+shortcutsSize, }: CashPaymentModuleProps): JSX.Element;
 export default CashPaymentModule;

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

@@ -55,8 +55,10 @@ function CashPaymentModule({
   // 当前阶段剩余支付金额（定金或普通支付）
   balanceDueTotalAmount = "0",
   // 完整订单剩余待付金额
-  syncingLock = false
+  syncingLock = false,
   // 是否锁定
+  shortcutsSize = "default"
+  // 预设大小
 }) {
   const [amount, setAmount] = (0, import_react.useState)(customAmount || "");
   const [roundingAmount, setRoundingAmount] = (0, import_react.useState)(0);
@@ -231,7 +233,8 @@ function CashPaymentModule({
         };
       }),
       onReset: handleReset,
-      onEnter: syncingLock ? void 0 : handleCashPay
+      onEnter: syncingLock ? void 0 : handleCashPay,
+      shortcutsSize
     }
   );
 }

package/lib/components/checkout/components/PaymentOptionsModule/PaymentMethodItem.d.ts

@@ -24,6 +24,8 @@ export interface PaymentMethodItemProps {
     onClick?: (method: ExtendedPaymentMethod) => void;
     /** 获取文本的函数 */
     getText?: (key: string, fallback?: string) => string;
+    /** 大小 */
+    size?: 'default' | 'large';
 }
 declare const PaymentMethodItem: React.FC<PaymentMethodItemProps>;
 export default PaymentMethodItem;

package/lib/components/checkout/components/PaymentOptionsModule/PaymentMethodItem.js

@@ -45,7 +45,8 @@ var PaymentMethodItem = ({
   customAmount,
   disabled = false,
   onClick,
-  getText
+  getText,
+  size = "default"
 }) => {
   const [isKeyboardVisible, setIsKeyboardVisible] = (0, import_react.useState)(false);
   const calculateSurcharge = (method2) => {
@@ -100,6 +101,9 @@ var PaymentMethodItem = ({
           "payment-options-module-disabled": disabled
         }
       ),
+      style: {
+        height: size === "large" ? "82px" : "62px"
+      },
       onClick: showKeyboard,
       type: "button",
       disabled

package/lib/components/checkout/components/PaymentOptionsModule/index.d.ts

@@ -11,5 +11,6 @@ interface ExtendedPaymentOptionsModuleProps extends PaymentOptionsModuleProps {
     disabled?: boolean;
     showCashPayment?: boolean;
 }
+export declare const SHOW_METHODS_CODE: string[];
 declare function PaymentOptionsModule({ amountSymbol, orderInfo, onClick, paymentMethods, customAmount, title, disabled, showCashPayment, }: ExtendedPaymentOptionsModuleProps): JSX.Element;
 export default PaymentOptionsModule;

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

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/checkout/components/PaymentOptionsModule/index.tsx
 var PaymentOptionsModule_exports = {};
 __export(PaymentOptionsModule_exports, {
+  SHOW_METHODS_CODE: () => SHOW_METHODS_CODE,
   default: () => PaymentOptionsModule_default
 });
 module.exports = __toCommonJS(PaymentOptionsModule_exports);
@@ -125,6 +126,7 @@ function PaymentOptionsModule({
       filteredPaymentMethods.map((method) => /* @__PURE__ */ import_react.default.createElement(
         import_PaymentMethodItem.default,
         {
+          size: (filteredPaymentMethods == null ? void 0 : filteredPaymentMethods.length) === 2 ? "large" : "default",
           key: method.id,
           method,
           amountSymbol,
@@ -138,3 +140,7 @@ function PaymentOptionsModule({
   );
 }
 var PaymentOptionsModule_default = PaymentOptionsModule;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SHOW_METHODS_CODE
+});

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

@@ -234,6 +234,10 @@
 }
 
 .payment-options-module-pay-button{
+  width: 118px;
+  height: 40px;
+  font-weight: 600;
+  font-size: 18px;
   background: var(--theme-color, #7F56DA);
   &:disabled {
     background: #D0D5DD;

package/lib/components/checkout/components/PaymentResultToast/PaymentResultToastProvider.d.ts

@@ -23,6 +23,10 @@ interface ShowPaymentResultToastConfig {
     onClose?: () => void;
     /** 是否显示右上角关闭按钮 */
     closable?: boolean;
+    /** 是否启用点击外部区域关闭弹窗（使用纯JS实现） */
+    clickOutsideToClose?: boolean;
+    /** 是否显示遮罩 */
+    mask?: boolean;
 }
 interface PaymentResultToastContextType {
     /** 显示成功弹窗 */