@pisell/private-materials 6.5.10 → 6.5.12

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

@@ -104,16 +104,9 @@ function PaymentDetailModal(_ref) {
     return paymentItems.filter(function (item) {
       return !item.voucher_id || item.isSynced;
     }).reduce(function (total, item) {
-      return total + Math.abs(item.amount) + Math.abs(item.rounding_amount);
-    }, 0);
-  };
-
-  // 计算优惠券扣减总额 (只计算带voucher_id的支付项)
-  var getTotalVoucherAmount = function getTotalVoucherAmount() {
-    return paymentItems.filter(function (item) {
-      return item.voucher_id;
-    }).reduce(function (total, item) {
-      return total + Math.abs(item.amount);
+      var amount = new Decimal(Math.abs(item.amount));
+      var roundingAmount = new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
+      return new Decimal(total).plus(amount).plus(roundingAmount).toNumber();
     }, 0);
   };
 
@@ -136,25 +129,76 @@ function PaymentDetailModal(_ref) {
 
   // 渲染支付项 (只渲染不带voucher_id的支付项)
   var renderPaymentItems = function renderPaymentItems() {
+    var depositPayments = paymentItems.filter(function (item) {
+      return item.order_payment_type === 'deposit' && item.isSynced;
+    });
     var regularPayments = paymentItems.filter(function (item) {
-      return !item.voucher_id;
+      return item.isSynced && item.order_payment_type !== 'deposit';
     });
-    if (!paymentItems || paymentItems.length === 0 || regularPayments.length === 0) {
+    if (!paymentItems || paymentItems.length === 0 || regularPayments.length === 0 && depositPayments.length === 0) {
       return /*#__PURE__*/React.createElement("div", {
         className: classNames('section-content')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('no-payment-text')
       }, getText('no.payments.recorded') || 'No payments recorded'));
     }
+    var depositPaymentSummary = depositPayments.reduce(function (acc, item) {
+      return new Decimal(acc).plus(new Decimal(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber();
+    }, 0);
+    var regularPaymentSummary = regularPayments.reduce(function (acc, item) {
+      return new Decimal(acc).plus(new Decimal(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber();
+    }, 0);
     return /*#__PURE__*/React.createElement("div", {
       className: classNames('section-content')
     }, /*#__PURE__*/React.createElement("div", {
       className: classNames('payment-record-container')
-    }, regularPayments.map(function (item) {
+    }, depositPayments.length > 0 && /*#__PURE__*/React.createElement("div", {
+      className: classNames('payment-item-header')
+    }, /*#__PURE__*/React.createElement("div", null, getText('pisell2.subtotal.deposit') || 'Deposit'), /*#__PURE__*/React.createElement("div", null, formatAmountWithOptions(depositPaymentSummary, amountSymbol, {
+      precision: 2,
+      hideDecimalForWholeNumbers: false,
+      useThousandsSeparator: true,
+      showCurrencySymbol: true
+    }))), depositPayments.map(function (item) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: item.uuid,
+        className: classNames('payment-item')
+      }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-bullet')
+      }), /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-content')
+      }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-text')
+      }, item.name, " - ", new Date().toLocaleDateString(), ' ', getText('pisell2.checkout.payment-detail.by') || 'by', ' ', getCustomerInfo().nickname), /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-actions')
+      }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-amount')
+      }, "-", formatAmountWithOptions(new Decimal(Math.abs(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber(), amountSymbol, {
+        precision: 2,
+        hideDecimalForWholeNumbers: false,
+        useThousandsSeparator: true,
+        showCurrencySymbol: true
+      })), shouldShowVoidButton(item) && /*#__PURE__*/React.createElement("button", {
+        className: classNames('void-button'),
+        onClick: function onClick() {
+          return handleVoidPayment(item);
+        },
+        type: "button"
+      }, getText('void') || 'Void'))));
+    }), regularPayments.length > 0 && /*#__PURE__*/React.createElement("div", {
+      className: classNames('payment-item-header')
+    }, /*#__PURE__*/React.createElement("div", null, getText('payment.text') || 'Payment'), /*#__PURE__*/React.createElement("div", null, formatAmountWithOptions(regularPaymentSummary, amountSymbol, {
+      precision: 2,
+      hideDecimalForWholeNumbers: false,
+      useThousandsSeparator: true,
+      showCurrencySymbol: true
+    }))), regularPayments.map(function (item) {
       return /*#__PURE__*/React.createElement("div", {
         key: item.uuid,
         className: classNames('payment-item')
       }, /*#__PURE__*/React.createElement("div", {
+        className: classNames('payment-item-bullet')
+      }), /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-content')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-text')
@@ -162,7 +206,7 @@ function PaymentDetailModal(_ref) {
         className: classNames('payment-item-actions')
       }, /*#__PURE__*/React.createElement("div", {
         className: classNames('payment-item-amount')
-      }, "-", formatAmountWithOptions(Math.abs(item.amount) + Math.abs(item.rounding_amount), amountSymbol, {
+      }, "-", formatAmountWithOptions(new Decimal(Math.abs(item.amount)).plus(new Decimal(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0)).toNumber(), amountSymbol, {
         precision: 2,
         hideDecimalForWholeNumbers: false,
         useThousandsSeparator: true,
@@ -184,19 +228,24 @@ function PaymentDetailModal(_ref) {
 
     // 1. 添加 paymentItems 中带 voucher_id 的支付项
     // 这块先不用 下面钱包卡券应该包含了
-    var voucherPayments = paymentItems.filter(function (item) {
-      return item.voucher_id && item.isSynced;
-    });
-    voucherPayments.forEach(function (item) {
-      items.push( /*#__PURE__*/React.createElement("div", {
-        key: "payment-".concat(item.uuid),
-        className: classNames('balance-item-row')
-      }, /*#__PURE__*/React.createElement("div", {
-        className: classNames('balance-item-text')
-      }, item.name, " - ", item.voucher_id), /*#__PURE__*/React.createElement("div", {
-        className: classNames('balance-item-amount')
-      }, "-$", Math.abs(item.amount).toFixed(2))));
-    });
+    // const voucherPayments = paymentItems.filter(item => item.voucher_id && !item.isSynced);
+    // voucherPayments.forEach((item) => {
+    //   items.push(
+    //     <div key={`payment-${item.uuid}`} className={classNames('balance-item-row')}>
+    //       <div className={classNames('balance-item-text')}>
+    //         {item.name} - {item.voucher_id}
+    //       </div>
+    //       <div className={classNames('balance-item-amount')}>
+    //         -{formatAmountWithOptions(Math.abs(item.amount), amountSymbol, {
+    //           precision: 2,
+    //           hideDecimalForWholeNumbers: false,
+    //           useThousandsSeparator: true,
+    //           showCurrencySymbol: true,
+    //         })}
+    //       </div>
+    //     </div>
+    //   );
+    // });
 
     // 2. 添加选中的钱包卡券 (商品券、储值卡等)
     if (walletPassData !== null && walletPassData !== void 0 && (_walletPassData$selec = walletPassData.selectedWallet) !== null && _walletPassData$selec !== void 0 && _walletPassData$selec.length) {

package/es/components/checkout/components/PaymentDetailModal/index.less

@@ -263,7 +263,7 @@
   flex-direction: column;
   justify-content: flex-start;
   align-items: flex-start;
-  gap: 16px;
+  gap: 8px;
 }
 
 .payment-record-header {
@@ -299,12 +299,33 @@
   line-height: 20px;
   word-wrap: break-word;
 }
+.payment-item-header {
+  width: 100%;
+  color: black;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+  word-wrap: break-word;
+  display: flex;
+  justify-content: space-between;
+}
 
 .payment-item {
   align-self: stretch;
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   align-items: center;
+  gap: 8px;
+  margin-left: 10px;
+  margin-right: 64px;
+}
+
+.payment-item-bullet {
+  width: 6px;
+  height: 6px;
+  background-color: #475467;
+  border-radius: 50%;
+  flex-shrink: 0;
 }
 
 .payment-item-content {

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

@@ -57,7 +57,10 @@ function PaymentOptionsModule(_ref) {
         onClick(method);
       }
     }, {
-      wait: 500 // 500ms 防抖延迟
+      wait: 1000,
+      // 500ms 防抖延迟
+      leading: true,
+      trailing: false
     }),
     handlePaymentClick = _useDebounceFn.run;
   return /*#__PURE__*/React.createElement("div", {

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

@@ -433,6 +433,7 @@ export var useWalletPass = function useWalletPass(props) {
     } else {
       setWalletSelect([]);
       notSetWalletSelectRef.current = false;
+      onSelectChange === null || onSelectChange === void 0 || onSelectChange([]);
     }
 
     // 获取折扣列表并按初始顺序排序（isSelected为true的在前）

package/es/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

package/es/components/eftposPay/linkly/hooks/normal.js

@@ -74,7 +74,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     var status = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.status;
 
     // 继续查询交易状态
-    if (status === 0) {
+    if (status == 0) {
       var _res$data2;
       // 交易流水号
       numRef.current = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.session_id;
@@ -89,7 +89,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
       setTimeout(function () {
         var _resultQueryRef$curre;
         (_resultQueryRef$curre = resultQueryRef.current) === null || _resultQueryRef$curre === void 0 || _resultQueryRef$curre.call(resultQueryRef);
-      });
+      }, 300);
       return;
     }
 
@@ -99,7 +99,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     }));
 
     // 交易成功
-    if (status === 1) {
+    if (status == 1) {
       var _handleLinklySuccessR;
       (_handleLinklySuccessR = handleLinklySuccessRef.current) === null || _handleLinklySuccessR === void 0 || _handleLinklySuccessR.call(handleLinklySuccessRef, res);
       return;

package/es/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -4,13 +4,14 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { useRef } from 'react';
 import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
+import dayjs from 'dayjs';
 import { useDispatch, updateCustom, updateStatus, updateState } from "../../store";
 import { useFail, useStoreRef } from "../../hooks";
 import { ModeEnum, PayStatus, StatusEnum } from "../../const";
 import { LinklyActionStatus } from "../const";
 
 // 全局超时时间
-var GlobalTimeout = 1000 * 60;
+var GlobalTimeout = 1000 * 60 * 2;
 // 单次请求超时时间
 var RequestTimeout = 1000 * 5;
 export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, handleLinklySuccess) {
@@ -18,7 +19,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var _useStoreRef = useStoreRef(),
     numRef = _useStoreRef.numRef,
     modeRef = _useStoreRef.modeRef,
-    deviceRef = _useStoreRef.deviceRef;
+    deviceRef = _useStoreRef.deviceRef,
+    orderIdRef = _useStoreRef.orderIdRef;
   var fail = useFail(0);
   var failRef = useRef(fail);
   var isPay = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay;
@@ -82,22 +84,31 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 console.log('Success: 全局超时或不需要处理结果，终止查询');
                 return;
               }
-              _log("Success", result);
               isQueryFinishedRef.current = true;
               var data = (result === null || result === void 0 ? void 0 : result.data) || {};
               // 交易成功，终止查询
-              if (data.status === 1) {
+              if (data.status == 1) {
                 console.log('交易成功，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u6210\u529F"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 handleLinklySuccess(result);
                 return;
               }
 
               // 交易状态为0，且不需要签名，则继续查询
-              if (data.status !== undefined && (data === null || data === void 0 ? void 0 : data.status) === 0) {
+              if ((data === null || data === void 0 ? void 0 : data.status) == 0 && (data === null || data === void 0 ? void 0 : data.signature_flag) != 1) {
                 console.log('交易状态为0需要继续查询');
+                _log("Querying", result);
                 isQueryFinishedRef.current = false;
-                _resultQuery();
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
                 return;
               }
 
@@ -105,6 +116,13 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               if (data.status < 0) {
                 var _failRef$current;
                 console.log('交易失败，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u5931\u8D25"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 // 交易失败，code码转换为支付失败code码
                 result.code = PayStatus.Unknown;
@@ -113,8 +131,15 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               }
 
               // 需要签名
-              if (data.signature_flag === 1) {
+              if (data.signature_flag == 1) {
                 console.log('交易需要签名，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u9700\u8981\u7B7E\u540D"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 gotoSignature();
                 return;
@@ -132,7 +157,20 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 _log("AbortError");
                 console.log('Error: 请求被取消，将继续查询');
                 isQueryFinishedRef.current = false;
-                _resultQuery();
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
+                return;
+              }
+
+              // 网关类报错，继续查询
+              if (!(error !== null && error !== void 0 && error.code) || "".concat(error.code) === PayStatus.Timeout) {
+                _log("NetworkError");
+                console.log('Error: 网关类报错，将继续查询');
+                isQueryFinishedRef.current = false;
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
                 return;
               }
               _log("Error", error);
@@ -222,33 +260,36 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
       session_id: numRef.current
     };
     var content = [{
-      key: 'queryId',
-      value: JSON.stringify(queryIdRef.current)
+      key: 'description',
+      value: JSON.stringify({
+        queryId: queryIdRef.current,
+        orderId: orderIdRef.current,
+        type: type,
+        date: dayjs().format('YYYY-MM-DD HH:mm:ss')
+      })
     }, {
       key: 'params',
       value: JSON.stringify(params)
     }];
-    if (type === "Success") {
+    if (type === "Error") {
       content.push({
-        key: 'response',
+        key: 'error',
         value: JSON.stringify(res)
       });
-    } else if (type === "Error") {
+    } else {
       content.push({
-        key: 'error',
+        key: 'response',
         value: JSON.stringify(res)
       });
     }
     sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u7ED3\u679C\u67E5\u8BE2--").concat(type),
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u7ED3\u679C\u8F6E\u8BE2"),
       content: content
     });
   };
   var run = function run() {
     // 重置状态
     reset();
-    console.log('开始查询linkly结果---->>>>>>>');
-    _log("Start");
 
     // 设置全局超时定时器
     globalTimeoutIdRef.current = setTimeout(function () {
@@ -264,6 +305,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
     queryIdRef.current = getUniqueId();
+    console.log('开始查询linkly结果---->>>>>>>');
+    _log("Start");
     return _resultQuery();
   };
   return {

package/es/components/eftposPay/payo/config.js

@@ -152,15 +152,15 @@ export var POS = function POS(_ref) {
     controllerRef.current = new AbortController();
     // 支付 or 退款
     var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay(_objectSpread(_objectSpread({}, custom !== null && custom !== void 0 && custom.platform ? {
-      "operator_id": custom.operator_id,
-      "operator_type": custom.operator_type,
-      "platform": custom.platform,
-      "custom_payment_id": custom.custom_payment_id,
-      "service_charge": {
-        "amount": payRef.current.surMoney,
-        "percentage": payRef.current.surPercentRate
+      operator_id: custom.operator_id,
+      operator_type: custom.operator_type,
+      platform: custom.platform,
+      custom_payment_id: custom.custom_payment_id,
+      service_charge: {
+        amount: payRef.current.surMoney,
+        percentage: payRef.current.surPercentRate
       },
-      "original_amount": payRef.current.amount
+      original_amount: payRef.current.amount
     } : {}), {}, {
       order_id: orderIdRef.current,
       amount: payRef.current.total,
@@ -199,8 +199,8 @@ export var POS = function POS(_ref) {
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      // 支付接口超时 进行支付状态查询
-      if (err && "".concat(err.code) === PayStatus.Timeout) {
+      // 支付接口超时 进行支付状态查询（超时或者其它错误）
+      if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
         checkApi();
         return;
       }

package/es/components/eftposPay/serve.js

@@ -232,7 +232,7 @@ export var linklyPayQuery = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee15$(_context15) {
       while (1) switch (_context15.prev = _context15.next) {
         case 0:
-          return _context15.abrupt("return", request.getRequest().get('/shop/shop/linkly/pay/query', params, config));
+          return _context15.abrupt("return", request.getRequest().get('/shop/linkly/pay/query', params, config));
         case 1:
         case "end":
           return _context15.stop();

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -295,7 +295,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/index.d.ts

@@ -17,4 +17,6 @@ import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
 import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };
+import PinModal from './pinModal';
+import PinVerifyModal from './pinVerifyModal';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };

package/es/components/index.js

@@ -17,4 +17,6 @@ import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
 import SubTotal from "./subTotal";
 import EditBookingModal from "./booking/editBookingModal";
 import StepController from "./stepController";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };
+import PinModal from "./pinModal";
+import PinVerifyModal from "./pinVerifyModal";
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal };

package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -262,7 +262,9 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           }
           return _context3.abrupt("return", defaultReturnParams);
         case 5:
-          displayBox = document.getElementById('threeds-container'); // 创建iframe
+          displayBox = document.getElementById('threeds-container'); // 清空dom中的内容
+          displayBox.innerHTML = '';
+          // 创建iframe
           iframe = document.createElement('iframe'); // iframe.src = "about:blank";
           iframe.classList.add('hidden_TDS_From');
           iframe.name = 'threeDSMethodIframe';
@@ -315,7 +317,7 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
               }
             }, false);
           }));
-        case 27:
+        case 28:
         case "end":
           return _context3.stop();
       }
@@ -436,7 +438,8 @@ export var checkTDSAuth = /*#__PURE__*/function () {
  */
 export var createChallengeIframe = function createChallengeIframe(challengeData, callback) {
   var displayBox = document.getElementById('threeds-container');
-
+  // 清空dom中的内容
+  displayBox.innerHTML = '';
   // 创建iframe
   var iframe = document.createElement('iframe');
   iframe.classList.add('tdsv2challengeIframe');

package/es/components/pay/toC/PaymentMethods/WalletPass/List/index.d.ts

@@ -11,6 +11,8 @@ export interface WalletPassListProps {
         name: string;
     };
     onChangeDebounce?: boolean;
+    loading?: boolean;
+    onLoadingChange?: (loading: boolean) => void;
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;