@pisell/private-materials 3.0.112 → 3.0.113

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

@@ -153,17 +153,20 @@ var PaymentList = function PaymentList(props, ref) {
     // 过滤数据
     var paymentList = (_filterPaymentList = filterPaymentList(list, platform)) === null || _filterPaymentList === void 0 ? void 0 : _filterPaymentList.paymentList;
 
-    // 默认支付
-    var first = paymentList[0];
+    // 当支付方式大于1的时候
+    if (paymentList.length > 1) {
+      // 默认支付
+      var first = paymentList[0];
 
-    // 设置支付列表
-    setPaymentList(paymentList);
+      // 设置支付列表
+      setPaymentList(paymentList);
 
-    // 设置默认的支付方式
-    paymentTypeChange(first.service, first);
+      // 设置默认的支付方式
+      paymentTypeChange(first.service, first);
 
-    // 如果只有一个支付方式, 则直接支付
-    isAutoPayment(paymentList);
+      // 如果只有一个支付方式, 则直接支付
+      isAutoPayment(paymentList);
+    }
 
     // 解除loading
     setLoading(false);
@@ -259,7 +262,7 @@ var PaymentList = function PaymentList(props, ref) {
     // 没有支付方式展示空
     if (!_paymentList.length) {
       return /*#__PURE__*/React.createElement(PisellEmpty, {
-        extraDescription: locales.getText('tocPay.text.noAvailablePaymentMethods')
+        description: locales.getText('tocPay.text.noAvailablePaymentMethods')
       });
     }
     return /*#__PURE__*/React.createElement(PisellCheckboxGroup, {

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

@@ -27,8 +27,9 @@ export var calculateSurcharge = function calculateSurcharge(paymentList, amount)
 
     // 分别计算出每一项的手续费  百分比 * amount + 固定金额
     var fees = surcharge_config.map(function (config) {
+      var _config$percent;
       // 后端字段不统一?, 做下兼容
-      var percentageFee = parseFloat(config.percent || config.percentage) * Number(amount);
+      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;
     });

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

@@ -207,16 +207,17 @@ var ToCPay = function ToCPay(props, ref) {
             setTimeout(function () {
               setLoading(false);
             }, 100);
-            _context2.next = 14;
+            _context2.next = 15;
             break;
           case 11:
             _context2.prev = 11;
             _context2.t0 = _context2["catch"](0);
+            console.log('err', _context2.t0);
             payCallback({
               key: 'fail',
               data: {}
             });
-          case 14:
+          case 15:
           case "end":
             return _context2.stop();
         }

package/es/components/pay/toC/locales.d.ts

@@ -65,6 +65,7 @@ declare const _default: {
         'tocPay.text.walletPassCompleteTitle': string;
         'tocPay.text.walletPassNoExtraPay': string;
         'tocPay.text.walletCanPay': string;
+        'tocPay.text.paymentInstructions': string;
         'tocPay.text.walletSearchEmpty': string;
     };
     'zh-CN': {

package/es/components/pay/toC/locales.js

@@ -65,6 +65,7 @@ export default {
     'tocPay.text.walletPassCompleteTitle': 'Please click ‘Submit’ button at the bottom to complete',
     'tocPay.text.walletPassNoExtraPay': 'No extra pay needed',
     'tocPay.text.walletCanPay': 'You can use the balance in your wallet pass or other eligible types of voucher to pay.',
+    'tocPay.text.paymentInstructions': 'Instructions',
     'tocPay.text.walletSearchEmpty': 'No results found.'
   },
   'zh-CN': {
@@ -119,7 +120,7 @@ export default {
     'tocPay.text.searchResult': '搜索结果',
     'tocPay.text.select': '选择',
     'tocPay.text.couponCodesAdded': '编码添加',
-    'tocPay.text.redeem': '核销',
+    'tocPay.text.redeem': '兑换',
     'tocPay.text.howToPay': '您想如何付款？',
     'tocPay.text.congrats': '恭喜，您钱包内有',
     'tocPay.text.creditHaveBeen': '可以用于支付订单金额。',
@@ -127,7 +128,7 @@ export default {
     'tocPay.text.scanBarQrCode': '扫描条形码/二维码',
     'tocPay.text.enterCodes': '输入编码',
     'tocPay.text.searchDescribe': '请输入卡片编码或发行编码',
-    'tocPay.text.walletPassEmpty': '没有可使用的卡片，请以扫描或搜索卡片',
+    'tocPay.text.walletPassEmpty': '没有可使用的卡片，请扫描或搜索卡片',
     'tocPay.text.walletPassDisabled': '不可用',
     'tocPay.text.walletPassPermanent': '永久有效',
     'tocPay.text.walletPassCompleteTitle': '请点击底部的“提交”按钮完成支付',
@@ -187,7 +188,7 @@ export default {
     'tocPay.text.searchResult': '搜索結果',
     'tocPay.text.select': '選擇',
     'tocPay.text.couponCodesAdded': '編碼添加',
-    'tocPay.text.redeem': '核銷',
+    'tocPay.text.redeem': '兌換',
     'tocPay.text.howToPay': '您想如何付款？',
     'tocPay.text.congrats': '恭喜，您錢包內有',
     'tocPay.text.creditHaveBeen': '可以用於支付訂單金額。',
@@ -195,7 +196,7 @@ export default {
     'tocPay.text.scanBarQrCode': '掃描條形碼/二維碼',
     'tocPay.text.enterCodes': '輸入編碼',
     'tocPay.text.searchDescribe': '請輸入卡片編碼或發行編碼',
-    'tocPay.text.walletPassEmpty': '沒有可使用的卡片，請以掃描或搜尋卡片',
+    'tocPay.text.walletPassEmpty': '沒有可使用的卡片，請掃描或搜尋卡片',
     'tocPay.text.walletPassDisabled': '不可用',
     'tocPay.text.walletPassPermanent': '永久有效',
     'tocPay.text.walletPassCompleteTitle': '請點擊底部的“提交”按鈕完成支付',

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

@@ -90,10 +90,12 @@ var PaymentList = (props, ref) => {
     setLoading(true);
     const platform = ((_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform) || "h5";
     const paymentList2 = (_c = (0, import_serve.filterPaymentList)(list, platform)) == null ? void 0 : _c.paymentList;
-    let first = paymentList2[0];
-    setPaymentList(paymentList2);
-    paymentTypeChange(first.service, first);
-    isAutoPayment(paymentList2);
+    if (paymentList2.length > 1) {
+      let first = paymentList2[0];
+      setPaymentList(paymentList2);
+      paymentTypeChange(first.service, first);
+      isAutoPayment(paymentList2);
+    }
     setLoading(false);
     return paymentList2;
   };
@@ -145,9 +147,7 @@ var PaymentList = (props, ref) => {
       return /* @__PURE__ */ import_react.default.createElement(
         import_materials.PisellEmpty,
         {
-          extraDescription: import_utils2.locales.getText(
-            "tocPay.text.noAvailablePaymentMethods"
-          )
+          description: import_utils2.locales.getText("tocPay.text.noAvailablePaymentMethods")
         }
       );
     }

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

@@ -30,7 +30,7 @@ var calculateSurcharge = (paymentList, amount) => {
       return payment;
     }
     const fees = surcharge_config.map((config) => {
-      const percentageFee = parseFloat(config.percent || config.percentage) * Number(amount);
+      const percentageFee = parseFloat(config.percent ?? config.percentage) * Number(amount);
       const totalFee = percentageFee + parseFloat(config.amount);
       return totalFee;
     });

package/lib/components/pay/toC/index.js

@@ -131,6 +131,7 @@ var ToCPay = (props, ref) => {
         setLoading(false);
       }, 100);
     } catch (err) {
+      console.log("err", err);
       payCallback({ key: "fail", data: {} });
     }
   };

package/lib/components/pay/toC/locales.d.ts

@@ -65,6 +65,7 @@ declare const _default: {
         'tocPay.text.walletPassCompleteTitle': string;
         'tocPay.text.walletPassNoExtraPay': string;
         'tocPay.text.walletCanPay': string;
+        'tocPay.text.paymentInstructions': string;
         'tocPay.text.walletSearchEmpty': string;
     };
     'zh-CN': {

package/lib/components/pay/toC/locales.js

@@ -89,6 +89,7 @@ var locales_default = {
     "tocPay.text.walletPassCompleteTitle": "Please click ‘Submit’ button at the bottom to complete",
     "tocPay.text.walletPassNoExtraPay": "No extra pay needed",
     "tocPay.text.walletCanPay": "You can use the balance in your wallet pass or other eligible types of voucher to pay.",
+    "tocPay.text.paymentInstructions": "Instructions",
     "tocPay.text.walletSearchEmpty": "No results found."
   },
   "zh-CN": {
@@ -143,7 +144,7 @@ var locales_default = {
     "tocPay.text.searchResult": "搜索结果",
     "tocPay.text.select": "选择",
     "tocPay.text.couponCodesAdded": "编码添加",
-    "tocPay.text.redeem": "核销",
+    "tocPay.text.redeem": "兑换",
     "tocPay.text.howToPay": "您想如何付款？",
     "tocPay.text.congrats": "恭喜，您钱包内有",
     "tocPay.text.creditHaveBeen": "可以用于支付订单金额。",
@@ -151,7 +152,7 @@ var locales_default = {
     "tocPay.text.scanBarQrCode": "扫描条形码/二维码",
     "tocPay.text.enterCodes": "输入编码",
     "tocPay.text.searchDescribe": "请输入卡片编码或发行编码",
-    "tocPay.text.walletPassEmpty": "没有可使用的卡片，请以扫描或搜索卡片",
+    "tocPay.text.walletPassEmpty": "没有可使用的卡片，请扫描或搜索卡片",
     "tocPay.text.walletPassDisabled": "不可用",
     "tocPay.text.walletPassPermanent": "永久有效",
     "tocPay.text.walletPassCompleteTitle": "请点击底部的“提交”按钮完成支付",
@@ -211,7 +212,7 @@ var locales_default = {
     "tocPay.text.searchResult": "搜索結果",
     "tocPay.text.select": "選擇",
     "tocPay.text.couponCodesAdded": "編碼添加",
-    "tocPay.text.redeem": "核銷",
+    "tocPay.text.redeem": "兌換",
     "tocPay.text.howToPay": "您想如何付款？",
     "tocPay.text.congrats": "恭喜，您錢包內有",
     "tocPay.text.creditHaveBeen": "可以用於支付訂單金額。",
@@ -219,7 +220,7 @@ var locales_default = {
     "tocPay.text.scanBarQrCode": "掃描條形碼/二維碼",
     "tocPay.text.enterCodes": "輸入編碼",
     "tocPay.text.searchDescribe": "請輸入卡片編碼或發行編碼",
-    "tocPay.text.walletPassEmpty": "沒有可使用的卡片，請以掃描或搜尋卡片",
+    "tocPay.text.walletPassEmpty": "沒有可使用的卡片，請掃描或搜尋卡片",
     "tocPay.text.walletPassDisabled": "不可用",
     "tocPay.text.walletPassPermanent": "永久有效",
     "tocPay.text.walletPassCompleteTitle": "請點擊底部的“提交”按鈕完成支付",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.112",
+  "version": "3.0.113",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.28",
-    "@pisell/icon": "0.0.11",
     "@pisell/materials": "3.0.36",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.97"
   },
   "peerDependencies": {