@pisell/private-materials 6.5.4 → 6.5.6

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

@@ -0,0 +1,163 @@
+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/components/PaymentOptionsModule/PaymentMethodItem.tsx
+var PaymentMethodItem_exports = {};
+__export(PaymentMethodItem_exports, {
+  default: () => PaymentMethodItem_default
+});
+module.exports = __toCommonJS(PaymentMethodItem_exports);
+var import_react = __toESM(require("react"));
+var import_classnames = __toESM(require("classnames"));
+var import_utils = require("@pisell/utils");
+var import_materials = require("@pisell/materials");
+var import_antd = require("antd");
+var import_priceKeyboard = require("../../../../pro/priceKeyboard");
+var import_index = require("./index.less");
+var PaymentMethodItem = ({
+  method,
+  amountSymbol,
+  customAmount,
+  disabled = false,
+  onClick,
+  getText
+}) => {
+  const [isKeyboardVisible, setIsKeyboardVisible] = (0, import_react.useState)(false);
+  const calculateSurcharge = (method2) => {
+    if (!(method2 == null ? void 0 : method2.is_surcharge)) return 0;
+    const baseAmount = Number(customAmount) || 0;
+    if (Number(method2.percentage)) {
+      return baseAmount * Number(method2.percentage) + Number(method2.fixed || 0);
+    }
+    return Number(method2.fixed || 0);
+  };
+  const calculateTotalAmount = (method2) => {
+    const baseAmount = Number(customAmount) || 0;
+    const surcharge = calculateSurcharge(method2);
+    return baseAmount + surcharge;
+  };
+  const handleRightButtonClick = (e) => {
+    if (!isEftpos) return;
+    e.preventDefault();
+    if (disabled || !onClick) {
+      return;
+    }
+    onClick({
+      ...method,
+      surcharge: String((0, import_utils.formatAmount)(calculateSurcharge(method), 2, amountSymbol))
+    });
+  };
+  const renderPaymentIcon = (method2) => {
+    if (method2.code === "EFTPOS") {
+      return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container"), style: { background: "#FE8279" } }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-credit", style: { fontSize: "26px", color: "#ffffff" } }));
+    }
+    switch (String(method2.type)) {
+      case "credit-card":
+      case "eftpos":
+        return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container"), style: { background: "#FE8279" } }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-credit", style: { fontSize: "26px", color: "#ffffff" } }));
+      default:
+        return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container"), style: { background: "#D277E4" } }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-custom", style: { fontSize: "26px", color: "#ffffff" } }));
+    }
+  };
+  const isEftpos = method.code === "EFTPOS" || method.type === "eftpos";
+  const showKeyboard = () => {
+    if (isEftpos) return;
+    setIsKeyboardVisible(true);
+  };
+  const renderLeftContent = () => /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-method-left") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container") }, renderPaymentIcon(method)), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info-inner") }, /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-name") }, method.name), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-payment-info-inner-surcharge") }, !!(method == null ? void 0 : method.is_surcharge) && calculateSurcharge(method) !== 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-surcharge-text") }, (getText == null ? void 0 : getText("pisell2.payment-options.surcharge-label", "Surcharge")) || "Surcharge", ":", (0, import_utils.formatAmount)(calculateSurcharge(method), 2, amountSymbol)), false))));
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+    "button",
+    {
+      className: (0, import_classnames.default)(
+        "payment-options-module-payment-method-item",
+        {
+          "payment-options-module-pointer": !disabled,
+          "payment-options-module-disabled": disabled
+        }
+      ),
+      onClick: showKeyboard,
+      type: "button",
+      disabled
+    },
+    renderLeftContent(),
+    /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      { className: (0, import_classnames.default)("payment-options-module-payment-method-right"), onClick: handleRightButtonClick },
+      // 右侧按钮，如果是eftpos，则显示Pay按钮
+      isEftpos ? /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "primary", className: (0, import_classnames.default)("payment-options-module-pay-button"), disabled }, getText == null ? void 0 : getText("pay", "Pay")) : /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: (0, import_classnames.default)(
+            "payment-options-module-selection-button"
+          )
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-a-arrow-circle-right2", style: { fontSize: "30px", color: disabled ? "#D0D5DD" : "#7F56DA" } })
+      )
+    )
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_priceKeyboard.PaymentKeyboard,
+    {
+      containerProps: {
+        renderType: "modal",
+        open: isKeyboardVisible,
+        onCancel: () => setIsKeyboardVisible(false)
+      },
+      paymentOriginalValue: String(customAmount || 0),
+      paymentDefaultValue: String(customAmount || 0),
+      enableExceedMaxAmount: !isEftpos,
+      payment: {
+        enable: true
+      },
+      surcharge: {
+        enable: !!(method == null ? void 0 : method.is_surcharge) && calculateSurcharge(method) !== 0
+      },
+      surchargeDefaultValue: {
+        percent: method.percentage ? String(Number(method.percentage) * 100) : "",
+        fixed: method.fixed ? String(method.fixed) : ""
+      },
+      selectType: "dark",
+      onChange: (value) => {
+        console.log(value);
+      },
+      onPay: (args) => {
+        var _a, _b;
+        console.log(args);
+        setIsKeyboardVisible(false);
+        if (onClick) {
+          onClick({
+            ...method,
+            fixed: Number(((_a = args.surcharge) == null ? void 0 : _a.fixed) || 0),
+            percentage: ((_b = args.surcharge) == null ? void 0 : _b.percent) ? Number(args.surcharge.percent) / 100 : 0,
+            totalAmount: String((0, import_utils.formatAmount)(args.amount, 2))
+          });
+        }
+      }
+    }
+  ));
+};
+var PaymentMethodItem_default = PaymentMethodItem;

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

@@ -1,9 +1,7 @@
 /// <reference types="react" />
-import { PaymentOptionsModuleProps, PaymentMethod } from '../../types';
+import { ExtendedPaymentMethod } from './PaymentMethodItem';
+import { PaymentOptionsModuleProps } from '../../types';
 import './index.less';
-interface ExtendedPaymentMethod extends PaymentMethod {
-    is_surcharge?: boolean;
-}
 interface ExtendedPaymentOptionsModuleProps extends PaymentOptionsModuleProps {
     amountSymbol?: string;
     paymentMethods?: ExtendedPaymentMethod[];

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

@@ -33,11 +33,11 @@ __export(PaymentOptionsModule_exports, {
 });
 module.exports = __toCommonJS(PaymentOptionsModule_exports);
 var import_ScrollableList = __toESM(require("../ScrollableList/index"));
+var import_PaymentMethodItem = __toESM(require("./PaymentMethodItem"));
 var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
-var import_materials = require("@pisell/materials");
 var import_ahooks = require("ahooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_locales = __toESM(require("../../locales"));
@@ -77,29 +77,13 @@ function PaymentOptionsModule({
   const filteredPaymentMethods = paymentMethods.filter(
     (item) => !(item.type === "app" && item.code === "EFTPOS_LINKLY") && (["custom"].includes(item.type) || SHOW_METHODS_CODE.includes(item.code))
   );
-  const calculateSurcharge = (method) => {
-    if (!(method == null ? void 0 : method.is_surcharge)) return 0;
-    const baseAmount = Number(customAmount) || 0;
-    if (Number(method.percentage)) {
-      return baseAmount * Number(method.percentage) + Number(method.fixed || 0);
-    }
-    return Number(method.fixed || 0);
-  };
-  const calculateTotalAmount = (method) => {
-    const baseAmount = Number(customAmount) || 0;
-    const surcharge = calculateSurcharge(method);
-    return baseAmount + surcharge;
-  };
   const { run: handlePaymentClick } = (0, import_ahooks.useDebounceFn)(
     (method) => {
       if (disabled) {
         return;
       }
       if (typeof onClick === "function") {
-        onClick({
-          ...method,
-          surcharge: String((0, import_utils.formatAmount)(calculateSurcharge(method), 2, amountSymbol))
-        });
+        onClick(method);
       }
     },
     {
@@ -107,18 +91,6 @@ function PaymentOptionsModule({
       // 500ms 防抖延迟
     }
   );
-  const renderPaymentIcon = (method) => {
-    if (method.code === "EFTPOS") {
-      return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container"), style: { background: "#FE8279" } }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-credit", style: { fontSize: "26px", color: "#ffffff" } }));
-    }
-    switch (String(method.type)) {
-      case "credit-card":
-      case "eftpos":
-        return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container"), style: { background: "#FE8279" } }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-credit", style: { fontSize: "26px", color: "#ffffff" } }));
-      default:
-        return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container"), style: { background: "#D277E4" } }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-custom", style: { fontSize: "26px", color: "#ffffff" } }));
-    }
-  };
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -131,7 +103,7 @@ function PaymentOptionsModule({
       import_ScrollableList.default,
       {
         height: "100%",
-        maxHeight: 330,
+        maxHeight: 314,
         gradientColor: "rgba(139, 92, 246, 0.1)",
         gradientHeight: 50,
         columnCount: showCashPayment ? 1 : 2,
@@ -149,100 +121,16 @@ function PaymentOptionsModule({
         }
       },
       filteredPaymentMethods.map((method) => /* @__PURE__ */ import_react.default.createElement(
-        "button",
+        import_PaymentMethodItem.default,
         {
           key: method.id,
-          onClick: (e) => {
-            e.preventDefault();
-            handlePaymentClick(method);
-          },
-          className: (0, import_classnames.default)(
-            "payment-options-module-payment-method-item",
-            {
-              "payment-options-module-pointer": !disabled,
-              "payment-options-module-disabled": disabled
-            }
-          ),
-          type: "button",
-          disabled
-        },
-        /* @__PURE__ */ import_react.default.createElement(
-          "div",
-          {
-            className: (0, import_classnames.default)(
-              "payment-options-module-payment-method-left"
-            )
-          },
-          /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("payment-options-module-icon-container") }, renderPaymentIcon(method)),
-          /* @__PURE__ */ import_react.default.createElement(
-            "div",
-            {
-              className: (0, import_classnames.default)("payment-options-module-payment-info")
-            },
-            /* @__PURE__ */ import_react.default.createElement(
-              "div",
-              {
-                className: (0, import_classnames.default)(
-                  "payment-options-module-payment-info-inner"
-                )
-              },
-              /* @__PURE__ */ import_react.default.createElement(
-                "div",
-                {
-                  className: (0, import_classnames.default)(
-                    "payment-options-module-payment-name"
-                  )
-                },
-                method.name
-              ),
-              !!(method == null ? void 0 : method.is_surcharge) && calculateSurcharge(method) !== 0 && /* @__PURE__ */ import_react.default.createElement(
-                "div",
-                {
-                  className: (0, import_classnames.default)(
-                    "payment-options-module-surcharge-text"
-                  )
-                },
-                getText("pisell2.payment-options.surcharge-label", "Surcharge"),
-                ":",
-                (0, import_utils.formatAmount)(
-                  calculateSurcharge(method),
-                  2,
-                  amountSymbol
-                )
-              )
-            )
-          )
-        ),
-        /* @__PURE__ */ import_react.default.createElement(
-          "div",
-          {
-            className: (0, import_classnames.default)(
-              "payment-options-module-payment-method-right"
-            )
-          },
-          method.code !== "EFTPOS" && method.type !== "eftpos" && /* @__PURE__ */ import_react.default.createElement(
-            "div",
-            {
-              className: (0, import_classnames.default)(
-                "payment-options-module-amount",
-                "payment-options-module-theme-color"
-              )
-            },
-            (0, import_utils.formatAmount)(calculateTotalAmount(method), 2, amountSymbol)
-          ),
-          /* @__PURE__ */ import_react.default.createElement(
-            "div",
-            {
-              className: (0, import_classnames.default)(
-                "payment-options-module-selection-button",
-                {
-                  "payment-options-module-selection-button-disabled": disabled
-                }
-              )
-            },
-            /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-a-arrow-circle-right2", style: { fontSize: "30px", color: "#7F56DA" } })
-          )
-        )
+          method,
+          amountSymbol,
+          customAmount,
+          disabled,
+          onClick: handlePaymentClick,
+          getText
+        }
       ))
     ))
   );

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

@@ -44,6 +44,7 @@
   align-items: center;
   display: flex;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+  gap: 12px;
 }
 
 
@@ -94,6 +95,14 @@
   align-items: center;
   gap: 8px;
   display: flex;
+  flex: 1;
+  background: none;
+  border: none;
+  cursor: pointer;
+  padding: 0;
+  margin: 0;
+  outline: none;
+  box-shadow: none;
 }
 
 
@@ -224,6 +233,20 @@
   cursor: pointer;
 }
 
+.payment-options-module-pay-button{
+  background: var(--theme-color, #7F56DA);
+  &:disabled {
+    background: #D0D5DD;
+    color: #fff;
+  }
+}
+
+.payment-options-module-payment-info-inner-surcharge{
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
 /* Disabled state styles */
 .payment-options-module-disabled {
   cursor: unset !important;

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

@@ -92,10 +92,13 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
     mask = false,
     maskClosable = false,
     closable = true,
-    zIndex
+    zIndex,
+    clickOutsideToClose = true
   } = props;
   const [isAnimating, setIsAnimating] = (0, import_react.useState)(false);
   const countdownTimeoutRef = (0, import_react.useRef)(null);
+  const modalContentRef = (0, import_react.useRef)(null);
+  const modalRef = (0, import_react.useRef)(null);
   const onCloseRef = (0, import_react.useRef)(onClose);
   const onCountdownCompleteRef = (0, import_react.useRef)(onCountdownComplete);
   onCloseRef.current = onClose;
@@ -133,6 +136,27 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
   (0, import_react.useEffect)(() => {
     return clearCountdown;
   }, [clearCountdown]);
+  (0, import_react.useEffect)(() => {
+    if (!clickOutsideToClose || !visible) {
+      return;
+    }
+    const handleClickOutside = (event) => {
+      var _a;
+      const target = event.target;
+      const modalContent = modalContentRef.current;
+      if (!modalContent) {
+        return;
+      }
+      if (!modalContent.contains(target)) {
+        clearCountdown();
+        (_a = onCloseRef.current) == null ? void 0 : _a.call(onCloseRef);
+      }
+    };
+    document.addEventListener("mousedown", handleClickOutside);
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+    };
+  }, [clickOutsideToClose, visible, clearCountdown]);
   const handleClose = (0, import_react.useCallback)(() => {
     var _a;
     clearCountdown();
@@ -228,6 +252,7 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
     /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
+        ref: modalContentRef,
         className: getClassName("content", statusClassName),
         style: {
           position: "relative",

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

@@ -54,4 +54,6 @@ export interface PaymentResultToastConfig {
     closable?: boolean;
     /** 弹窗层级 */
     zIndex?: number;
+    /** 是否启用点击外部区域关闭弹窗（使用纯JS实现） */
+    clickOutsideToClose?: boolean;
 }

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

@@ -93,7 +93,7 @@ var SavePayLaterHandler = (0, import_react.forwardRef)(({
       mask: true,
       maskClosable: false,
       centered: true,
-      width: 500,
+      width: 530,
       title: getText("pisell2.checkout.wallet-balance-confirm.title"),
       footer: null,
       className: "wallet-balance-confirm-modal",

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, _e;
+      var _a, _b, _c, _d;
       if (!!keyword) {
         setLoading(true);
         try {
@@ -61,18 +61,9 @@ 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) {
-              (_c = Toast == null ? void 0 : Toast.info) == null ? void 0 : _c.call(
+              (_b = Toast == null ? void 0 : Toast.info) == null ? void 0 : _b.call(
                 Toast,
                 import_utils.locales.getText("pisell2.checkout.wallet-pass-module.no-result")
               );
@@ -82,7 +73,7 @@ var SearchAndClientModule = (props) => {
               ...customer,
               latest_wallet_detail: rest
             };
-            (_e = (_d = clientCardRef.current) == null ? void 0 : _d.handleSetClient) == null ? void 0 : _e.call(_d, _customer, {
+            (_d = (_c = clientCardRef.current) == null ? void 0 : _c.handleSetClient) == null ? void 0 : _d.call(_c, _customer, {
               sameClientTip: import_utils.locales.getText(
                 "pisell2.checkout.client-card.tip.same-client"
               )
@@ -139,23 +130,6 @@ 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/components/WalletPassModule/index.js

@@ -122,11 +122,12 @@ var WalletPassModule = (0, import_react.forwardRef)(
       return selectedWalletIds.length + selectedDiscountList.length;
     }, [selectedWalletIds.length, selectedDiscountList.length]);
     const discountDisabled = (0, import_react.useMemo)(() => {
+      if (Number(orderInfo == null ? void 0 : orderInfo.totalAmount) === 0) return true;
       return !!(paymentItems == null ? void 0 : paymentItems.some((item) => {
-        return !import_constants.WALLET_PASS_CODE_ARRAY.includes(item.code);
+        return !import_constants.WALLET_PASS_CODE_ARRAY.includes(item.code) && !item.isSynced;
       }));
-    }, [paymentItems]);
-    if (cardData.length === 0 && availableDiscountList.length === 0) {
+    }, [paymentItems, orderInfo]);
+    if (cardData.length === 0 && availableDiscountList.length === 0 && disabledWalletData.length === 0) {
       return null;
     }
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-pass-module-container" }, /* @__PURE__ */ import_react.default.createElement(

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

@@ -89,14 +89,14 @@ var formatDiscountWalletData = (data, selectId = []) => {
     var _a, _b, _c;
     let name = "";
     let storeName = "";
-    if (item.tag === "product_discount_card") {
+    if (item.tag === "product_discount_card" || item.tag === "discount_card") {
       if (((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount") {
         const amountValue = (item == null ? void 0 : item.savedAmount) ? item == null ? void 0 : item.savedAmount : item.par_value;
         name = /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.checkout.discount.fixed_amount"), " ", /* @__PURE__ */ import_react.default.createElement(Amount, { value: amountValue, showCurrencySymbol: true }));
       } else {
-        name = import_utils.locales.getText("pisell2.checkout.discount.percentage.off")(item.par_value);
+        name = import_utils.locales.getText("pisell2.checkout.discount.percentage.off")(item.par_value || item.discount.percent);
       }
-      storeName = item.product_name;
+      storeName = item.product_name || item.format_title.auto;
     } else if (item.tag === "good_pass") {
       name = item.product_name;
       const left = Number(item.balance) || 0;
@@ -105,6 +105,10 @@ var formatDiscountWalletData = (data, selectId = []) => {
     } else {
       name = item.product_name;
     }
+    if (!name && item.isEditMode) {
+      name = item.amount;
+      storeName = item.format_title.auto;
+    }
     return {
       ...item,
       id: item.id,
@@ -124,7 +128,7 @@ var formatDiscountWalletData = (data, selectId = []) => {
       code: item.code,
       disabled: item.isDisabled,
       showStatus: true,
-      cardStatus: item.isDisabled ? "conflict" : void 0,
+      cardStatus: item.isEditMode ? "lastPayment" : item.isDisabled ? "conflict" : void 0,
       cover: (_c = item.product) == null ? void 0 : _c.cover,
       qrCode: item.code,
       validDate: voucherTime(item, "expire_time"),

package/lib/components/checkout/hooks/useWalletPass.js

@@ -326,6 +326,7 @@ var useWalletPass = (props) => {
       handleWalletRecommendListUpdated
     );
     core.effects.on("checkout:onPaymentStarted", handlePaymentStarted);
+    core.effects.on("checkout:onPaymentItemAdded", handlePaymentStarted);
     core.effects.on(
       "wallet:onUserIdentificationCodesUpdated",
       handleUserIdentificationCodesUpdated
@@ -354,6 +355,7 @@ var useWalletPass = (props) => {
         handleWalletRecommendListUpdated
       );
       core.effects.off("checkout:onPaymentStarted", handlePaymentStarted);
+      core.effects.off("checkout:onPaymentItemAdded", handlePaymentStarted);
       core.effects.off(
         "wallet:onUserIdentificationCodesUpdated",
         handleUserIdentificationCodesUpdated
@@ -537,14 +539,17 @@ var useWalletPass = (props) => {
             import_utils.locales.getText("wallet-pass-module-already-best-combination")
           );
         } else {
-          setWalletSelect(searchIdentificationCodeList);
+          const select = searchIdentificationCodeList.filter((item) => item.unified_available_status);
+          setWalletSelect(select);
           handleFetchUserIdentificationCodes(
-            searchIdentificationCodeList.map((item) => item.id),
-            searchIdentificationCodeList
-          );
-          Toast == null ? void 0 : Toast.success(
-            import_utils.locales.getText("wallet-pass-module-best-combination-selected")
+            select.map((item) => item.id),
+            select
           );
+          if (select.length) {
+            Toast == null ? void 0 : Toast.success(
+              import_utils.locales.getText("wallet-pass-module-best-combination-selected")
+            );
+          }
         }
       }
       return;

package/lib/components/checkout/index.less

@@ -69,7 +69,7 @@
     display: grid;
     grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); // 强制等宽分配
     grid-template-rows: auto auto;
-    gap: 16px;
+    gap: 8px 16px;
     background-color: #f6f2ff;
     padding: 16px 16px 0 16px;
     border-radius: 0 0 12px 12px;