@pisell/private-materials 6.9.2 → 6.9.3

package/es/components/kioskSkuDetail/locales.js

@@ -3,18 +3,24 @@ export default {
     'pisell2.text.kiosk.sku.detail.btn.back': 'Back',
     'pisell2.text.kiosk.sku.detail.item.total': 'Item total',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': 'Add to cart',
-    'pisell2.text.kiosk.sku.detail.loading.options': 'Loading options…'
+    'pisell2.text.kiosk.sku.detail.btn.update': 'Update',
+    'pisell2.text.kiosk.sku.detail.loading.options': 'Loading options…',
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': 'Please select a top-up option'
   },
   'zh-CN': {
     'pisell2.text.kiosk.sku.detail.btn.back': '返回',
     'pisell2.text.kiosk.sku.detail.item.total': '小计',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入购物车',
-    'pisell2.text.kiosk.sku.detail.loading.options': '正在加载选项…'
+    'pisell2.text.kiosk.sku.detail.btn.update': '更新',
+    'pisell2.text.kiosk.sku.detail.loading.options': '正在加载选项…',
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': '请选择充值选项'
   },
   'zh-TW': {
     'pisell2.text.kiosk.sku.detail.btn.back': '返回',
     'pisell2.text.kiosk.sku.detail.item.total': '小計',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入購物車',
-    'pisell2.text.kiosk.sku.detail.loading.options': '正在載入選項…'
+    'pisell2.text.kiosk.sku.detail.btn.update': '更新',
+    'pisell2.text.kiosk.sku.detail.loading.options': '正在載入選項…',
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': '請選擇充值選項'
   }
 };

package/es/components/pay/toB/components/CardGroup/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayMethod, PayMethodGroup } from '../../types';
 import './index.less';
 declare const ToBPayCardGroup: (props: {

package/es/components/pay/toB/components/EFTPOS/index.js

@@ -127,7 +127,14 @@ var EFTPOS = function EFTPOS(props, ref) {
                 name: payMethod.name,
                 symbol: params.symbol,
                 amount: params.amount,
-                device_number: device_number
+                device_number: device_number,
+                custom_payment_id: payMethod === null || payMethod === void 0 ? void 0 : payMethod.id,
+                custom_payment_code: payMethod === null || payMethod === void 0 ? void 0 : payMethod.code,
+                custom_payment_name: payMethod === null || payMethod === void 0 ? void 0 : payMethod.name,
+                custom_payment_type: payMethod === null || payMethod === void 0 ? void 0 : payMethod.type,
+                operator_type: params === null || params === void 0 ? void 0 : params.operator_type,
+                operator_id: params === null || params === void 0 ? void 0 : params.operator_id,
+                platform: params === null || params === void 0 ? void 0 : params.platform
               },
               mode: mode
             };

package/es/components/pay/toB/components/MX51/index.js

@@ -61,7 +61,8 @@ var MX51 = function MX51(props, ref) {
             msg: _res2 === null || _res2 === void 0 ? void 0 : _res2.msg,
             amount: _res2 === null || _res2 === void 0 || (_res2$data = _res2.data) === null || _res2$data === void 0 ? void 0 : _res2$data.amount,
             surcharge: _res2 === null || _res2 === void 0 || (_res2$data2 = _res2.data) === null || _res2$data2 === void 0 ? void 0 : _res2$data2.surcharge,
-            uniquePaymentNumber: _res2 === null || _res2 === void 0 ? void 0 : _res2.uuid
+            uniquePaymentNumber: _res2 === null || _res2 === void 0 ? void 0 : _res2.uuid,
+            action: _res2 === null || _res2 === void 0 ? void 0 : _res2.action
           };
           // 判断是否是同一个支付
           isSame = (_res2 === null || _res2 === void 0 ? void 0 : _res2.uuid) === uniquePaymentNumber;

package/es/components/pay/toB/paymentMethods/index.js

@@ -69,7 +69,8 @@ var PaymentMethods = function PaymentMethods(props, ref) {
       data: {
         amount: res.amount,
         surcharge: res.surcharge,
-        uniquePaymentNumber: res.uniquePaymentNumber
+        uniquePaymentNumber: res.uniquePaymentNumber,
+        action: res.action
       },
       msg: res.msg
     };

package/es/components/pay/toB/types/index.d.ts

@@ -14,6 +14,7 @@ export interface ToBPayParams {
             symbol?: string;
             amount: string;
             surcharge?: string;
+            [key: string]: any;
         };
         mode: 'pay' | 'refund';
     };
@@ -27,6 +28,12 @@ export declare type ToBPayCallback = (res: {
         surMoney?: number;
         surcharge?: number;
         uniquePaymentNumber?: string;
+        /**
+         * @description
+         * 支付组件返回的额外动作指令（例如：取消订单并开始新订单）
+         * PaymentModal 里会根据该字段执行对应流程。
+         */
+        action?: 'cancel_order' | string;
     };
     msg?: string;
 }) => void;
@@ -57,11 +64,13 @@ export interface MX51PayResult {
     amount: number;
     surcharge: number;
     uniquePaymentNumber: string;
+    action?: 'cancel_order' | string;
 }
 /**
  * @title 原生MX51支付结果
  */
 export interface NativeMX51PayResult {
+    action?: 'cancel_order' | string;
     code: string;
     msg?: string;
     data: {

package/es/components/pay/toC/PaymentList/index.d.ts

@@ -12,7 +12,7 @@ export interface PaymentListProps {
     renderTitle?: () => React.ReactNode;
 }
 export interface PaymentListRef {
-    init: (props: any) => {};
+    init: (props: any, amount?: number) => {};
     calculateSurcharge: (amount: number) => any;
 }
 declare const _default: React.ForwardRefExoticComponent<PaymentListProps & React.RefAttributes<unknown>>;

package/es/components/pay/toC/PaymentList/index.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useMemo, useImperativeHandle, forwardRef } from 'react';
 import { filterPaymentList, getPaymentList } from "./serve";
-import { PisellCheckboxGroup, PisellRow, PisellTooltip, Iconfont, PisellEmpty } from '@pisell/materials';
+import { PisellCheckboxGroup, PisellRow, PisellTooltip, Iconfont, PisellEmpty, Image } from '@pisell/materials';
 import { calculateSurcharge } from "./utils";
 import classNames from 'classnames';
 import useEngineContext from "../../../../hooks/useEngineContext";
@@ -154,14 +154,14 @@ var PaymentList = function PaymentList(props, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-16 10:53
    */
-  var init = function init(list) {
+  var init = function init(list, amount) {
     var _context$appHelper2;
     // 打开loading
     setLoading(true);
     var platform = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.constants) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.platform) || 'h5';
 
     // 过滤数据
-    var _filterPaymentList = filterPaymentList(list, platform, isApp),
+    var _filterPaymentList = filterPaymentList(list, platform, isApp, amount),
       paymentList = _filterPaymentList.paymentList,
       walletPass = _filterPaymentList.walletPass;
 
@@ -262,6 +262,43 @@ var PaymentList = function PaymentList(props, ref) {
     }));
   };
 
+  /**
+   * @description: 渲染信用卡手续费弹窗
+   * @param {any} _item
+   * @return {*}
+   */
+  var renderCreditCardToast = function renderCreditCardToast(_item) {
+    var _item$surcharge_confi;
+    return /*#__PURE__*/React.createElement("div", {
+      className: "surcharge-modal-wrap surcharge-modal-wrap-credit-card"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "surcharge-modal-lists"
+    }, _item === null || _item === void 0 || (_item$surcharge_confi = _item.surcharge_config_result) === null || _item$surcharge_confi === void 0 ? void 0 : _item$surcharge_confi.map(function (d) {
+      var _d$icons, _d$lists;
+      return /*#__PURE__*/React.createElement("div", {
+        key: d.name,
+        className: "surcharge-modal-list-item"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "surcharge-modal-list-item-header"
+      }, d === null || d === void 0 || (_d$icons = d.icons) === null || _d$icons === void 0 ? void 0 : _d$icons.map(function (icon) {
+        return /*#__PURE__*/React.createElement(Image, {
+          src: icon,
+          className: "header-icon",
+          isPreview: false
+        });
+      }), /*#__PURE__*/React.createElement("span", null, d.name)), /*#__PURE__*/React.createElement("div", {
+        className: "surcharge-modal-list-item-content"
+      }, d === null || d === void 0 || (_d$lists = d.lists) === null || _d$lists === void 0 ? void 0 : _d$lists.map(function (item) {
+        return /*#__PURE__*/React.createElement("div", {
+          key: item.name,
+          className: "content-item"
+        }, /*#__PURE__*/React.createElement("span", null, locales.getText(item.area_text)), /*#__PURE__*/React.createElement("span", {
+          className: "item-fee"
+        }, item.surcharge_fee), /*#__PURE__*/React.createElement("span", null, item.surcharge_text));
+      })));
+    })));
+  };
+
   /**
    * @title: 列表
    * @description:
@@ -293,9 +330,12 @@ var PaymentList = function PaymentList(props, ref) {
       onChange: paymentTypeChange,
       optionClassName: 'payment-item',
       renderOption: function renderOption(d, active) {
-        var _d$params, _d$params2;
+        var _d$params, _d$surcharge_config_r, _d$params2;
         // 是否展示手续费icon
         var showIcon = d.surcharge && d.service !== 'pisell.other.cashmanual' && d.service !== 'pisell.custom_payment' || (d === null || d === void 0 || (_d$params = d.params) === null || _d$params === void 0 ? void 0 : _d$params.description) && (d.service === 'pisell.other.cashmanual' || d.service === 'pisell.custom_payment');
+
+        // 是否显示单独的信用卡手续费弹窗
+        var showCreditCardToast = (d === null || d === void 0 ? void 0 : d.service) === 'mw.credit_card' && (d === null || d === void 0 || (_d$surcharge_config_r = d.surcharge_config_result) === null || _d$surcharge_config_r === void 0 ? void 0 : _d$surcharge_config_r.length) > 0;
         return /*#__PURE__*/React.createElement(PisellRow, {
           platform: "h5",
           key: d.service,
@@ -316,9 +356,18 @@ var PaymentList = function PaymentList(props, ref) {
           }, d.title, ' '), /*#__PURE__*/React.createElement("div", {
             className: ""
           }, (d !== null && d !== void 0 && (_d$params2 = d.params) !== null && _d$params2 !== void 0 && _d$params2.description || d.surcharge) && d.service !== 'pisell.offline_payment' ? /*#__PURE__*/React.createElement(PisellTooltip, {
-            title: renderToast(d),
+            title: showCreditCardToast ? renderCreditCardToast(d) : renderToast(d),
             onClick: function onClick(e) {
               e.stopPropagation();
+            },
+            overlayClassName: showCreditCardToast ? 'surcharge-tooltip-overlay-wrap' : '',
+            getPopupContainer: function getPopupContainer(triggerNode) {
+              if (showCreditCardToast) {
+                var _triggerNode$closest;
+                var modalContainer = triggerNode === null || triggerNode === void 0 || (_triggerNode$closest = triggerNode.closest) === null || _triggerNode$closest === void 0 ? void 0 : _triggerNode$closest.call(triggerNode, '.toc-pay-modal-content .pisell-lowcode-modal');
+                return modalContainer || document.body;
+              }
+              return document.body;
             }
           }, /*#__PURE__*/React.createElement("span", {
             className: classNames('surcharge-wrap', {

package/es/components/pay/toC/PaymentList/index.less

@@ -109,4 +109,61 @@
     font-style: normal;
     font-weight: 500;
   }
-}
+}
+
+.surcharge-tooltip-overlay-wrap{
+  max-width: 92% !important;
+  width: 92%;
+  left: 4% !important;
+  .pisell-lowcode-tooltip-inner{
+    background: #F2F4F7 !important;
+  }
+}
+
+.surcharge-modal-wrap-credit-card {
+  .surcharge-modal-lists {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    .surcharge-modal-list-item {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      .surcharge-modal-list-item-header {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        color: #101828;
+        font-size: 14px;
+        font-weight: 600;
+        line-height: 20px;
+        .header-icon{
+          width: 58px;
+        }
+      }
+      .surcharge-modal-list-item-content {
+        display: flex;
+        gap: 12px;
+        .content-item {
+          display: flex;
+          flex-direction: column;
+          flex: 1;
+          padding: 8px 12px;
+          border-radius: 8px;
+          box-shadow: 0px 2px 4px -2px rgba(16, 24, 40, 0.06);
+          background: white;
+          color: #475467;
+          font-size: 12px;
+          font-weight: 400;
+          line-height: 18px;
+          .item-fee {
+            color: black;
+            font-size: 24px;
+            font-weight: 700;
+            line-height: 32px;
+          }
+        }
+      }
+    }
+  }
+}

package/es/components/pay/toC/PaymentList/serve.d.ts

@@ -20,7 +20,7 @@ export declare const getPaymentList: (values: any) => Promise<{
  * @Author: zhiwei.Wang
  * @Date: 2024-08-16 10:57
  */
-export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean) => {
+export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean, amount?: number) => {
     message: string;
     status: string;
     paymentList: any[];

package/es/components/pay/toC/PaymentList/serve.js

@@ -17,6 +17,7 @@ import { request } from "../../../../utils";
 import { paymentKeys } from "./status";
 import { isWx, isIOS } from '@pisell/utils';
 import { paymentTypes, isCustomPayment } from "./status";
+import { formatCreditCardSurchargeList, formatCreditCardSurchargeText } from "./utils";
 
 /**
  * @title: 获取支付列表
@@ -49,6 +50,17 @@ export var getPaymentList = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
+// 修改当前的支付方式默认排序
+// Apple Pay / Google Pay（按设备自动显示）
+// Visa / Master（信用卡）
+// Online Payment（stripe）
+// Bank Deposit（银行转账）
+// Alipay
+// WeChat Pay
+// Offline Payment（线下支付）
+// Cash（现金）
+// Custom Payment（自定义支付）
+var sortArr = ['mw.google', 'mw.apple', 'mw.credit_card', 'stripe', 'pisell.bank_deposit', 'superpay.alipay.h5', 'superpay.wechat.h5', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_payment'];
 
 /**
  * @title: 过滤支付列表
@@ -61,6 +73,7 @@ export var getPaymentList = /*#__PURE__*/function () {
 export var filterPaymentList = function filterPaymentList(list) {
   var platform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'h5';
   var isApp = arguments.length > 2 ? arguments[2] : undefined;
+  var amount = arguments.length > 3 ? arguments[3] : undefined;
   var paymentList = _toConsumableArray(list);
   var _paymentKeys = _toConsumableArray(paymentKeys);
 
@@ -122,6 +135,9 @@ export var filterPaymentList = function filterPaymentList(list) {
       walletPass: walletPass
     };
   }
+  paymentList = paymentList.sort(function (a, b) {
+    return sortArr.indexOf(a.service) - sortArr.indexOf(b.service);
+  });
 
   // 将自定义支付方式的service加上custom_payment_id, 保证唯一性
   paymentList = paymentList.map(function (d) {
@@ -132,6 +148,12 @@ export var filterPaymentList = function filterPaymentList(list) {
     if (isCustomPayment(d.service)) {
       service = service + '|' + d.params.custom_payment_id;
     }
+
+    // visa/master手续费特殊处理
+    if (service === 'mw.credit_card') {
+      d.surcharge = formatCreditCardSurchargeText(d === null || d === void 0 ? void 0 : d.surcharge_config, d === null || d === void 0 ? void 0 : d.surcharge_text);
+      d.surcharge_config_result = formatCreditCardSurchargeList(d, amount !== null && amount !== void 0 ? amount : 0);
+    }
     return _objectSpread(_objectSpread({}, d), {}, {
       service: service,
       title: d.name,

package/es/components/pay/toC/PaymentList/utils.d.ts

@@ -1,3 +1,29 @@
+/**
+ * @description: visa/master手续费是否一致
+ * @param {any} creditCardConfig
+ * @return {*}
+ */
+export declare const isCreditCardSurchargeSame: (creditCardConfig: any[]) => boolean;
+/**
+ * @description: 格式化visa/master手续费
+ * @param {any} item 支付列表项
+ * @param {number} amount 订单金额
+ * @param {boolean} isSame 手续费是否一致
+ * @return {*}
+ */
+export declare const formatCreditCardSurcharge: (item: any, amount: number, isSame: boolean) => any;
+/**
+ * @description: 格式化visa/master手续费列表
+ * @param {any} item
+ * @param {number} amount
+ * @return {*}
+ */
+export declare const formatCreditCardSurchargeList: (item: any, amount: number) => any;
+/**
+ * @description: 格式化visa/master手续费文案，只显示百分比区间
+ * @return {*}
+ */
+export declare const formatCreditCardSurchargeText: (surcharge_config: any[], surcharge_text: string) => string;
 /**
  * @title: 计算支付列表的手续费
  * @description:

package/es/components/pay/toC/PaymentList/utils.js

@@ -1,12 +1,192 @@
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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 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 visaIcon from "./payment/visa.png";
+import creditCardIcon from "./payment/credit_card.png";
+
+/**
+ * @description: visa/master手续费是否一致
+ * @param {any} creditCardConfig
+ * @return {*}
+ */
+export var isCreditCardSurchargeSame = function isCreditCardSurchargeSame(creditCardConfig) {
+  try {
+    // 将配置项转换为map key为credit_card_type_area  value为config对象
+    var configMap = {};
+    creditCardConfig.forEach(function (config) {
+      var key = "".concat((config === null || config === void 0 ? void 0 : config.credit_card_type) || '-', "_").concat((config === null || config === void 0 ? void 0 : config.area) || '-');
+      configMap[key] = config;
+    });
+
+    // 获取配置项
+    var visaDomestic = configMap['visa_domestic'];
+    var visaWorld = configMap['visa_world'];
+    var masterDomestic = configMap['master_domestic'];
+    var masterWorld = configMap['master_world'];
+    var formatFee = function formatFee(config) {
+      var _ref, _config$percent, _config$amount;
+      if (!config) return null;
+
+      // 后端字段不统一, 做下兼容
+      var percent = parseFloat((_ref = (_config$percent = config.percent) !== null && _config$percent !== void 0 ? _config$percent : config.percentage) !== null && _ref !== void 0 ? _ref : '0');
+      var amount = parseFloat((_config$amount = config.amount) !== null && _config$amount !== void 0 ? _config$amount : '0');
+      return {
+        percentStr: percent,
+        amountStr: amount
+      };
+    };
+    var visaDomesticFee = formatFee(visaDomestic);
+    var visaWorldFee = formatFee(visaWorld);
+    var masterDomesticFee = formatFee(masterDomestic);
+    var masterWorldFee = formatFee(masterWorld);
+
+    // 判断手续费是否一致的辅助函数
+    var isFeeSame = function isFeeSame(fee1, fee2) {
+      if (!fee1 || !fee2) return false;
+
+      // 判断百分比和固定金额是否一致
+      return fee1.percentStr === fee2.percentStr && fee1.amountStr === fee2.amountStr;
+    };
+
+    // 判断国内和国际手续费是否一致
+    var isDomesticSame = isFeeSame(visaDomesticFee, masterDomesticFee);
+    var isWorldSame = isFeeSame(visaWorldFee, masterWorldFee);
+    var isAllSame = isDomesticSame && isWorldSame;
+    return isAllSame;
+  } catch (error) {
+    return false;
+  }
+};
+
+/**
+ * @description: 计算手续费 百分比 * amount + 固定金额
+ * @param {any} config
+ * @param {number} amount
+ * @return {*}
+ */
+var totalFee = function totalFee(config, amount) {
+  var _config$percent2;
+  // 后端字段不统一?, 做下兼容
+  var percentageFee = parseFloat((_config$percent2 = config.percent) !== null && _config$percent2 !== void 0 ? _config$percent2 : config.percentage) * Number(amount);
+  var totalFee = percentageFee + parseFloat(config.amount);
+  return totalFee;
+};
+
+/**
+ * @description: 格式化visa/master手续费
+ * @param {any} item 支付列表项
+ * @param {number} amount 订单金额
+ * @param {boolean} isSame 手续费是否一致
+ * @return {*}
+ */
+export var formatCreditCardSurcharge = function formatCreditCardSurcharge(item, amount, isSame) {
+  try {
+    var surcharge_config = item.surcharge_config,
+      currency_symbol = item.currency_symbol;
+
+    // 格式化手续费列表
+    var formatSurchargeList = function formatSurchargeList(list) {
+      return list === null || list === void 0 ? void 0 : list.map(function (config) {
+        var _ref2, _config$percent3;
+        // 后端字段不统一, 做下兼容
+        var percentageFee = parseFloat((_ref2 = (_config$percent3 = config === null || config === void 0 ? void 0 : config.percent) !== null && _config$percent3 !== void 0 ? _config$percent3 : config === null || config === void 0 ? void 0 : config.percentage) !== null && _ref2 !== void 0 ? _ref2 : 0);
+        var percent = (percentageFee * 100).toFixed(2);
+        var amountFee = parseFloat(config === null || config === void 0 ? void 0 : config.amount).toFixed(2);
+        var _totalFee = totalFee(config, amount).toFixed(2);
+        var areaText = (config === null || config === void 0 ? void 0 : config.area) === 'world' ? 'tocPay.text.rest-of-world' : 'tocPay.text.domestic';
+        return _objectSpread(_objectSpread({}, config), {}, {
+          area_text: areaText,
+          surcharge_text: "".concat(percent, "% + ").concat(currency_symbol).concat(amountFee),
+          surcharge_fee: "".concat(currency_symbol).concat(_totalFee)
+        });
+      });
+    };
+    if (isSame) {
+      // 手续费一致 返回visa和master的其中一条手续费列表
+      var visaResult = surcharge_config.filter(function (config) {
+        return config.credit_card_type === 'visa';
+      });
+      return [{
+        icons: [visaIcon, creditCardIcon],
+        name: 'Visa / Mastercard',
+        lists: formatSurchargeList(visaResult)
+      }];
+    } else {
+      // 手续费不一致 分别返回visa和master的手续费列表
+      var _visaResult = surcharge_config.filter(function (config) {
+        return config.credit_card_type === 'visa';
+      });
+      var masterResult = surcharge_config.filter(function (config) {
+        return config.credit_card_type === 'master';
+      });
+      return [{
+        icons: [visaIcon],
+        name: 'Visa',
+        lists: formatSurchargeList(_visaResult)
+      }, {
+        icons: [creditCardIcon],
+        name: 'Mastercard',
+        lists: formatSurchargeList(masterResult)
+      }];
+    }
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+};
+
+/**
+ * @description: 格式化visa/master手续费列表
+ * @param {any} item
+ * @param {number} amount
+ * @return {*}
+ */
+export var formatCreditCardSurchargeList = function formatCreditCardSurchargeList(item, amount) {
+  var isSame = isCreditCardSurchargeSame((item === null || item === void 0 ? void 0 : item.surcharge_config) || []);
+  return formatCreditCardSurcharge(item || {}, amount, isSame);
+};
+
+/**
+ * @description: 格式化visa/master手续费文案，只显示百分比区间
+ * @return {*}
+ */
+export var formatCreditCardSurchargeText = function formatCreditCardSurchargeText(surcharge_config, surcharge_text) {
+  try {
+    if (!Array.isArray(surcharge_config) || surcharge_config.length === 0) {
+      return surcharge_text;
+    }
+
+    // 找出最小百分比和最大百分比
+    var percentList = surcharge_config.map(function (config) {
+      var _ref3, _config$percent4;
+      var percent = parseFloat((_ref3 = (_config$percent4 = config.percent) !== null && _config$percent4 !== void 0 ? _config$percent4 : config.percentage) !== null && _ref3 !== void 0 ? _ref3 : '0') * 100;
+      return Number(percent.toFixed(2));
+    });
+    var minPercent = Math.min.apply(Math, _toConsumableArray(percentList));
+    var maxPercent = Math.max.apply(Math, _toConsumableArray(percentList));
+
+    // 如果最大值和最小值相等，则直接使用其中一个
+    if (minPercent === maxPercent) {
+      return "".concat(surcharge_text).concat(minPercent, "%");
+    }
+    return "".concat(surcharge_text).concat(minPercent, "% ~ ").concat(maxPercent, "%");
+  } catch (error) {
+    return surcharge_text;
+  }
+};
+
 /**
  * @title: 计算支付列表的手续费
- * @description: 
+ * @description:
  * @param {any} paymentList
  * @param {number} amount
  * @return {*}
@@ -27,11 +207,7 @@ export var calculateSurcharge = function calculateSurcharge(paymentList, amount)
 
     // 分别计算出每一项的手续费  百分比 * amount + 固定金额
     var fees = surcharge_config.map(function (config) {
-      var _config$percent;
-      // 后端字段不统一?, 做下兼容
-      var percentageFee = parseFloat((_config$percent = config.percent) !== null && _config$percent !== void 0 ? _config$percent : config.percentage) * Number(amount);
-      var totalFee = percentageFee + parseFloat(config.amount);
-      return totalFee;
+      return totalFee(config, amount);
     });
 
     // 取出最小值和最大值
@@ -48,6 +224,12 @@ export var calculateSurcharge = function calculateSurcharge(paymentList, amount)
       // 不一致展示区间
       payment.surcharge = "".concat(surcharge_text).concat(currency_symbol).concat(minFee.toFixed(2), " ~ ").concat(currency_symbol).concat(maxFee.toFixed(2));
     }
+
+    // visa/master手续费特殊处理
+    if (payment.service === 'mw.credit_card') {
+      payment.surcharge = formatCreditCardSurchargeText(surcharge_config, surcharge_text);
+      payment.surcharge_config_result = formatCreditCardSurchargeList(payment, amount);
+    }
     return payment;
   });
 };

package/es/components/pay/toC/PaymentMethods/BankDeposit/index.js

@@ -86,9 +86,7 @@ var BankDeposit = function BankDeposit(props, ref) {
 
             // 在跳转前发送日志
             paymentLogger.sendLogs('BankDepositH5跳转成功');
-
-            // h5打开银行转账页面
-            state.history.push(_href);
+            window.location.href = _href;
             _context.next = 21;
             break;
           case 17: