@alipay/ams-checkout 0.0.1730706734-dev.1 → 0.0.1730706734-dev.11

package/esm/config/index.d.ts

@@ -5,10 +5,10 @@ export declare const sdkVersion: string;
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  */
-export declare const AMSCheckoutAppVersion = "1.23.0";
-export declare const AMSAutoDebitAppVersion = "1.23.0";
-export declare const AMSEasyPayAppVersion = "1.23.0";
-export declare const AMSCashierPaymentAppVersion = "1.23.0";
-export declare const AMSVaultingAppVersion = "1.23.0";
-export declare const AMSPaymentElementAppVersion = "1.23.0";
-export declare const ADDRESSElementAppVersion = "1.23.0";
+export declare const AMSCheckoutAppVersion = "1.24.0";
+export declare const AMSAutoDebitAppVersion = "1.24.0";
+export declare const AMSEasyPayAppVersion = "1.24.0";
+export declare const AMSCashierPaymentAppVersion = "1.24.0";
+export declare const AMSVaultingAppVersion = "1.24.0";
+export declare const AMSPaymentElementAppVersion = "1.24.0";
+export declare const ADDRESSElementAppVersion = "1.24.0";

package/esm/config/index.js

@@ -26,19 +26,19 @@ export var elementAppMarmotMap = {
   dev: 'http://page.alipay.net/page/antom-web-checkout-v2',
   sit: 'http://page.test.alipay.net/page/antom-web-checkout-v2',
   pre: 'https://pre.ac.alipay.com/page/antom-web-checkout-v2',
-  sandbox: 'https://ac.alipay.com/page/antom-web-checkout-v2',
-  light_sandbox: 'https://ac.alipay.com/page/antom-web-checkout-v2',
-  prod: 'https://ac.alipay.com/page/antom-web-checkout-v2'
+  sandbox: 'https://checkout.antom.com',
+  light_sandbox: 'https://checkout.antom.com',
+  prod: 'https://checkout.antom.com'
 };
 export var sdkVersion = json.version;
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。
  */
-export var AMSCheckoutAppVersion = '1.23.0'; // 兜底版本号
-export var AMSAutoDebitAppVersion = '1.23.0'; // 代扣
-export var AMSEasyPayAppVersion = '1.23.0'; // easypay
-export var AMSCashierPaymentAppVersion = '1.23.0'; // 收银台（卡、apm）
-export var AMSVaultingAppVersion = '1.23.0'; // 绑卡
-export var AMSPaymentElementAppVersion = '1.23.0'; // payment element
-export var ADDRESSElementAppVersion = '1.23.0'; // address element
+export var AMSCheckoutAppVersion = '1.24.0'; // 兜底版本号
+export var AMSAutoDebitAppVersion = '1.24.0'; // 代扣
+export var AMSEasyPayAppVersion = '1.24.0'; // easypay
+export var AMSCashierPaymentAppVersion = '1.24.0'; // 收银台（卡、apm）
+export var AMSVaultingAppVersion = '1.24.0'; // 绑卡
+export var AMSPaymentElementAppVersion = '1.24.0'; // payment element
+export var ADDRESSElementAppVersion = '1.24.0'; // address element

package/esm/core/component/ckp/index.js

@@ -13,12 +13,13 @@ var CKP_PAYMENT_PAGE_HOST = {
   DEV: 'https://dev.page.alipay.net',
   TEST: 'https://test.page.alipay.net',
   PRE: 'https://pre.ac.alipay.com',
-  PROD: 'https://ac.alipay.com'
+  PROD: 'https://checkout.antom.com'
 };
 
 // for local development
 
 var CKP_PAGE_ADDRESS = '/page/antom-web-checkout-v2/checkout-page/pages/payment/index.html';
+var CKP_PAGE_NEW_ADDRESS = '/checkout-page/pages/payment/index.html';
 export var getCKPPageAddress = function getCKPPageAddress(env) {
   switch (env) {
     case 'dev':
@@ -30,7 +31,7 @@ export var getCKPPageAddress = function getCKPPageAddress(env) {
     case 'prod':
     case 'sandbox':
     case 'light_sandbox':
-      return "".concat(CKP_PAYMENT_PAGE_HOST.PROD).concat(CKP_PAGE_ADDRESS);
+      return "".concat(CKP_PAYMENT_PAGE_HOST.PROD).concat(CKP_PAGE_NEW_ADDRESS);
     default:
       // for local development, e.g. http://localhost:5173/checkout-page/src/pages/payment/index.html
       return env;

package/esm/core/component/element/components/auth.js

@@ -23,7 +23,8 @@ export var ElementAuthComponent = /*#__PURE__*/function () {
         try {
           var selector = options.selector,
             url = options.url;
-          var containerSelector = "antom-sdk-web-app-".concat(selector);
+          var containerId = (selector === null || selector === void 0 ? void 0 : selector.indexOf('#')) === -1 ? selector : selector.slice(1);
+          var containerSelector = "antom-sdk-web-app-".concat(containerId);
           var container = createInlineBaseElement(selector);
           var webApp = createIframe(containerSelector);
           webApp.src = url;

package/esm/core/component/element/index.js

@@ -22,7 +22,8 @@ import { parseSessionData } from "../index";
 import { ElementAddressComponent } from "./components/address";
 import { ElementAuthComponent } from "./components/auth";
 import { ElementPaymentComponent } from "./components/payment";
-// import { oneAccount, sdkAction } from './mock';
+import { EVENT as ConstantEvent } from "../../../constant";
+// import { oneAccount, sdkAction, submitResult } from './mock';
 
 import { addressTheme, ELEMENT_ENVIRONMENT, ThemeType } from "./type";
 var ElementProcessor = /*#__PURE__*/function () {
@@ -292,7 +293,11 @@ export var ElementComponent = /*#__PURE__*/function () {
           // TODO dev环境submit提交接口超时
           'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
         }).then(function (result) {
-          console.log('element submit result ------', result);
+          var _result$codeFormViews, _result$actionForm;
+          if (result !== null && result !== void 0 && result.codeFormViews && result !== null && result !== void 0 && (_result$codeFormViews = result.codeFormViews) !== null && _result$codeFormViews !== void 0 && (_result$codeFormViews = _result$codeFormViews[0]) !== null && _result$codeFormViews !== void 0 && _result$codeFormViews.codeExpireTime && result !== null && result !== void 0 && result.actionForm && !(result !== null && result !== void 0 && (_result$actionForm = result.actionForm) !== null && _result$actionForm !== void 0 && _result$actionForm.paymentCodeExpireTime)) {
+            var _result$codeFormViews2;
+            result.actionForm.paymentCodeExpireTime = result === null || result === void 0 || (_result$codeFormViews2 = result.codeFormViews) === null || _result$codeFormViews2 === void 0 || (_result$codeFormViews2 = _result$codeFormViews2[0]) === null || _result$codeFormViews2 === void 0 ? void 0 : _result$codeFormViews2.codeExpireTime;
+          }
           if (result.errorCode === ConnectErrorCode.RISK_REJECT) {
             _this4.onSubmitRiskFunc(ElementPaymentMethod.ADDRESS_ELEMENT);
             _this4.onSubmitRiskFunc(ElementPaymentMethod.AUTH_ELEMENT);
@@ -317,14 +322,14 @@ export var ElementComponent = /*#__PURE__*/function () {
       });
     });
     // 发送validate消息
-    _defineProperty(this, "onValidateFunc", function (target) {
+    _defineProperty(this, "onValidateFunc", function (target, params) {
       return new Promise(function (resolve) {
         _this4.eventService.emitAndListen({
           event: ElementPaymentEvent.VALIDATE,
           data: {
             target: target,
             source: ElementPaymentMethod.CONTAINER_ELEMENT,
-            params: {}
+            params: params
           }
         }, function (result) {
           resolve(result);
@@ -372,38 +377,46 @@ export var ElementComponent = /*#__PURE__*/function () {
                 }
                 return _context.abrupt("return", resolve(undefined));
               case 17:
-                if (!_this4.launchSource.includes(ElementPaymentMethod.PAYMENT_ELEMENT)) {
-                  _context.next = 26;
+                if (!(_this4.launchSource.includes(ElementPaymentMethod.PAYMENT_ELEMENT) || !_this4.isConnect)) {
+                  _context.next = 32;
                   break;
                 }
-                _context.next = 20;
-                return _this4.onValidateFunc(ElementPaymentMethod.PAYMENT_ELEMENT);
-              case 20:
+                _context.prev = 18;
+                _context.next = 21;
+                return _this4.onValidateFunc(ElementPaymentMethod.PAYMENT_ELEMENT, params);
+              case 21:
                 _result2 = _context.sent;
-                console.log('element submit validate payment---------', _result2);
+                console.log('element submit validate payment---------', _result2, _this4.isConnect);
                 params.paymentFactors = (_result2$data = _result2.data) === null || _result2$data === void 0 || (_result2$data = _result2$data.data) === null || _result2$data === void 0 ? void 0 : _result2$data.paymentFactors;
                 params.paymentMethod = (_result2$data2 = _result2.data) === null || _result2$data2 === void 0 || (_result2$data2 = _result2$data2.data) === null || _result2$data2 === void 0 ? void 0 : _result2$data2.paymentMethod;
                 if (_result2 !== null && _result2 !== void 0 && (_result2$data3 = _result2.data) !== null && _result2$data3 !== void 0 && _result2$data3.success) {
-                  _context.next = 26;
+                  _context.next = 27;
                   break;
                 }
                 return _context.abrupt("return", resolve(undefined));
-              case 26:
+              case 27:
+                _context.next = 32;
+                break;
+              case 29:
+                _context.prev = 29;
+                _context.t0 = _context["catch"](18);
+                return _context.abrupt("return", resolve(undefined));
+              case 32:
                 // params.paymentFactors = paymentResult.data?.data.paymentFactors;
                 // params.paymentMethod = paymentResult.data?.data.paymentMethod;
                 resolve(params);
-              case 27:
+              case 33:
               case "end":
                 return _context.stop();
             }
-          }, _callee);
+          }, _callee, null, [[18, 29]]);
         }));
         return function (_x) {
           return _ref.apply(this, arguments);
         };
       }());
     });
-    var env = options.environment || ELEMENT_ENVIRONMENT.DEV;
+    var env = options.environment || ELEMENT_ENVIRONMENT.PROD;
     this._options = _objectSpread(_objectSpread({}, options), {}, {
       environment: env.toLocaleLowerCase()
     });
@@ -500,13 +513,20 @@ export var ElementComponent = /*#__PURE__*/function () {
     key: "createIframeSrc",
     value: function createIframeSrc() {
       var env = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ELEMENT_ENVIRONMENT.DEV;
-      var version = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '1.24.1';
-      var baseUrl = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ELEMENT_ENVIRONMENT.DEV, 'http://dev.page.alipay.net/page/antom-web-checkout-v2'), ELEMENT_ENVIRONMENT.TEST, 'http://page.test.alipay.net/page/antom-web-checkout-v2'), ELEMENT_ENVIRONMENT.PRE, 'https://cdn-pre.marmot-cloud.com/page/antom-web-checkout-v2'), ELEMENT_ENVIRONMENT.PROD, 'https://checkout.antom.com');
+      var version = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '1.24.0';
+      var baseUrl = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ELEMENT_ENVIRONMENT.DEV, 'http://dev.page.alipay.net/page/antom-web-checkout-v2'), ELEMENT_ENVIRONMENT.TEST, 'http://page.test.alipay.net/page/antom-web-checkout-v2'), ELEMENT_ENVIRONMENT.SIT, 'http://page.test.alipay.net/page/antom-web-checkout-v2'), ELEMENT_ENVIRONMENT.PRE, 'https://pre.ac.alipay.com/page/antom-web-checkout-v2'), ELEMENT_ENVIRONMENT.PROD, 'https://ac.alipay.com/page/antom-web-checkout-v2');
       var _env = (env === null || env === void 0 ? void 0 : env.toLocaleUpperCase()) || ELEMENT_ENVIRONMENT.DEV;
+      var payment = "".concat(baseUrl[_env], "/elements/").concat(version, "/pages/element_payment/index.html");
+      try {
+        var expressCheckout = JSON.parse(JSON.parse(this.parseData.extendInfo).expressCheckout);
+        if (expressCheckout) {
+          payment = "".concat(baseUrl[_env], "/elements/").concat(version, "/pages/express_checkout/index.html");
+        }
+      } catch (error) {}
       return {
         auth: "".concat(baseUrl[_env], "/auth-element/").concat(version, "/pages/element_auth/index.html"),
         address: "".concat(baseUrl[_env], "/element-address/").concat(version, "/pages/address/index.html"),
-        payment: "".concat(baseUrl[_env], "/elements/").concat(version, "/pages/element_payment/index.html")
+        payment: payment
       };
     }
 
@@ -549,6 +569,12 @@ export var ElementComponent = /*#__PURE__*/function () {
           (_this6$eventCallback$ = (_this6$eventCallback$2 = _this6.eventCallback[result.source])[result.event]) === null || _this6$eventCallback$ === void 0 || _this6$eventCallback$.call(_this6$eventCallback$2, result.data);
         }
       });
+      this.eventService.listen(ConstantEvent.close.name, function () {
+        _this6.unmount();
+      });
+      this.eventService.listen(ConstantEvent.redirect.name, function (data, res) {
+        data.isDestroy && _this6.unmount();
+      });
       this.eventService.listen(ElementPaymentEvent.LOG, function (result) {
         console.log('antom sdk 组件日志回调');
       });
@@ -754,6 +780,8 @@ export var ElementComponent = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              // this.onAfterSubmitFunc(ElementPaymentMethod.PAYMENT_ELEMENT, submitResult);
+              // return
               if ((_this$_options$loadin7 = this._options.loading) !== null && _this$_options$loadin7 !== void 0 && _this$_options$loadin7.onStartLoading) {
                 (_this$_options$loadin8 = this._options.loading) === null || _this$_options$loadin8 === void 0 || (_this$_options$loadin9 = _this$_options$loadin8.onStartLoading) === null || _this$_options$loadin9 === void 0 || _this$_options$loadin9.call(_this$_options$loadin8);
               }

package/esm/core/component/element/mock.d.ts

@@ -1,3 +1,4 @@
 export declare const sdkAction: any;
 export declare const oneAccount: any;
 export declare const paymentResult: any;
+export declare const submitResult: any;