@pisell/private-materials 3.4.53 → 3.4.55

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/PaymentMethods/components/PaymentReturnContent/index.js

@@ -130,6 +130,8 @@ var PaymentReturnContent = function PaymentReturnContent(_ref) {
     src: "".concat(prefix, "/payment-content.png"),
     alt: "success"
   })), /*#__PURE__*/React.createElement("div", {
+    className: "payment-return-content-text"
+  }, locales.getText('tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater')), /*#__PURE__*/React.createElement("div", {
     className: "payment-return-content-buttons"
   }, /*#__PURE__*/React.createElement(Button, {
     block: true,

package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less

@@ -1,16 +1,26 @@
 .payment-return-content {
   padding: 100px 46px 0;
+  max-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
 
   .payment-return-content-img {
     width: 100%;
-    margin-bottom: 60px;
     min-height: 270px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     img {
-      width: 100%;
+      max-width: 100%;
       height: 100%;
+      max-height: 480px;
     }
   }
-  
+  .payment-return-content-text {
+    color: var(--Gray-600, #475467);
+    text-align: center;
+  }
   .payment-return-content-buttons {
     display: flex;
     flex-direction: column;

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/pay/toC/locales.d.ts

@@ -97,6 +97,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -195,6 +196,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -293,6 +295,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
 };
 export default _default;

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

@@ -116,7 +116,8 @@ export default {
     'tocPay.text.viewDetail': 'View detail',
     'tocPay.text.returnAndSelectOtherPaymentMethod': 'Go Back / Choose Another Payment',
     'tocPay.text.paymentCompletedAndViewOrder': 'Payment Completed / View Order',
-    'tocPay.text.paymentFailed': 'Not paid yet, please check if the payment is successful'
+    'tocPay.text.paymentFailed': 'Not paid yet, please check if the payment is successful',
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': 'We are verifying your payment. Please check your order status later.'
   },
   'zh-CN': {
     'tocPay.text.checkout': '结账',
@@ -234,7 +235,8 @@ export default {
     'tocPay.text.viewDetail': '查看详情',
     'tocPay.text.returnAndSelectOtherPaymentMethod': '返回 / 选择其他支付方式',
     'tocPay.text.paymentCompletedAndViewOrder': '支付完成 / 查看订单',
-    'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功"
+    'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功",
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我们正在确认您的支付状态，请稍后查看订单状态。'
   },
   'zh-HK': {
     'tocPay.text.checkout': '結帳',
@@ -352,6 +354,7 @@ export default {
     'tocPay.text.viewDetail': '查看詳情',
     'tocPay.text.returnAndSelectOtherPaymentMethod': '返回 / 選擇其他支付方式',
     'tocPay.text.paymentCompletedAndViewOrder': '支付完成 / 查看訂單',
-    'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功"
+    'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功",
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我們正在確認您的支付狀態，請稍後查看訂單狀態。'
   }
 };

package/es/plus/walletPassGallery/serve.js

@@ -218,6 +218,8 @@ export var getDetailApi = /*#__PURE__*/function () {
             order_behavior_count: 1,
             // 订单行为次数
             order_behavior_count_customer: 1 // 客户订单行为次数
+          }, {
+            isOriginHost: true
           });
         case 2:
           _yield$request$getReq6 = _context6.sent;

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/PaymentMethods/components/PaymentReturnContent/index.js

@@ -83,6 +83,6 @@ var PaymentReturnContent = ({
       });
     }
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-img" }, /* @__PURE__ */ import_react.default.createElement("img", { src: `${prefix}/payment-content.png`, alt: "success" })), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-buttons" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, className: "payment-return-content-order-button", onClick: handleViewOrder }, import_utils.locales.getText("tocPay.text.paymentCompletedAndViewOrder")), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, onClick: handleGoBack }, import_utils.locales.getText("tocPay.text.returnAndSelectOtherPaymentMethod"))));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-img" }, /* @__PURE__ */ import_react.default.createElement("img", { src: `${prefix}/payment-content.png`, alt: "success" })), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-text" }, import_utils.locales.getText("tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater")), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-buttons" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, className: "payment-return-content-order-button", onClick: handleViewOrder }, import_utils.locales.getText("tocPay.text.paymentCompletedAndViewOrder")), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, onClick: handleGoBack }, import_utils.locales.getText("tocPay.text.returnAndSelectOtherPaymentMethod"))));
 };
 var PaymentReturnContent_default = PaymentReturnContent;

package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less

@@ -1,16 +1,26 @@
 .payment-return-content {
   padding: 100px 46px 0;
+  max-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
 
   .payment-return-content-img {
     width: 100%;
-    margin-bottom: 60px;
     min-height: 270px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     img {
-      width: 100%;
+      max-width: 100%;
       height: 100%;
+      max-height: 480px;
     }
   }
-  
+  .payment-return-content-text {
+    color: var(--Gray-600, #475467);
+    text-align: center;
+  }
   .payment-return-content-buttons {
     display: flex;
     flex-direction: column;

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/pay/toC/locales.d.ts

@@ -97,6 +97,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -195,6 +196,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -293,6 +295,7 @@ declare const _default: {
         'tocPay.text.returnAndSelectOtherPaymentMethod': string;
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
+        'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
     };
 };
 export default _default;

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

@@ -120,7 +120,8 @@ var locales_default = {
     "tocPay.text.viewDetail": "View detail",
     "tocPay.text.returnAndSelectOtherPaymentMethod": "Go Back / Choose Another Payment",
     "tocPay.text.paymentCompletedAndViewOrder": "Payment Completed / View Order",
-    "tocPay.text.paymentFailed": "Not paid yet, please check if the payment is successful"
+    "tocPay.text.paymentFailed": "Not paid yet, please check if the payment is successful",
+    "tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater": "We are verifying your payment. Please check your order status later."
   },
   "zh-CN": {
     "tocPay.text.checkout": "结账",
@@ -218,7 +219,8 @@ var locales_default = {
     "tocPay.text.viewDetail": "查看详情",
     "tocPay.text.returnAndSelectOtherPaymentMethod": "返回 / 选择其他支付方式",
     "tocPay.text.paymentCompletedAndViewOrder": "支付完成 / 查看订单",
-    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功"
+    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功",
+    "tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater": "我们正在确认您的支付状态，请稍后查看订单状态。"
   },
   "zh-HK": {
     "tocPay.text.checkout": "結帳",
@@ -316,6 +318,7 @@ var locales_default = {
     "tocPay.text.viewDetail": "查看詳情",
     "tocPay.text.returnAndSelectOtherPaymentMethod": "返回 / 選擇其他支付方式",
     "tocPay.text.paymentCompletedAndViewOrder": "支付完成 / 查看訂單",
-    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功"
+    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功",
+    "tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater": "我們正在確認您的支付狀態，請稍後查看訂單狀態。"
   }
 };

package/lib/plus/walletPassGallery/serve.js

@@ -74,6 +74,8 @@ var getDetailApi = async (params) => {
     // 订单行为次数
     order_behavior_count_customer: 1
     // 客户订单行为次数
+  }, {
+    isOriginHost: true
   });
   return data;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.4.53",
+  "version": "3.4.55",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,8 +61,8 @@
     "decimal.js": "^10.4.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/materials": "3.3.69",
     "@pisell/date-picker": "3.0.3",
+    "@pisell/materials": "3.3.70",
     "@pisell/icon": "0.0.11",
     "@pisell/utils": "3.0.1"
   },