@alipay/ams-checkout 1.13.0 → 1.15.0

package/esm/core/component/index.js

@@ -65,7 +65,11 @@ var resetEasyPaySceneVersion = function resetEasyPaySceneVersion(parseData) {
   if (isPC() && parseData !== null && parseData !== void 0 && parseData.paymentSessionConfig) {
     var productScene = parseData.paymentSessionConfig.productScene;
     if (productScene === productSceneEnum.EASY_PAY) {
-      parseData.paymentSessionConfig.productSceneVersion = '1.0';
+      var _parseData$paymentMet;
+      // 非TOSS渠道，在PC场景需要改成1.0
+      if ('BANKTRANSFER_QUICKPAY' !== (parseData === null || parseData === void 0 || (_parseData$paymentMet = parseData.paymentMethodInfoView) === null || _parseData$paymentMet === void 0 ? void 0 : _parseData$paymentMet.paymentMethodType)) {
+        parseData.paymentSessionConfig.productSceneVersion = '1.0';
+      }
     }
   }
 };
@@ -152,9 +156,6 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     key: "pluginAppendIframe",
     value: function pluginAppendIframe(appendParams) {
       try {
-        this.logger.logInfo({
-          title: 'sdk_event_createComponent'
-        }).send();
         return this._componentApp.appendIframeNodes(appendParams.componentSign, appendParams.iframeNodesParams);
       } catch (error) {
         return Promise.reject(error);
@@ -311,6 +312,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     value: function createComponent(params) {
       var _this4 = this;
       this.clearPreloadIframe();
+      this.logger.setComponentStartTime(Date.now());
       return this.parameterInitAndCheck({
         params: params,
         renderDisplayType: renderDisplayTypeEnum.popup
@@ -401,6 +403,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     value: function mountComponent(params, selector) {
       var _this6 = this;
       this.clearPreloadIframe();
+      this.logger.setComponentStartTime(Date.now());
       return this.parameterInitAndCheck({
         params: params,
         renderDisplayType: renderDisplayTypeEnum.inline,

package/esm/plugin/component/cashierApp.d.ts

@@ -1,5 +1,5 @@
 import { componentSignEnum, Ianalytics, renderDisplayTypeEnum } from '../../types';
-export declare const getAppPath: (environment: string, appVersion: string, componentSign: componentSignEnum, productScene: string, productSceneVersion: string, extendInfo: string, mid: string) => any;
+export declare const getAppPath: (environment: string, appVersion: string, componentSign: componentSignEnum, productScene: string, productSceneVersion: string, extendInfo: string, mid: string, sendLog?: boolean) => any;
 export declare const getAppDomain: (domainParams: {
     environment: string;
     appVersion: string;

package/esm/plugin/component/cashierApp.js

@@ -12,28 +12,31 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { marmotMap, sdkVersion } from "../../config/index";
 import { componentSignEnum } from "../../types";
 import { isDebugLog } from "../../util/debug";
-import { getViewPort, queryParse, serialize } from "../../util/index";
+import { queryParse, serialize } from "../../util/index";
 import { Logger } from "../../util/logger";
 import { getLastAppVersion, getMatchAppVersion, setLastAppVersion } from "../../util/upgrade";
 var getAppVersion = function getAppVersion(_extendInfo, productScene, mid) {
+  var sendLog = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   try {
-    var _Logger$getInstance;
     var appVersion = getMatchAppVersion(_extendInfo, {
       sdkVersion: sdkVersion,
       productScene: productScene,
       mid: mid
     });
-    // 有sessionData加载时
-    (_Logger$getInstance = Logger.getInstance()) === null || _Logger$getInstance === void 0 || _Logger$getInstance.logInfo({
-      title: 'sdk_event_appUpgradeInfo'
-    }, {
-      appUpgradeVersion: appVersion,
-      appUpgraded: appVersion ? true : false,
-      isPreload: _extendInfo ? false : true,
-      extendInfo: _extendInfo,
-      productScene: productScene,
-      mid: mid
-    });
+    if (sendLog) {
+      var _Logger$getInstance;
+      (_Logger$getInstance = Logger.getInstance()) === null || _Logger$getInstance === void 0 || _Logger$getInstance.logInfo({
+        title: 'sdk_event_appUpgradeInfo'
+      }, {
+        appUpgradeVersion: appVersion,
+        appUpgraded: appVersion ? true : false,
+        isPreload: _extendInfo ? false : true,
+        extendInfo: _extendInfo,
+        productScene: productScene,
+        mid: mid
+      });
+    }
+
     // 没有匹配到版本，查询上次的加载版本
     if (!appVersion) {
       appVersion = getLastAppVersion(productScene);
@@ -49,7 +52,7 @@ var getAppVersion = function getAppVersion(_extendInfo, productScene, mid) {
   }
 };
 var getFinalProductSceneVersion = function getFinalProductSceneVersion(componentSign, productSceneVersion) {
-  var signSupportMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentSignEnum.NONE, ['']), componentSignEnum.AUTO_DEBIT_WALLET, ['1.0']), componentSignEnum.CASHIER_PAYMENT_BANK, ['1.0']), componentSignEnum.CASHIER_PAYMENT_CARD, ['1.0']), componentSignEnum.CASHIER_PAYMENT_APM, ['1.0']), componentSignEnum.EASY_PAY_WALLET, ['1.0', '2.0']), componentSignEnum.VAULTING_CARD, ['1.0']);
+  var signSupportMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentSignEnum.NONE, ['']), componentSignEnum.AUTO_DEBIT_WALLET, ['1.0']), componentSignEnum.CASHIER_PAYMENT_BANK, ['1.0']), componentSignEnum.CASHIER_PAYMENT_CARD, ['1.0']), componentSignEnum.CASHIER_PAYMENT_APM, ['1.0']), componentSignEnum.EASY_PAY_WALLET, ['1.0', '2.0']), componentSignEnum.EASY_PAY_APM, ['2.0']), componentSignEnum.VAULTING_CARD, ['1.0']);
   var supportProductSceneVersion = signSupportMap[componentSign];
   // 从左到右，从旧到新
   var isSupport = supportProductSceneVersion.find(function (it) {
@@ -66,9 +69,10 @@ export var getAppPath = function getAppPath() {
   var productSceneVersion = arguments.length > 4 ? arguments[4] : undefined;
   var extendInfo = arguments.length > 5 ? arguments[5] : undefined;
   var mid = arguments.length > 6 ? arguments[6] : undefined;
+  var sendLog = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
   var _ref = queryParse() || {},
     urlTestHost = _ref.host;
-  var upgradeAppVersion = getAppVersion(extendInfo, productScene, mid);
+  var upgradeAppVersion = getAppVersion(extendInfo, productScene, mid, sendLog);
   var finalAppVersion = upgradeAppVersion || appVersion;
   // 当有升级版本时，更新到全局字段
   if (upgradeAppVersion) {
@@ -120,14 +124,12 @@ export var getIframeUrl = function getIframeUrl(iframeParams) {
     hostSign = _iframeParams$hostSig === void 0 ? '' : _iframeParams$hostSig,
     _iframeParams$mid = iframeParams.mid,
     mid = _iframeParams$mid === void 0 ? '' : _iframeParams$mid;
-  var path = getAppPath(environment, appVersion, componentSign, productScene, productSceneVersion, extendInfo || '', mid);
+  var path = getAppPath(environment, appVersion, componentSign, productScene, productSceneVersion, extendInfo || '', mid, true);
   var appMatched = getMatchAppVersion(extendInfo, {
     sdkVersion: sdkVersion,
     productScene: productScene,
     mid: mid
   }) ? 'true' : 'false';
-  var initialScale = 1;
-  var scale = getViewPort('initial-scale') || initialScale;
   var _queryParse = queryParse(),
     _sandbox = _queryParse._sandbox,
     _light_sandbox = _queryParse._light_sandbox,
@@ -140,7 +142,6 @@ export var getIframeUrl = function getIframeUrl(iframeParams) {
   var urlParams = Object.assign({}, {
     displayType: renderDisplayType,
     locale: locale,
-    scale: scale,
     instanceId: instanceId,
     appMatched: appMatched,
     analyticsEnabled: (analytics === null || analytics === void 0 ? void 0 : analytics.enabled) === false ? 'false' : 'true',
@@ -156,7 +157,6 @@ export var getIframeUrl = function getIframeUrl(iframeParams) {
   if (environment === 'light_sandbox' || _light_sandbox === 'true') urlParams.sandbox = 'true';
   if (environment === 'sandbox' || _sandbox === 'true') urlParams.shadow = 'true';
   if (_displayType) urlParams.displayType = _displayType;
-  if (isPreload) urlParams.isPreload = isPreload;
   var locationSearch = serialize(urlParams);
   if (isDebugLog()) {
     console.log('appUpgrade#getIframeUrl#appMatched', appMatched);

package/esm/plugin/component/channel.d.ts

@@ -0,0 +1,20 @@
+import type { IpaymentSessionMetaData } from "src/types";
+type IChannelBehavior = {
+    usePaymentSessionAsQueryResult: boolean;
+    submitPayInSdk: boolean;
+    createIframeNode: boolean;
+    loadApp: boolean;
+    buildSubmitPayExtParams?: (params: GetDoubleFaParams) => any;
+    allowClickOutsideClose?: boolean;
+};
+type GetDoubleFaParams = {
+    instanceId: string;
+    paymentSessionData: string;
+    locale: string;
+    paymentMethodType: string;
+    env: string;
+    sdkVersion: string;
+};
+export declare function getChannelBehavior(paymentSessionMetaData?: IpaymentSessionMetaData): IChannelBehavior | undefined;
+export declare function getDoubleFaUrl(params: GetDoubleFaParams): string;
+export {};

package/esm/plugin/component/channel.js

@@ -0,0 +1,38 @@
+export function getChannelBehavior(paymentSessionMetaData) {
+  var _paymentSessionMetaDa, _paymentSessionMetaDa2, _paymentSessionMetaDa3, _paymentSessionMetaDa4;
+  if ('BANKTRANSFER_QUICKPAY' === (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.paymentMethodType) && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa2 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa2 === void 0 ? void 0 : _paymentSessionMetaDa2.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa3 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa3 === void 0 ? void 0 : _paymentSessionMetaDa3.paymentMethodCategoryType) === 'APM' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa4 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa4 === void 0 ? void 0 : _paymentSessionMetaDa4.productSceneVersion) === '2.0') {
+    return {
+      usePaymentSessionAsQueryResult: true,
+      submitPayInSdk: true,
+      createIframeNode: true,
+      loadApp: true,
+      allowClickOutsideClose: true,
+      buildSubmitPayExtParams: function buildSubmitPayExtParams(params) {
+        var callBackUrl = getDoubleFaUrl(params);
+        return {
+          callBackUrl: callBackUrl
+        };
+      }
+    };
+  }
+  return undefined;
+}
+export function getDoubleFaUrl(params) {
+  var instanceId = params.instanceId,
+    paymentMethodType = params.paymentMethodType,
+    paymentSessionData = params.paymentSessionData,
+    locale = params.locale,
+    env = params.env,
+    sdkVersion = params.sdkVersion;
+  var isLandscapeOrientation = false; // Web 不含横屏
+
+  var DOUBLE_FA_URL_MAPPING = {
+    local: "http://page.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
+    dev: "http://page.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
+    sit: "http://page.test.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
+    pre: "https://pre.ac.alipay.com/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
+    prod: "https://ac.alipay.com/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html")
+  };
+  var doubleFaBaseUrl = DOUBLE_FA_URL_MAPPING[env] || DOUBLE_FA_URL_MAPPING.prod;
+  return "".concat(doubleFaBaseUrl, "?scene=cashierResultPage&instanceId=").concat(instanceId, "&paymentSessionData=").concat(encodeURIComponent(paymentSessionData), "&isLandscape=").concat(isLandscapeOrientation ? 'true' : '', "&pmt=").concat(paymentMethodType, "&locale=").concat(locale, "&sdkVersion=").concat(sdkVersion);
+}

package/esm/plugin/component/component.popup.style.d.ts

@@ -5,7 +5,10 @@ export declare const createCloseBtn: (platform: platformEnum, closeBtnFunc: () =
 export declare const createRetentionPopup: (platform: platformEnum, remainBtnFunc: () => void, leaveBtnFunc: () => void) => void;
 export declare const hideRetentionPopup: () => void;
 export declare const removeRetentionPopup: (platform: platformEnum, remainBtnFunc: () => void, leaveBtnFunc: () => void) => void;
-export declare const createMockup: () => void;
+export declare const createMockup: (options: {
+    platform: platformEnum;
+    onClickOutside: () => void;
+}) => void;
 export declare const addPopupLoading: () => void;
 export declare const handleDeclareInfo: ({ closeDialogData }: {
     closeDialogData: any;

package/esm/plugin/component/component.popup.style.js

@@ -89,7 +89,8 @@ export var removeRetentionPopup = function removeRetentionPopup(platform, remain
   }
   (_document$getElementB = document.getElementById(COMPONENT_RETENTION_ID)) === null || _document$getElementB === void 0 || _document$getElementB.remove();
 };
-export var createMockup = function createMockup() {
+export var createMockup = function createMockup(options) {
+  var clickEventName = (options === null || options === void 0 ? void 0 : options.platform) === platformEnum.mobile ? 'touchend' : 'click';
   var body = document.getElementsByTagName('body')[0];
   body.style.overflow = 'hidden';
   var mockup = document.createElement('div');
@@ -102,6 +103,11 @@ export var createMockup = function createMockup() {
   mockup.style.background = 'rgba(0,0,0,0.5)';
   mockup.style.display = 'none';
   mockup.id = MOCKUP_ID;
+  // let click to close
+  mockup.addEventListener(clickEventName, function () {
+    var _options$onClickOutsi;
+    options === null || options === void 0 || (_options$onClickOutsi = options.onClickOutside) === null || _options$onClickOutsi === void 0 || _options$onClickOutsi.call(options);
+  });
   body.appendChild(mockup);
 };
 export var addPopupLoading = function addPopupLoading() {

package/esm/plugin/component/index.d.ts

@@ -97,7 +97,7 @@ export default class ComponentApp {
      */
     dispatchToApp(payload: {
         context: eventPayloadContext;
-    }, targetElement?: any, sendLog?: boolean): any;
+    }, targetElement?: any): any;
     /**
      * @description Subscribe to messages from SDK
      */

package/esm/plugin/component/index.js

@@ -25,6 +25,7 @@ import { getType, isJsonString, isPC } from "../../util";
 import { isLocalMock } from "../../util/mock";
 import { matchVersion } from "../../util/versionCompare";
 import { createIframe, createPreloadIframe, getAppDomain, getIframeUrl } from "./cashierApp";
+import { getChannelBehavior } from "./channel";
 import { addInlineLoading, createInlineBaseElement } from "./component.inline.style";
 import { addPopupLoading, createBaseElement, createMockup, createRetentionPopup, handleDeclareInfo as _handleDeclareInfo, hideRetentionPopup, removeRetentionPopup as _removeRetentionPopup } from "./component.popup.style";
 import { createModal, destroyModal, insertStyleSheet } from "./popupWindow.style";
@@ -55,7 +56,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_multipleCallbackEvents", void 0);
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
-    this._appVersion = '1.13.0';
+    this._appVersion = '1.15.0';
     this._isInitComponent = false;
     this._selector = "#".concat(COMPONENT_SECTION_ID);
     this.createIframeNode = function () {
@@ -112,7 +113,7 @@ var ComponentApp = /*#__PURE__*/function () {
         productSceneVersion: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.productSceneVersion,
         paymentMethodType: paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.paymentMethodType,
         paymentMethodCategoryType: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.paymentMethodCategoryType,
-        requestSeq: (_this$_renderParams2 = this._renderParams) === null || _this$_renderParams2 === void 0 ? void 0 : _this$_renderParams2.paymentSessionData,
+        requestSeq: (_this$_renderParams2 = this._renderParams) === null || _this$_renderParams2 === void 0 ? void 0 : _this$_renderParams2.sessionData,
         trackId: (_this$_renderParams3 = this._renderParams) === null || _this$_renderParams3 === void 0 ? void 0 : _this$_renderParams3.sessionData
       });
     }
@@ -274,9 +275,18 @@ var ComponentApp = /*#__PURE__*/function () {
         insertStyleSheet();
       }
       if (this._renderDisplayType === renderDisplayTypeEnum.popup) {
+        var _this$_renderParams5;
         createBaseElement(this.platform, this.closeBtnFunc.bind(this));
         createRetentionPopup(this.platform, this.hideRetentionPopupFunc.bind(this), this.retentionPopupLeaveFunc.bind(this));
-        createMockup();
+        var channelBehavior = getChannelBehavior((_this$_renderParams5 = this._renderParams) === null || _this$_renderParams5 === void 0 ? void 0 : _this$_renderParams5.paymentSessionMetaData);
+        var onClickOutside = function onClickOutside() {};
+        if (channelBehavior !== null && channelBehavior !== void 0 && channelBehavior.allowClickOutsideClose) {
+          onClickOutside = this.closeBtnFunc.bind(this);
+        }
+        createMockup({
+          platform: this.platform,
+          onClickOutside: onClickOutside
+        });
         this.renderPopupLoading(renderParams);
       }
       this.createApp(renderParams);
@@ -356,7 +366,9 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "createActionQueryPromise",
     value: function createActionQueryPromise() {
-      var _this5 = this;
+      var _this$_renderParams6,
+        _this5 = this;
+      var paymentMethodType = (_this$_renderParams6 = this._renderParams) === null || _this$_renderParams6 === void 0 || (_this$_renderParams6 = _this$_renderParams6.paymentSessionMetaData) === null || _this$_renderParams6 === void 0 || (_this$_renderParams6 = _this$_renderParams6.paymentMethodInfoView) === null || _this$_renderParams6 === void 0 ? void 0 : _this$_renderParams6.paymentMethodType;
       this._performanceData.push({
         key: 'sdk_action_query_start',
         value: Date.now()
@@ -365,8 +377,8 @@ var ComponentApp = /*#__PURE__*/function () {
       // eslint-disable-next-line no-async-promise-executor
       this._actionQueryPromise = new Promise( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
-          var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4, _this5$_renderParams5;
-          var envInfo, params, _ref3, _ref3$extendInfo, extendInfo, enableVaultingApiOptimize, enableEasypayApiOptimize, _ref4, skipSdkQuery, skipSdkQueryForm, extendInfoData, ifSkip, _this5$_renderParams6, _this5$_renderParams7, _ref5, _ref5$productSceneVer, productSceneVersion, _ref5$productScene, productScene, _ref6, _ref6$action, _ref6$action2, _ref6$action2$autoDeb, autoDebitWithToken, _this5$_renderParams8, _action$web, _action$wap, action, signType;
+          var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4, _this5$_renderParams5, _this5$_renderParams6;
+          var envInfo, params, _ref3, _ref3$extendInfo, extendInfo, actionData, enableVaultingApiOptimize, enableEasypayApiOptimize, _ref4, skipSdkQuery, skipSdkQueryForm, extendInfoData, ifSkip, channelBehavior, _this5$_renderParams7, _this5$_renderParams8, _ref5, _ref5$productSceneVer, productSceneVersion, _ref5$productScene, productScene, _ref6, _ref6$action, _ref6$action2, _ref6$action2$autoDeb, autoDebitWithToken, _this5$_renderParams9, _action$web, _action$wap, action, signType;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -382,7 +394,7 @@ var ComponentApp = /*#__PURE__*/function () {
                 /**
                  * @description Simulated or unnecessary scenarios
                  */
-                _ref3 = ((_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData) || {}, _ref3$extendInfo = _ref3.extendInfo, extendInfo = _ref3$extendInfo === void 0 ? '' : _ref3$extendInfo;
+                _ref3 = ((_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData) || {}, _ref3$extendInfo = _ref3.extendInfo, extendInfo = _ref3$extendInfo === void 0 ? '' : _ref3$extendInfo, actionData = _ref3.action;
                 enableVaultingApiOptimize = false;
                 enableEasypayApiOptimize = false;
                 _ref4 = ((_this5$_renderParams5 = _this5._renderParams) === null || _this5$_renderParams5 === void 0 || (_this5$_renderParams5 = _this5$_renderParams5.paymentSessionMetaData) === null || _this5$_renderParams5 === void 0 ? void 0 : _this5$_renderParams5.action) || {}, skipSdkQuery = _ref4.skipSdkQuery, skipSdkQueryForm = _ref4.skipSdkQueryForm;
@@ -439,78 +451,89 @@ var ComponentApp = /*#__PURE__*/function () {
                 });
                 return _context2.abrupt("return");
               case 21:
+                channelBehavior = getChannelBehavior((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData); // Easypay TOSS 渠道无需actionQuery
+                if (!(channelBehavior !== null && channelBehavior !== void 0 && channelBehavior.usePaymentSessionAsQueryResult)) {
+                  _context2.next = 24;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  autoDebitWithToken: actionData === null || actionData === void 0 ? void 0 : actionData.autoDebitWithToken,
+                  amountConfirmRequired: actionData === null || actionData === void 0 ? void 0 : actionData.amountConfirmRequired,
+                  success: true
+                }));
+              case 24:
                 if (!(componentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign || componentSignEnum.VAULTING_CARD === _this5._componentSign)) {
-                  _context2.next = 27;
+                  _context2.next = 30;
                   break;
                 }
                 params.paymentMethodType = 'CARD';
-                _context2.next = 25;
+                _context2.next = 28;
                 return _this5.getDeviceIdAndLog();
-              case 25:
+              case 28:
                 envInfo.deviceId = _context2.sent;
                 if (window.navigator.userAgent.indexOf('miniProgram') > -1) {
                   envInfo.extendInfo = {
                     WAP_SUB_TYPE: 'WECHAT_MINI_PROGRAM'
                   };
                 }
-              case 27:
+              case 30:
                 if (!(componentSignEnum.EASY_PAY_WALLET === _this5._componentSign)) {
-                  _context2.next = 37;
+                  _context2.next = 40;
                   break;
                 }
                 _ref5 = params.paymentSessionConfig || {}, _ref5$productSceneVer = _ref5.productSceneVersion, productSceneVersion = _ref5$productSceneVer === void 0 ? '' : _ref5$productSceneVer, _ref5$productScene = _ref5.productScene, productScene = _ref5$productScene === void 0 ? '' : _ref5$productScene;
-                _ref6 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref6$action = _ref6.action, _ref6$action2 = _ref6$action === void 0 ? {} : _ref6$action, _ref6$action2$autoDeb = _ref6$action2.autoDebitWithToken, autoDebitWithToken = _ref6$action2$autoDeb === void 0 ? false : _ref6$action2$autoDeb;
-                if (!((_this5$_renderParams7 = _this5._renderParams) !== null && _this5$_renderParams7 !== void 0 && (_this5$_renderParams7 = _this5$_renderParams7.paymentSessionMetaData) !== null && _this5$_renderParams7 !== void 0 && (_this5$_renderParams7 = _this5$_renderParams7.action) !== null && _this5$_renderParams7 !== void 0 && _this5$_renderParams7.skipSdkQuery && enableEasypayApiOptimize)) {
-                  _context2.next = 32;
+                _ref6 = ((_this5$_renderParams7 = _this5._renderParams) === null || _this5$_renderParams7 === void 0 ? void 0 : _this5$_renderParams7.paymentSessionMetaData) || {}, _ref6$action = _ref6.action, _ref6$action2 = _ref6$action === void 0 ? {} : _ref6$action, _ref6$action2$autoDeb = _ref6$action2.autoDebitWithToken, autoDebitWithToken = _ref6$action2$autoDeb === void 0 ? false : _ref6$action2$autoDeb;
+                if (!((_this5$_renderParams8 = _this5._renderParams) !== null && _this5$_renderParams8 !== void 0 && (_this5$_renderParams8 = _this5$_renderParams8.paymentSessionMetaData) !== null && _this5$_renderParams8 !== void 0 && (_this5$_renderParams8 = _this5$_renderParams8.action) !== null && _this5$_renderParams8 !== void 0 && _this5$_renderParams8.skipSdkQuery && enableEasypayApiOptimize)) {
+                  _context2.next = 35;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 32:
+              case 35:
                 if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken)) {
-                  _context2.next = 34;
+                  _context2.next = 37;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 34:
-                _context2.next = 36;
+              case 37:
+                _context2.next = 39;
                 return _this5.getDeviceIdAndLog();
-              case 36:
+              case 39:
                 envInfo.deviceId = _context2.sent;
-              case 37:
+              case 40:
                 if (!(componentSignEnum.AUTO_DEBIT_WALLET === _this5._componentSign)) {
-                  _context2.next = 47;
+                  _context2.next = 50;
                   break;
                 }
-                action = ((_this5$_renderParams8 = _this5._renderParams) === null || _this5$_renderParams8 === void 0 || (_this5$_renderParams8 = _this5$_renderParams8.paymentSessionMetaData) === null || _this5$_renderParams8 === void 0 ? void 0 : _this5$_renderParams8.action) || {};
+                action = ((_this5$_renderParams9 = _this5._renderParams) === null || _this5$_renderParams9 === void 0 || (_this5$_renderParams9 = _this5$_renderParams9.paymentSessionMetaData) === null || _this5$_renderParams9 === void 0 ? void 0 : _this5$_renderParams9.action) || {};
                 signType = isPC() ? action === null || action === void 0 || (_action$web = action.web) === null || _action$web === void 0 ? void 0 : _action$web.signType : action === null || action === void 0 || (_action$wap = action.wap) === null || _action$wap === void 0 ? void 0 : _action$wap.signType;
                 if (!(signType === 'SMS')) {
-                  _context2.next = 42;
+                  _context2.next = 45;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 42:
+              case 45:
                 if (!(!signType || signType !== 'REDIRECT')) {
-                  _context2.next = 44;
+                  _context2.next = 47;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   success: false
                 }));
-              case 44:
-                _context2.next = 46;
+              case 47:
+                _context2.next = 49;
                 return _this5.getDeviceIdAndLog();
-              case 46:
+              case 49:
                 envInfo.deviceId = _context2.sent;
-              case 47:
+              case 50:
                 _this5.AMSSDK.logger.logInfo({
                   title: 'sdk_event_sdkQuery'
                 }, {
@@ -549,7 +572,7 @@ var ComponentApp = /*#__PURE__*/function () {
                   }).send();
                   reject(err);
                 });
-              case 49:
+              case 52:
               case "end":
                 return _context2.stop();
             }
@@ -566,46 +589,64 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "createSubmitPromise",
     value: function createSubmitPromise() {
-      var _this$_renderParams5,
-        _this$_renderParams6,
+      var _this$_renderParams7,
+        _this$_renderParams8,
+        _this$_renderParams9,
         _this6 = this;
       this._performanceData.push({
         key: 'sdk_submit_start',
         value: Date.now()
       });
       var params = {
-        paymentSessionData: this._renderParams && ((_this$_renderParams5 = this._renderParams) === null || _this$_renderParams5 === void 0 ? void 0 : _this$_renderParams5.sessionData) || '',
-        paymentSessionConfig: (_this$_renderParams6 = this._renderParams) === null || _this$_renderParams6 === void 0 || (_this$_renderParams6 = _this$_renderParams6.paymentSessionMetaData) === null || _this$_renderParams6 === void 0 ? void 0 : _this$_renderParams6.paymentSessionConfig
+        paymentSessionData: this._renderParams && ((_this$_renderParams7 = this._renderParams) === null || _this$_renderParams7 === void 0 ? void 0 : _this$_renderParams7.sessionData) || '',
+        paymentSessionConfig: (_this$_renderParams8 = this._renderParams) === null || _this$_renderParams8 === void 0 || (_this$_renderParams8 = _this$_renderParams8.paymentSessionMetaData) === null || _this$_renderParams8 === void 0 ? void 0 : _this$_renderParams8.paymentSessionConfig
       };
-
+      var channelBehavior = getChannelBehavior((_this$_renderParams9 = this._renderParams) === null || _this$_renderParams9 === void 0 ? void 0 : _this$_renderParams9.paymentSessionMetaData);
       // eslint-disable-next-line no-async-promise-executor
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
         var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-          var _this6$_renderParams;
+          var _channelBehavior$buil, _this6$_renderParams$;
+          var shouldSkipSubmitPayInSDK, _this6$_renderParams, extParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
-                if (!(!((_this6$_renderParams = _this6._renderParams) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.paymentSessionMetaData) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.action) !== null && _this6$_renderParams !== void 0 && _this6$_renderParams.skipSdkQuery) || componentSignEnum.EASY_PAY_WALLET !== _this6._componentSign)) {
-                  _context3.next = 2;
+                shouldSkipSubmitPayInSDK = false;
+                if (channelBehavior) {
+                  // 新逻辑走 channelBehavior判断
+                  shouldSkipSubmitPayInSDK = !channelBehavior.submitPayInSdk;
+                } else {
+                  shouldSkipSubmitPayInSDK = !((_this6$_renderParams = _this6._renderParams) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.paymentSessionMetaData) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.action) !== null && _this6$_renderParams !== void 0 && _this6$_renderParams.skipSdkQuery) || componentSignEnum.EASY_PAY_WALLET !== _this6._componentSign;
+                }
+                if (!shouldSkipSubmitPayInSDK) {
+                  _context3.next = 4;
                   break;
                 }
                 return _context3.abrupt("return", resolve({
                   message: 'sdk no need to make submitPay request',
                   success: true
                 }));
-              case 2:
+              case 4:
                 _this6.AMSSDK.logger.logInfo({
                   title: 'sdk_event_submitPay'
                 }, {
                   paymentSessionConfig: JSON.stringify(params.paymentSessionConfig),
                   requestBody: params
                 }).send();
+                extParams = (channelBehavior === null || channelBehavior === void 0 || (_channelBehavior$buil = channelBehavior.buildSubmitPayExtParams) === null || _channelBehavior$buil === void 0 ? void 0 : _channelBehavior$buil.call(channelBehavior, {
+                  instanceId: _this6.AMSSDK._instanceId,
+                  locale: _this6.AMSSDK.options.locale,
+                  paymentMethodType: (_this6$_renderParams$ = _this6._renderParams.paymentSessionMetaData) === null || _this6$_renderParams$ === void 0 || (_this6$_renderParams$ = _this6$_renderParams$.paymentMethodInfoView) === null || _this6$_renderParams$ === void 0 ? void 0 : _this6$_renderParams$.paymentMethodType,
+                  paymentSessionData: _this6._renderParams.sessionData,
+                  env: _this6.AMSSDK.options.env.environment,
+                  sdkVersion: _this6._appVersion
+                })) || {};
+                params.extParams = extParams;
                 _context3.t0 = submitPayInfo;
                 _context3.t1 = params;
                 _context3.t2 = _this6.AMSSDK.options.env.environment;
-                _context3.next = 8;
+                _context3.next = 12;
                 return _this6.getDeviceIdAndLog();
-              case 8:
+              case 12:
                 _context3.t3 = _context3.sent;
                 _context3.t4 = {
                   deviceId: _context3.t3
@@ -639,7 +680,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     success: false
                   });
                 });
-              case 13:
+              case 17:
               case "end":
                 return _context3.stop();
             }
@@ -1348,20 +1389,12 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "dispatchToApp",
     value: function dispatchToApp(payload) {
       var targetElement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-      var sendLog = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var data = Object.assign({}, payload, {
         name: messageName.SDK_TO_APP,
         mode: this.AMSSDK.options.mode,
         appId: COMPONENTPLUGINID,
         instanceId: this.AMSSDK._instanceId
       });
-      if (sendLog) {
-        this.AMSSDK.logger.logInfo({
-          title: 'sdk_event_send_message_to_web'
-        }, {
-          event: data === null || data === void 0 ? void 0 : data.context.event
-        }).send();
-      }
       if (targetElement && targetElement.contentWindow) {
         return targetElement.contentWindow.postMessage(JSON.stringify(data), '*');
       }
@@ -1396,7 +1429,7 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "sendRenderEvent",
     value: (function () {
       var _sendRenderEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this$_renderParams7, _this$_renderParams8, _this$_renderParams9, _this$_renderParams10, _this$_renderParams11, _this$_renderParams12, _this$AMSSDK$logger, _this$_renderParams13, _this$_renderParams14, _this$_renderParams15, _this$AMSSDK, _this$_renderParams16, res, submitRes;
+        var _this$_renderParams10, _this$_renderParams11, _this$_renderParams12, _this$_renderParams13, _this$_renderParams14, _this$_renderParams15, _this$AMSSDK$logger, _this$_renderParams16, _this$_renderParams17, _this$_renderParams18, _this$AMSSDK, _this$_renderParams19, res, submitRes;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -1425,32 +1458,32 @@ var ComponentApp = /*#__PURE__*/function () {
                   data: {
                     queryResult: res,
                     submitResult: submitRes,
-                    sessionResult: (_this$_renderParams7 = this._renderParams) === null || _this$_renderParams7 === void 0 ? void 0 : _this$_renderParams7.paymentSessionMetaData,
-                    paymentSessionData: (_this$_renderParams8 = this._renderParams) === null || _this$_renderParams8 === void 0 ? void 0 : _this$_renderParams8.sessionData,
+                    sessionResult: (_this$_renderParams10 = this._renderParams) === null || _this$_renderParams10 === void 0 ? void 0 : _this$_renderParams10.paymentSessionMetaData,
+                    paymentSessionData: (_this$_renderParams11 = this._renderParams) === null || _this$_renderParams11 === void 0 ? void 0 : _this$_renderParams11.sessionData,
                     heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-                    renderDisplayType: (_this$_renderParams9 = this._renderParams) === null || _this$_renderParams9 === void 0 ? void 0 : _this$_renderParams9.renderDisplayType,
-                    appearance: (_this$_renderParams10 = this._renderParams) === null || _this$_renderParams10 === void 0 ? void 0 : _this$_renderParams10.appearance,
-                    notRedirectAfterComplete: ((_this$_renderParams11 = this._renderParams) === null || _this$_renderParams11 === void 0 ? void 0 : _this$_renderParams11.notRedirectAfterComplete) === true,
+                    renderDisplayType: (_this$_renderParams12 = this._renderParams) === null || _this$_renderParams12 === void 0 ? void 0 : _this$_renderParams12.renderDisplayType,
+                    appearance: (_this$_renderParams13 = this._renderParams) === null || _this$_renderParams13 === void 0 ? void 0 : _this$_renderParams13.appearance,
+                    notRedirectAfterComplete: ((_this$_renderParams14 = this._renderParams) === null || _this$_renderParams14 === void 0 ? void 0 : _this$_renderParams14.notRedirectAfterComplete) === true,
                     merchantAppointParam: this._merchantAppointParam,
                     envInfo: {
                       screenHeight: screen.height,
                       screenWidth: screen.width
                     },
                     logMetaData: _objectSpread(_objectSpread({
-                      trackId: (_this$_renderParams12 = this._renderParams) === null || _this$_renderParams12 === void 0 ? void 0 : _this$_renderParams12.sessionData,
+                      trackId: (_this$_renderParams15 = this._renderParams) === null || _this$_renderParams15 === void 0 ? void 0 : _this$_renderParams15.sessionData,
                       platform: this.platform,
                       firstLogTime: (_this$AMSSDK$logger = this.AMSSDK.logger) === null || _this$AMSSDK$logger === void 0 ? void 0 : _this$AMSSDK$logger.getComponentStartTime()
-                    }, ((_this$_renderParams13 = this._renderParams) === null || _this$_renderParams13 === void 0 || (_this$_renderParams13 = _this$_renderParams13.paymentSessionMetaData) === null || _this$_renderParams13 === void 0 ? void 0 : _this$_renderParams13.paymentSessionConfig) || {}), {}, {
-                      renderDisplayType: (_this$_renderParams14 = this._renderParams) === null || _this$_renderParams14 === void 0 ? void 0 : _this$_renderParams14.renderDisplayType,
+                    }, ((_this$_renderParams16 = this._renderParams) === null || _this$_renderParams16 === void 0 || (_this$_renderParams16 = _this$_renderParams16.paymentSessionMetaData) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.paymentSessionConfig) || {}), {}, {
+                      renderDisplayType: (_this$_renderParams17 = this._renderParams) === null || _this$_renderParams17 === void 0 ? void 0 : _this$_renderParams17.renderDisplayType,
                       sdkVersion: this._appVersion,
-                      merchantId: (_this$_renderParams15 = this._renderParams) === null || _this$_renderParams15 === void 0 || (_this$_renderParams15 = _this$_renderParams15.paymentSessionMetaData) === null || _this$_renderParams15 === void 0 ? void 0 : _this$_renderParams15.clientId,
+                      merchantId: (_this$_renderParams18 = this._renderParams) === null || _this$_renderParams18 === void 0 || (_this$_renderParams18 = _this$_renderParams18.paymentSessionMetaData) === null || _this$_renderParams18 === void 0 ? void 0 : _this$_renderParams18.clientId,
                       instanceId: (_this$AMSSDK = this.AMSSDK) === null || _this$AMSSDK === void 0 ? void 0 : _this$AMSSDK._instanceId,
                       performanceData: this._performanceData,
-                      paymentMethodType: (_this$_renderParams16 = this._renderParams) === null || _this$_renderParams16 === void 0 || (_this$_renderParams16 = _this$_renderParams16.paymentSessionMetaData) === null || _this$_renderParams16 === void 0 || (_this$_renderParams16 = _this$_renderParams16.paymentMethodInfoView) === null || _this$_renderParams16 === void 0 ? void 0 : _this$_renderParams16.paymentMethodType
+                      paymentMethodType: (_this$_renderParams19 = this._renderParams) === null || _this$_renderParams19 === void 0 || (_this$_renderParams19 = _this$_renderParams19.paymentSessionMetaData) === null || _this$_renderParams19 === void 0 || (_this$_renderParams19 = _this$_renderParams19.paymentMethodInfoView) === null || _this$_renderParams19 === void 0 ? void 0 : _this$_renderParams19.paymentMethodType
                     })
                   }
                 }
-              }, null, true);
+              }, null);
               this.AMSSDK.logger.logInfo({
                 title: 'sdk_event_renderComponent'
               });
@@ -1489,9 +1522,6 @@ var ComponentApp = /*#__PURE__*/function () {
       var _document$getElementB4,
         _this9 = this;
       var immediately = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      this.AMSSDK.logger.logInfo({
-        title: 'sdk_event_clean_component'
-      }).send();
       (_document$getElementB4 = document.getElementById(LOADING_ID)) === null || _document$getElementB4 === void 0 || _document$getElementB4.remove();
       this.hideComponentAnimation();
       var mockup = document.getElementById(MOCKUP_ID);