@pisell/private-materials 6.5.3 → 6.5.5

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

@@ -0,0 +1,210 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useState } from 'react';
+import classnames from 'classnames';
+import { formatAmount } from '@pisell/utils';
+import { Iconfont } from '@pisell/materials';
+import { Button, Popover } from 'antd';
+import { PaymentKeyboard } from "../../../../pro/priceKeyboard";
+import "./index.less";
+
+// 扩展支付方法接口，添加手续费相关属性
+
+var PaymentMethodItem = function PaymentMethodItem(_ref) {
+  var method = _ref.method,
+    amountSymbol = _ref.amountSymbol,
+    customAmount = _ref.customAmount,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    onClick = _ref.onClick,
+    getText = _ref.getText;
+  // 控制键盘弹窗显示状态
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isKeyboardVisible = _useState2[0],
+    setIsKeyboardVisible = _useState2[1];
+  // 计算Surcharge金额
+  var calculateSurcharge = function calculateSurcharge(method) {
+    if (!(method !== null && method !== void 0 && method.is_surcharge)) return 0;
+    var baseAmount = Number(customAmount) || 0;
+    if (Number(method.percentage)) {
+      return baseAmount * Number(method.percentage) + Number(method.fixed || 0);
+    }
+    return Number(method.fixed || 0);
+  };
+
+  // 计算总金额（包含Surcharge）
+  var calculateTotalAmount = function calculateTotalAmount(method) {
+    var baseAmount = Number(customAmount) || 0;
+    var surcharge = calculateSurcharge(method);
+    return baseAmount + surcharge;
+  };
+
+  // 处理右侧按钮点击事件
+  var handleRightButtonClick = function handleRightButtonClick(e) {
+    e.preventDefault();
+    // e.stopPropagation(); // 防止事件冒泡到外层按钮
+    if (disabled || !onClick) {
+      return;
+    }
+    onClick(_objectSpread(_objectSpread({}, method), {}, {
+      surcharge: String(formatAmount(calculateSurcharge(method), 2, amountSymbol))
+    }));
+  };
+
+  // 渲染支付图标
+  var renderPaymentIcon = function renderPaymentIcon(method) {
+    if (method.code === 'EFTPOS') {
+      return /*#__PURE__*/React.createElement("div", {
+        className: classnames('payment-options-module-icon-container'),
+        style: {
+          background: '#FE8279'
+        }
+      }, /*#__PURE__*/React.createElement(Iconfont, {
+        type: "pisell2-credit",
+        style: {
+          fontSize: '26px',
+          color: '#ffffff'
+        }
+      }));
+    }
+    switch (String(method.type)) {
+      case 'credit-card':
+      case 'eftpos':
+        return /*#__PURE__*/React.createElement("div", {
+          className: classnames('payment-options-module-icon-container'),
+          style: {
+            background: '#FE8279'
+          }
+        }, /*#__PURE__*/React.createElement(Iconfont, {
+          type: "pisell2-credit",
+          style: {
+            fontSize: '26px',
+            color: '#ffffff'
+          }
+        }));
+      default:
+        return /*#__PURE__*/React.createElement("div", {
+          className: classnames('payment-options-module-icon-container'),
+          style: {
+            background: '#D277E4'
+          }
+        }, /*#__PURE__*/React.createElement(Iconfont, {
+          type: "pisell2-custom",
+          style: {
+            fontSize: '26px',
+            color: '#ffffff'
+          }
+        }));
+    }
+  };
+
+  // 判断是否为EFTPOS支付方式
+  var isEftpos = method.code === 'EFTPOS' || method.type === 'eftpos';
+
+  // 渲染左侧内容
+  var renderLeftContent = function renderLeftContent() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: classnames('payment-options-module-payment-method-left')
+    }, /*#__PURE__*/React.createElement("div", {
+      className: classnames('payment-options-module-icon-container')
+    }, renderPaymentIcon(method)), /*#__PURE__*/React.createElement("div", {
+      className: classnames('payment-options-module-payment-info')
+    }, /*#__PURE__*/React.createElement("div", {
+      className: classnames('payment-options-module-payment-info-inner')
+    }, /*#__PURE__*/React.createElement("div", {
+      className: classnames('payment-options-module-payment-name')
+    }, method.name), /*#__PURE__*/React.createElement("div", {
+      className: classnames('payment-options-module-payment-info-inner-surcharge')
+    }, !!(method !== null && method !== void 0 && method.is_surcharge) && calculateSurcharge(method) !== 0 && /*#__PURE__*/React.createElement("div", {
+      className: classnames('payment-options-module-surcharge-text')
+    }, (getText === null || getText === void 0 ? void 0 : getText('pisell2.payment-options.surcharge-label', 'Surcharge')) || 'Surcharge', ":", formatAmount(calculateSurcharge(method), 2, amountSymbol)), !isEftpos && /*#__PURE__*/React.createElement("div", {
+      className: classnames('payment-options-module-surcharge-text'),
+      style: {
+        cursor: 'pointer'
+      }
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-edit-05",
+      style: {
+        fontSize: '24px',
+        color: disabled ? '#D0D5DD' : '#7F56DA'
+      }
+    }))))));
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("button", {
+    className: classnames('payment-options-module-payment-method-item', {
+      'payment-options-module-pointer': !disabled,
+      'payment-options-module-disabled': disabled
+    }),
+    type: "button",
+    disabled: disabled
+  }, !isEftpos ? /*#__PURE__*/React.createElement(Popover, {
+    content: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(PaymentKeyboard, {
+      paymentOriginalValue: String(customAmount || 0),
+      paymentDefaultValue: String(customAmount || 0),
+      enableExceedMaxAmount: !isEftpos,
+      payment: {
+        enable: true
+      },
+      surcharge: {
+        enable: !!(method !== null && method !== void 0 && method.is_surcharge) && calculateSurcharge(method) !== 0
+      },
+      surchargeDefaultValue: {
+        percent: method.percentage ? String(Number(method.percentage) * 100) : '',
+        fixed: method.fixed ? String(method.fixed) : ''
+      },
+      selectType: "light",
+      onChange: function onChange(value) {
+        console.log(value);
+      },
+      onPay: function onPay(args) {
+        console.log(args);
+        // 处理支付逻辑
+        setIsKeyboardVisible(false);
+        if (onClick) {
+          var _args$surcharge, _args$surcharge2;
+          onClick(_objectSpread(_objectSpread({}, method), {}, {
+            fixed: Number(((_args$surcharge = args.surcharge) === null || _args$surcharge === void 0 ? void 0 : _args$surcharge.fixed) || 0),
+            percentage: (_args$surcharge2 = args.surcharge) !== null && _args$surcharge2 !== void 0 && _args$surcharge2.percent ? Number(args.surcharge.percent) / 100 : 0,
+            totalAmount: String(formatAmount(args.amount, 2))
+          }));
+        }
+      }
+    })),
+    trigger: "click",
+    open: isKeyboardVisible,
+    onOpenChange: setIsKeyboardVisible,
+    placement: "bottom",
+    overlayClassName: "payment-keyboard-popover",
+    arrow: true,
+    destroyTooltipOnHide: true
+  }, /*#__PURE__*/React.createElement("div", null, renderLeftContent())) : renderLeftContent(), /*#__PURE__*/React.createElement("div", {
+    className: classnames('payment-options-module-payment-method-right'),
+    onClick: handleRightButtonClick
+  },
+  // 右侧按钮，如果是eftpos，则显示Pay按钮
+  isEftpos ? /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    className: classnames('payment-options-module-pay-button'),
+    disabled: disabled
+  }, getText === null || getText === void 0 ? void 0 : getText('pay', 'Pay')) : /*#__PURE__*/React.createElement("div", {
+    className: classnames('payment-options-module-selection-button')
+  }, /*#__PURE__*/React.createElement(Iconfont, {
+    type: "pisell2-a-arrow-circle-right2",
+    style: {
+      fontSize: '30px',
+      color: disabled ? '#D0D5DD' : '#7F56DA'
+    }
+  })))));
+};
+export default PaymentMethodItem;

package/es/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/es/components/checkout/components/PaymentOptionsModule/index.js

@@ -1,21 +1,13 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import ScrollableList from "../ScrollableList/index";
+import PaymentMethodItem from "./PaymentMethodItem";
 import React from 'react';
 import classnames from 'classnames';
 import "./index.less";
-import { formatAmount, locales } from '@pisell/utils';
-import { Iconfont } from '@pisell/materials';
+import { locales } from '@pisell/utils';
 import { useDebounceFn } from 'ahooks';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import checkoutLocales from "../../locales";
 
-// 扩展支付方法接口，添加手续费相关属性
-
 // 扩展 PaymentOptionsModule Props 接口
 
 var SHOW_METHODS_CODE = ['EFTPOS_LINKLY', 'EFTPOS', 'EFTPOS_TYRO', 'EFTPOS_WINDCAVE', 'EFTPOS_PAYO'];
@@ -56,82 +48,18 @@ function PaymentOptionsModule(_ref) {
     return !(item.type === 'app' && item.code === 'EFTPOS_LINKLY') && (['custom'].includes(item.type) || SHOW_METHODS_CODE.includes(item.code));
   });
 
-  // 计算Surcharge金额
-  var calculateSurcharge = function calculateSurcharge(method) {
-    if (!(method !== null && method !== void 0 && method.is_surcharge)) return 0;
-    var baseAmount = Number(customAmount) || 0;
-    if (Number(method.percentage)) {
-      return baseAmount * Number(method.percentage) + Number(method.fixed || 0);
-    }
-    return Number(method.fixed || 0);
-  };
-
-  // 计算总金额（包含Surcharge）
-  var calculateTotalAmount = function calculateTotalAmount(method) {
-    var baseAmount = Number(customAmount) || 0;
-    var surcharge = calculateSurcharge(method);
-    return baseAmount + surcharge;
-  };
-
   // 防抖处理支付方式点击
   var _useDebounceFn = useDebounceFn(function (method) {
       if (disabled) {
         return;
       }
       if (typeof onClick === 'function') {
-        onClick(_objectSpread(_objectSpread({}, method), {}, {
-          surcharge: String(formatAmount(calculateSurcharge(method), 2, amountSymbol))
-        }));
+        onClick(method);
       }
     }, {
       wait: 500 // 500ms 防抖延迟
     }),
     handlePaymentClick = _useDebounceFn.run;
-  var renderPaymentIcon = function renderPaymentIcon(method) {
-    if (method.code === 'EFTPOS') {
-      return /*#__PURE__*/React.createElement("div", {
-        className: classnames('payment-options-module-icon-container'),
-        style: {
-          background: '#FE8279'
-        }
-      }, /*#__PURE__*/React.createElement(Iconfont, {
-        type: "pisell2-credit",
-        style: {
-          fontSize: '26px',
-          color: '#ffffff'
-        }
-      }));
-    }
-    switch (String(method.type)) {
-      case 'credit-card':
-      case 'eftpos':
-        return /*#__PURE__*/React.createElement("div", {
-          className: classnames('payment-options-module-icon-container'),
-          style: {
-            background: '#FE8279'
-          }
-        }, /*#__PURE__*/React.createElement(Iconfont, {
-          type: "pisell2-credit",
-          style: {
-            fontSize: '26px',
-            color: '#ffffff'
-          }
-        }));
-      default:
-        return /*#__PURE__*/React.createElement("div", {
-          className: classnames('payment-options-module-icon-container'),
-          style: {
-            background: '#D277E4'
-          }
-        }, /*#__PURE__*/React.createElement(Iconfont, {
-          type: "pisell2-custom",
-          style: {
-            fontSize: '26px',
-            color: '#ffffff'
-          }
-        }));
-    }
-  };
   return /*#__PURE__*/React.createElement("div", {
     className: classnames('payment-options-module', {
       'payment-options-module-disabled': disabled
@@ -143,7 +71,7 @@ function PaymentOptionsModule(_ref) {
   }, /*#__PURE__*/React.createElement(ScrollableList, {
     height: "100%" // 占满剩余空间
     ,
-    maxHeight: 330,
+    maxHeight: 314,
     gradientColor: "rgba(139, 92, 246, 0.1)",
     gradientHeight: 50,
     columnCount: showCashPayment ? 1 : 2,
@@ -160,45 +88,15 @@ function PaymentOptionsModule(_ref) {
       paddingBottom: 8
     }
   }, filteredPaymentMethods.map(function (method) {
-    return /*#__PURE__*/React.createElement("button", {
+    return /*#__PURE__*/React.createElement(PaymentMethodItem, {
       key: method.id,
-      onClick: function onClick(e) {
-        e.preventDefault();
-        handlePaymentClick(method);
-      },
-      className: classnames('payment-options-module-payment-method-item', {
-        'payment-options-module-pointer': !disabled,
-        'payment-options-module-disabled': disabled
-      }),
-      type: "button",
-      disabled: disabled
-    }, /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-payment-method-left')
-    }, /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-icon-container')
-    }, renderPaymentIcon(method)), /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-payment-info')
-    }, /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-payment-info-inner')
-    }, /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-payment-name')
-    }, method.name), !!(method !== null && method !== void 0 && method.is_surcharge) && calculateSurcharge(method) !== 0 && /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-surcharge-text')
-    }, getText('pisell2.payment-options.surcharge-label', 'Surcharge'), ":", formatAmount(calculateSurcharge(method), 2, amountSymbol))))), /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-payment-method-right')
-    }, method.code !== 'EFTPOS' && method.type !== 'eftpos' && /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-amount', 'payment-options-module-theme-color')
-    }, formatAmount(calculateTotalAmount(method), 2, amountSymbol)), /*#__PURE__*/React.createElement("div", {
-      className: classnames('payment-options-module-selection-button', {
-        'payment-options-module-selection-button-disabled': disabled
-      })
-    }, /*#__PURE__*/React.createElement(Iconfont, {
-      type: "pisell2-a-arrow-circle-right2",
-      style: {
-        fontSize: '30px',
-        color: '#7F56DA'
-      }
-    }))));
+      method: method,
+      amountSymbol: amountSymbol,
+      customAmount: customAmount,
+      disabled: disabled,
+      onClick: handlePaymentClick,
+      getText: getText
+    });
   }))));
 }
 export default PaymentOptionsModule;

package/es/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;
@@ -258,3 +281,9 @@
     /* 标题保持正常颜色 */
   }
 }
+
+.payment-keyboard-popover {
+  .pisell-lowcode-popover-inner{
+    padding: 0;
+  }
+}

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

@@ -89,7 +89,7 @@ var SavePayLaterHandler = /*#__PURE__*/forwardRef(function (_ref, ref) {
     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/es/components/checkout/components/SearchAndClientModule/index.js

@@ -40,12 +40,12 @@ var SearchAndClientModule = function SearchAndClientModule(props) {
   var bookingTicket = useBookingTicket();
   var handleSearch = useDebounceFn( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(keyword) {
-      var res, _Toast$info, _clientCardRef$curren, _clientCardRef$curren2, _Toast$info2, _res$data, customer, rest, _Toast$info3, _customer;
+      var res, _Toast$info, _clientCardRef$curren, _clientCardRef$curren2, _res$data, customer, rest, _Toast$info2, _customer;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!keyword) {
-              _context.next = 27;
+              _context.next = 24;
               break;
             }
             setLoading(true);
@@ -62,46 +62,47 @@ var SearchAndClientModule = function SearchAndClientModule(props) {
             return _context.abrupt("return");
           case 9:
             if (!('type' in res && res.type == 'walletCode')) {
-              _context.next = 19;
+              _context.next = 16;
               break;
             }
-            if (!disabledSwitch) {
-              _context.next = 13;
-              break;
-            }
-            Toast === null || Toast === void 0 || (_Toast$info2 = Toast.info) === null || _Toast$info2 === void 0 || _Toast$info2.call(Toast, locales.getText('pisell2.checkout.client-card.tip.partially-paid'));
-            return _context.abrupt("return");
-          case 13:
+            // if (disabledSwitch) {
+            //   Toast?.info?.(
+            //     locales.getText(
+            //       'pisell2.checkout.client-card.tip.partially-paid'
+            //     )
+            //   );
+            //   return;
+            // }
             _res$data = res.data, customer = _res$data.customer, rest = _objectWithoutProperties(_res$data, _excluded); // todo 无绑定client
             if (customer) {
-              _context.next = 17;
+              _context.next = 14;
               break;
             }
-            Toast === null || Toast === void 0 || (_Toast$info3 = Toast.info) === null || _Toast$info3 === void 0 || _Toast$info3.call(Toast, locales.getText('pisell2.checkout.wallet-pass-module.no-result'));
+            Toast === null || Toast === void 0 || (_Toast$info2 = Toast.info) === null || _Toast$info2 === void 0 || _Toast$info2.call(Toast, locales.getText('pisell2.checkout.wallet-pass-module.no-result'));
             return _context.abrupt("return");
-          case 17:
+          case 14:
             _customer = _objectSpread(_objectSpread({}, customer), {}, {
               latest_wallet_detail: rest
             }); // @ts-ignore
             (_clientCardRef$curren = clientCardRef.current) === null || _clientCardRef$curren === void 0 || (_clientCardRef$curren2 = _clientCardRef$curren.handleSetClient) === null || _clientCardRef$curren2 === void 0 || _clientCardRef$curren2.call(_clientCardRef$curren, _customer, {
               sameClientTip: locales.getText('pisell2.checkout.client-card.tip.same-client')
             });
-          case 19:
+          case 16:
             setValue('');
-            _context.next = 24;
+            _context.next = 21;
             break;
-          case 22:
-            _context.prev = 22;
+          case 19:
+            _context.prev = 19;
             _context.t0 = _context["catch"](2);
-          case 24:
-            _context.prev = 24;
+          case 21:
+            _context.prev = 21;
             setLoading(false);
-            return _context.finish(24);
-          case 27:
+            return _context.finish(21);
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 22, 24, 27]]);
+      }, _callee, null, [[2, 19, 21, 24]]);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);
@@ -150,23 +151,23 @@ var SearchAndClientModule = function SearchAndClientModule(props) {
         size: 'default'
       }
     };
-    if (disabledSwitch === true) {
-      _props = {
-        open: false,
-        buttonProps: {
-          icon: icon,
-          size: 'default',
-          onClick: function onClick() {
-            var _Toast$info4;
-            // todo 根据当前订单付款情况判断是否可以切换
-            Toast === null || Toast === void 0 || (_Toast$info4 = Toast.info) === null || _Toast$info4 === void 0 || _Toast$info4.call(Toast, locales.getText('pisell2.checkout.client-card.tip.partially-paid'));
-          },
-          style: {
-            cursor: 'not-allowed'
-          }
-        }
-      };
-    }
+    // if (disabledSwitch === true) {
+    //   _props = {
+    //     open: false,
+    //     buttonProps: {
+    //       icon,
+    //       size: 'default',
+    //       onClick: () => {
+    //         // todo 根据当前订单付款情况判断是否可以切换
+    //         Toast?.info?.(
+    //           locales.getText('pisell2.checkout.client-card.tip.partially-paid')
+    //         );
+    //       },
+    //       style: { cursor: 'not-allowed' },
+    //     },
+    //   };
+    // }
+
     return _props;
   }, [Toast, disabledSwitch]);
   return /*#__PURE__*/React.createElement("div", {

package/es/components/checkout/components/WalletPassModule/index.js

@@ -128,11 +128,12 @@ var WalletPassModule = /*#__PURE__*/forwardRef(function (props, ref) {
     return selectedWalletIds.length + selectedDiscountList.length;
   }, [selectedWalletIds.length, selectedDiscountList.length]);
   var discountDisabled = useMemo(function () {
+    if (Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) === 0) return true;
     return !!(paymentItems !== null && paymentItems !== void 0 && paymentItems.some(function (item) {
-      return !WALLET_PASS_CODE_ARRAY.includes(item.code);
+      return !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__*/React.createElement("div", {

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

@@ -85,6 +85,11 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
     } else {
       name = item.product_name;
     }
+
+    // 如果处理完最后还没有 name，并且是 isEditMode，则 name 为 item.name
+    if (!name && item.isEditMode) {
+      name = item.name;
+    }
     return _objectSpread(_objectSpread({}, item), {}, {
       id: item.id,
       name: name,
@@ -103,7 +108,7 @@ export var formatDiscountWalletData = function formatDiscountWalletData(data) {
       code: item.code,
       disabled: item.isDisabled,
       showStatus: true,
-      cardStatus: item.isDisabled ? 'conflict' : undefined,
+      cardStatus: item.isEditMode ? 'lastPayment' : item.isDisabled ? 'conflict' : undefined,
       cover: (_item$product2 = item.product) === null || _item$product2 === void 0 ? void 0 : _item$product2.cover,
       qrCode: item.code,
       validDate: voucherTime(item, 'expire_time'),

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

@@ -514,6 +514,7 @@ export var useWalletPass = function useWalletPass(props) {
     // 注册事件监听器
     core.effects.on('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
     core.effects.on('checkout:onPaymentStarted', handlePaymentStarted);
+    core.effects.on('checkout:onPaymentItemAdded', handlePaymentStarted);
     core.effects.on('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
     core.effects.on('wallet:onWalletCacheCleared', handleWalletCacheCleared);
     core.effects.on('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
@@ -526,6 +527,7 @@ export var useWalletPass = function useWalletPass(props) {
     return function () {
       core.effects.off('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
       core.effects.off('checkout:onPaymentStarted', handlePaymentStarted);
+      core.effects.off('checkout:onPaymentItemAdded', handlePaymentStarted);
       core.effects.off('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
       core.effects.off('wallet:onWalletCacheCleared', handleWalletCacheCleared);
       core.effects.off('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);

package/es/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;