@pisell/private-materials 6.3.43 → 6.3.45

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

@@ -476,16 +476,7 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
   // 返回iframe
   return new Promise(function (res, rej) {
     var timer = null;
-
-    // 120秒没成功 认为失败
-    timer = setTimeout(function () {
-      log({
-        msg: '第五步: 60秒超时则走N逻辑',
-        data: challengeData
-      });
-      rej('time out');
-    }, 2 * 60 * 1000);
-    window.addEventListener('message', function (event) {
+    var handleMessage = function handleMessage(event) {
       // loadingSpinnerAnimation("on");
       if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
         if (typeof event.data.cres == 'string') {
@@ -496,7 +487,18 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
           closeIframe();
         }
       }
-    }, false);
+    };
+
+    // 120秒没成功 认为失败
+    timer = setTimeout(function () {
+      log({
+        msg: '第五步: 60秒超时则走N逻辑',
+        data: challengeData
+      });
+      window.removeEventListener('message', handleMessage);
+      rej('time out');
+    }, 2 * 60 * 1000);
+    window.addEventListener('message', handleMessage, false);
   });
 };
 

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

@@ -511,7 +511,8 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: 'paymentInit'
               }
             });
-          case 18:
+            throw _context5.t0;
+          case 19:
           case "end":
             return _context5.stop();
         }

package/es/components/walletList/index.js

@@ -465,9 +465,9 @@ var WalletList = Provider(function (props) {
               cachedList = getFromLocalStorage(STORAGE_KEY);
               cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
               // 避免使用旧版数据
-              if (!Array.isArray(cachedBalance) || !cachedBalance.some(function () {
-                var _items, _items$hasOwnProperty;
-                return (_items = items) === null || _items === void 0 || (_items$hasOwnProperty = _items.hasOwnProperty) === null || _items$hasOwnProperty === void 0 ? void 0 : _items$hasOwnProperty.call(_items, 'gift_card_balance');
+              if (!Array.isArray(cachedBalance) || !cachedBalance.some(function (item) {
+                var _item$hasOwnProperty;
+                return (_item$hasOwnProperty = item.hasOwnProperty) === null || _item$hasOwnProperty === void 0 ? void 0 : _item$hasOwnProperty.call(item, 'gift_card_balance');
               })) {
                 cachedBalance = null;
               }
@@ -641,12 +641,12 @@ var WalletList = Provider(function (props) {
       console.error('onViewPinClick方法需要传入wallet_detail_id');
     }
   };
-  var renderWalletCard = function renderWalletCard(_walletItem) {
+  var renderWalletCard = function renderWalletCard(item) {
     var _dvaStore$core;
-    var code = _walletItem.code,
-      shop = _walletItem.shop,
-      wallet = _walletItem.wallet,
-      id = _walletItem.id;
+    var code = item.code,
+      shop = item.shop,
+      wallet = item.wallet,
+      id = item.id;
     var _ref5 = wallet || {},
       metadata = _ref5.metadata,
       name = _ref5.name;
@@ -661,7 +661,7 @@ var WalletList = Provider(function (props) {
     var _state$balance = state.balance,
       balance = _state$balance === void 0 ? [] : _state$balance;
     var balanceItem = balance.find(function (bi) {
-      return bi.wallet_id == _walletItem.wallet_id;
+      return bi.wallet_id == item.wallet_id;
     }) || DEFAULT_BALANCE;
 
     // 字段映射关系
@@ -671,10 +671,10 @@ var WalletList = Provider(function (props) {
       voucher: 'voucher_count',
       discount: 'discount_card_count'
     };
-    var cardItems = showcaseWalletPassNew.map(function (item) {
-      var balanceKey = _balanceKeyMap[item.type];
+    var cardItems = showcaseWalletPassNew.map(function (showCaseItem) {
+      var balanceKey = _balanceKeyMap[showCaseItem.type];
       var value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
-      return _objectSpread(_objectSpread({}, item), {}, {
+      return _objectSpread(_objectSpread({}, showCaseItem), {}, {
         value: value
       });
     });

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

@@ -311,26 +311,28 @@ var createChallengeIframe = (challengeData, callback) => {
   };
   return new Promise((res, rej) => {
     let timer = null;
+    const handleMessage = (event) => {
+      if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
+        if (typeof event.data.cres == "string") {
+          if (timer) {
+            clearTimeout(timer);
+          }
+          res(event.data.cres);
+          closeIframe();
+        }
+      }
+    };
     timer = setTimeout(() => {
       log({
         msg: "第五步: 60秒超时则走N逻辑",
         data: challengeData
       });
+      window.removeEventListener("message", handleMessage);
       rej("time out");
     }, 2 * 60 * 1e3);
     window.addEventListener(
       "message",
-      (event) => {
-        if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
-          if (typeof event.data.cres == "string") {
-            if (timer) {
-              clearTimeout(timer);
-            }
-            res(event.data.cres);
-            closeIframe();
-          }
-        }
-      },
+      handleMessage,
       false
     );
   });

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

@@ -325,6 +325,7 @@ var ToCPay = (props, ref) => {
           fn: "paymentInit"
         }
       });
+      throw err;
     }
   };
   const waitAmount = (0, import_react.useMemo)(() => {

package/lib/components/walletList/index.js

@@ -321,10 +321,12 @@ var WalletList = (0, import_model.Provider)((props) => {
     try {
       cachedList = getFromLocalStorage(STORAGE_KEY);
       cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
-      if (!Array.isArray(cachedBalance) || !cachedBalance.some(() => {
-        var _a3;
-        return (_a3 = items == null ? void 0 : items.hasOwnProperty) == null ? void 0 : _a3.call(items, "gift_card_balance");
-      })) {
+      if (!Array.isArray(cachedBalance) || !cachedBalance.some(
+        (item) => {
+          var _a3;
+          return (_a3 = item.hasOwnProperty) == null ? void 0 : _a3.call(item, "gift_card_balance");
+        }
+      )) {
         cachedBalance = null;
       }
     } catch (e) {
@@ -341,7 +343,7 @@ var WalletList = (0, import_model.Provider)((props) => {
       if (!isMountedRef.current) return;
       const walletListData = await (0, import_serve.getWalletList)();
       const walletBalanceData = await (0, import_serve.batchGetWalletBalance)(
-        walletListData.map((item2) => item2.wallet_id)
+        walletListData.map((item) => item.wallet_id)
       );
       if (!isMountedRef.current || requestIdRef.current !== requestId) return;
       if (walletListData) {
@@ -377,7 +379,7 @@ var WalletList = (0, import_model.Provider)((props) => {
             }
             if (!walletBalanceData) {
               retryBalanceData = await (0, import_serve.batchGetWalletBalance)(
-                retryListData.map((item2) => item2.wallet_id)
+                retryListData.map((item) => item.wallet_id)
               );
               if (retryBalanceData) {
                 try {
@@ -428,9 +430,9 @@ var WalletList = (0, import_model.Provider)((props) => {
       console.error("onViewPinClick方法需要传入wallet_detail_id");
     }
   };
-  const renderWalletCard = (_walletItem) => {
+  const renderWalletCard = (item) => {
     var _a2;
-    const { code, shop, wallet, id } = _walletItem;
+    const { code, shop, wallet, id } = item;
     const { metadata, name } = wallet || {};
     const {
       showcaseWalletPassNew = [],
@@ -439,18 +441,18 @@ var WalletList = (0, import_model.Provider)((props) => {
     } = metadata || {};
     const { name: shopName } = shop;
     const { balance = [] } = state;
-    const balanceItem = balance.find((bi) => bi.wallet_id == _walletItem.wallet_id) || DEFAULT_BALANCE;
+    const balanceItem = balance.find((bi) => bi.wallet_id == item.wallet_id) || DEFAULT_BALANCE;
     const _balanceKeyMap = {
       rechargeable: "gift_card_balance",
       point: "point_card_balance",
       voucher: "voucher_count",
       discount: "discount_card_count"
     };
-    const cardItems = showcaseWalletPassNew.map((item2) => {
-      const balanceKey = _balanceKeyMap[item2.type];
+    const cardItems = showcaseWalletPassNew.map((showCaseItem) => {
+      const balanceKey = _balanceKeyMap[showCaseItem.type];
       let value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
       return {
-        ...item2,
+        ...showCaseItem,
         value
       };
     });
@@ -538,7 +540,7 @@ var WalletList = (0, import_model.Provider)((props) => {
     ]
   };
   const renderBalanceCard = (0, import_react.useCallback)((balance) => {
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-balance-card", key: balance.id }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-title" }, balance.name), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-value" }, balance.value)), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-content" }, balance.items && balance.items.map((item2) => /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item", key: item2.key }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-label" }, item2.label), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-value" }, item2.value)))));
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-balance-card", key: balance.id }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-title" }, balance.name), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-value" }, balance.value)), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-content" }, balance.items && balance.items.map((item) => /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item", key: item.key }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-label" }, item.label), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-value" }, item.value)))));
   }, []);
   const isShowGuide = (0, import_react.useMemo)(() => {
     var _a2;
@@ -557,7 +559,7 @@ var WalletList = (0, import_model.Provider)((props) => {
         ...globalState,
         walletGuideConfig: (globalState == null ? void 0 : globalState.walletGuideConfig) || (0, import_status.defaultWalletGuideConfig)()
       }
-    ) : /* @__PURE__ */ import_react.default.createElement(import_materials.Carousel, { ref: carouselRef, ...carouselProps }, list.map((item2) => renderWalletCard(item2)))), list && list.length > 1 && isUserLoggedIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-navigation" }, /* @__PURE__ */ import_react.default.createElement(
+    ) : /* @__PURE__ */ import_react.default.createElement(import_materials.Carousel, { ref: carouselRef, ...carouselProps }, list.map((item) => renderWalletCard(item)))), list && list.length > 1 && isUserLoggedIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-navigation" }, /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: `wallet-nav-button wallet-prev ${currentIndex === 0 ? "disabled" : ""}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.43",
+  "version": "6.3.45",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",