@alipay/ams-checkout 0.0.1786071074-dev.0 → 0.0.1786071074-dev.2

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

@@ -29,13 +29,20 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { openModal, showToast, sdkQuery, getLocaleFromRenderData, getDevReqConfig, getMetaData, buildPageUrl, debugError, debug, MessageType, request, parseHostSign, SDKBridge, parseTrackerId, oneAccountQuery, OpenSDKError, awaitWrap, themeColorMap, ApplePayHostService, buildRecurringPaymentRequest, checkSessionData, sdkTracker, ModalPort } from "../../../../modern/tools";
+import { ERRORMESSAGE, PROMISE_CALLBACK_CODE } from "../../../../constant";
+import { BusManager, BusMessage } from "../../../bus";
+import { ApplePayActionEnum } from "../../../bus/interface";
 import { shouldQueryOneAccount } from "../../../utils/connectConfig";
+import { ApplePayHostService, awaitWrap, buildPageUrl, buildRecurringPaymentRequest, checkSessionData, debug, debugError, getDevReqConfig, getLocaleFromRenderData, getMetaData, MessageType, ModalPort, oneAccountQuery, openModal, OpenSDKError, parseHostSign, parseTrackerId, request, SDKBridge, sdkQuery, sdkTracker, showToast, themeColorMap } from "../../../../modern/tools";
+import { getApplePayPaymentSession } from "../../../../service";
 import { device } from "../../../../util";
+import { BEFORE_CONFIRM_TIMEOUT_MS, executeWithTimeout, MERCHANT_CONFIRM_ABORT_CODE, MERCHANT_CONFIRM_TIMEOUT_CODE } from "../../../../util/beforeConfirm";
+import CallApp from "../../../../util/intl-callapp/es/main";
+import { LogConfig, Logger } from "../../../../util/logger";
+import { v4 as uuid } from 'uuid';
 import { EventCallbackCode } from "../type";
-import { adaptSubmitResult, adaptAppearance } from "./adapter";
 import { safeParse } from "../util";
-import { v4 as uuid } from 'uuid';
+import { adaptAppearance, adaptSubmitResult } from "./adapter";
 
 // ============================================================
 // 埋点 helper（不改 opensdk 源码，复用 sdkTracker 单例，trackId 已自动注入）
@@ -46,24 +53,6 @@ import { v4 as uuid } from 'uuid';
 
 var TRACK_CODE_PREFIX = '7982';
 
-// 缓存解析出的 merchantId，供埋点 helper 在任意阶段统一带上
-var _merchantId = '';
-var track = function track(phase, msg) {
-  var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  try {
-    var code = "".concat(TRACK_CODE_PREFIX).concat(phase === 'error' ? '' : phase);
-    // LogItem 类型未暴露 merchant_id 字段，但运行时 tracker 会透传，
-    // 故用断言保留该字段名供下游埋点消费
-    sdkTracker.log(_objectSpread({
-      code: code,
-      msg: msg,
-      merchant_id: _merchantId
-    }, extra));
-  } catch (_unused) {
-    /* 埋点失败绝不影响主流程 */
-  }
-};
-
 /**
  * 优先取 sessionData 解析出的 clientId；
  * 缺失时从容错角度回落到 extendInfo 中的 merchantId（URL 编码需解码）。
@@ -80,42 +69,22 @@ var resolveMerchantId = function resolveMerchantId(parseData) {
       return '';
     }
     return decodeURIComponent(merchantId);
-  } catch (_unused2) {
+  } catch (_unused) {
     return '';
   }
 };
-var trackMount = function trackMount(msg) {
-  var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return track('mount', msg, extra);
-};
-var trackHandshake = function trackHandshake(msg) {
-  var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return track('handshake', msg, extra);
-};
-var trackElement = function trackElement(msg) {
-  var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return track('element', msg, extra);
-};
-var trackError = function trackError(msg) {
-  var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return track('error', msg, extra);
-};
-// ============================================================
-// 统一 API 终态上报（7982api）：在 mount/submitPayment/validateFields
-// 每个出口（成功/失败/中断）捕获「返回给商户的完整结果」，一处包裹覆盖全部分支。
-// 与分散的 trackXxx 互补、不替换；merchantId 为关键字段，必带。
-// _merchantId 在 setup() 解析后填充，mount 首次调用在 resolve 时已就绪。
-// ============================================================
-var reportApiEnd = function reportApiEnd(api, durationMs) {
-  var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+// reportApiEnd 留为模块级，merchant_id 改为显式参数（由 runApi 从实例传入），
+// 避免原模块级 _merchantId 的多实例共享竞争。track/trackXxx 已改为实例方法读 this.merchantId。
+var reportApiEnd = function reportApiEnd(api, durationMs, merchantId) {
+  var extra = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   try {
     sdkTracker.log(_objectSpread({
       code: "".concat(TRACK_CODE_PREFIX, "api"),
       msg: api,
       m1: durationMs,
-      merchant_id: _merchantId
+      merchant_id: merchantId
     }, extra));
-  } catch (_unused3) {
+  } catch (_unused2) {
     /* 埋点失败绝不影响主流程 */
   }
 };
@@ -141,10 +110,37 @@ var normalizeApiResult = function normalizeApiResult(api, result) {
   return acc;
 };
 
+// 入参埋点：按 API 入参字段直接落入 d6 起，与 normalizeApiResult（d1-d5）错开。
+// 标量字段记实际值；shippingInfo 含姓名/电话/地址等 PII，仅记存在性。
+// onBeforeConfirm 为函数不可序列化跳过。
+// mount 仅取低基配置字段（type/notRedirectAfterComplete/theme/layout），忽略 appearance.variables 等高基数项。
+var normalizeApiInput = function normalizeApiInput(api, params) {
+  var acc = {};
+  if (!params) return acc;
+  if (api === 'submitPayment') {
+    var _params$amount, _params$currency;
+    acc.d6 = String(!!params.handleActions);
+    acc.d7 = (_params$amount = params.amount) !== null && _params$amount !== void 0 ? _params$amount : '';
+    acc.d8 = (_params$currency = params.currency) !== null && _params$currency !== void 0 ? _params$currency : '';
+    acc.d9 = params.shippingInfo ? 'true' : 'false';
+  } else if (api === 'mount') {
+    var _params$renderOptions, _params$renderOptions2, _params$renderOptions3, _params$renderOptions4, _params$renderOptions5, _params$renderOptions6, _params$renderOptions7, _params$sdkSelector, _params$renderOptions8, _appoint$singleOption, _appoint$storedCard;
+    acc.d6 = (_params$renderOptions = (_params$renderOptions2 = params.renderOptions) === null || _params$renderOptions2 === void 0 ? void 0 : _params$renderOptions2.type) !== null && _params$renderOptions !== void 0 ? _params$renderOptions : '';
+    acc.d7 = String(!!((_params$renderOptions3 = params.renderOptions) !== null && _params$renderOptions3 !== void 0 && _params$renderOptions3.notRedirectAfterComplete));
+    acc.d8 = (_params$renderOptions4 = (_params$renderOptions5 = params.renderOptions) === null || _params$renderOptions5 === void 0 || (_params$renderOptions5 = _params$renderOptions5.appearance) === null || _params$renderOptions5 === void 0 ? void 0 : _params$renderOptions5.theme) !== null && _params$renderOptions4 !== void 0 ? _params$renderOptions4 : '';
+    acc.d9 = (_params$renderOptions6 = (_params$renderOptions7 = params.renderOptions) === null || _params$renderOptions7 === void 0 || (_params$renderOptions7 = _params$renderOptions7.appearance) === null || _params$renderOptions7 === void 0 || (_params$renderOptions7 = _params$renderOptions7.layout) === null || _params$renderOptions7 === void 0 ? void 0 : _params$renderOptions7.type) !== null && _params$renderOptions6 !== void 0 ? _params$renderOptions6 : '';
+    acc.d10 = (_params$sdkSelector = params.sdkSelector) !== null && _params$sdkSelector !== void 0 ? _params$sdkSelector : '';
+    var appoint = (_params$renderOptions8 = params.renderOptions) === null || _params$renderOptions8 === void 0 ? void 0 : _params$renderOptions8.merchantAppointParam;
+    acc.d11 = (_appoint$singleOption = appoint === null || appoint === void 0 ? void 0 : appoint.singleOption) !== null && _appoint$singleOption !== void 0 ? _appoint$singleOption : '';
+    acc.d12 = (appoint === null || appoint === void 0 || (_appoint$storedCard = appoint.storedCard) === null || _appoint$storedCard === void 0 ? void 0 : _appoint$storedCard.needCVV) != null ? String(appoint.storedCard.needCVV) : '';
+  }
+  return acc;
+};
+
 // 统一包裹：捕获终态（resolve/reject）后上报，原值/原异常原样透传，不影响任何已有逻辑。
 // extraBuilder 供调用方注入实例上下文字段（如 paymentMethodType），其值覆盖 normalizeApiResult 结果。
 var runApi = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, fn, extraBuilder) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, fn, extraBuilder, inputExtra, merchantId) {
     var startedAt, result;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -155,12 +151,12 @@ var runApi = /*#__PURE__*/function () {
           return fn();
         case 4:
           result = _context.sent;
-          reportApiEnd(api, Date.now() - startedAt, _objectSpread(_objectSpread({}, normalizeApiResult(api, result)), extraBuilder === null || extraBuilder === void 0 ? void 0 : extraBuilder(false)));
+          reportApiEnd(api, Date.now() - startedAt, merchantId, _objectSpread(_objectSpread(_objectSpread({}, inputExtra), normalizeApiResult(api, result)), extraBuilder === null || extraBuilder === void 0 ? void 0 : extraBuilder(false)));
           return _context.abrupt("return", result);
         case 9:
           _context.prev = 9;
           _context.t0 = _context["catch"](1);
-          reportApiEnd(api, Date.now() - startedAt, _objectSpread({
+          reportApiEnd(api, Date.now() - startedAt, merchantId, _objectSpread(_objectSpread({}, inputExtra), {}, {
             d1: 'error',
             d2: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) || 'UNKNOWN'
           }, extraBuilder === null || extraBuilder === void 0 ? void 0 : extraBuilder(true)));
@@ -171,17 +167,10 @@ var runApi = /*#__PURE__*/function () {
       }
     }, _callee, null, [[1, 9]]);
   }));
-  return function runApi(_x, _x2, _x3) {
+  return function runApi(_x, _x2, _x3, _x4, _x5) {
     return _ref.apply(this, arguments);
   };
 }();
-import CallApp from "../../../../util/intl-callapp/es/main";
-import { getApplePayPaymentSession } from "../../../../service";
-import { BusManager, BusMessage } from "../../../bus";
-import { ApplePayActionEnum } from "../../../bus/interface";
-import { ERRORMESSAGE, PROMISE_CALLBACK_CODE } from "../../../../constant";
-import { LogConfig, Logger } from "../../../../util/logger";
-import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 var recoverSdkQueryBusinessResponse = function recoverSdkQueryBusinessResponse(error) {
   var response = error === null || error === void 0 ? void 0 : error.response;
   if ((response === null || response === void 0 ? void 0 : response.success) === false) {
@@ -306,6 +295,11 @@ export var ModernElementController = /*#__PURE__*/function () {
     _defineProperty(this, "currentPaymentMethodType", '');
     /** 提交进行中标志：submitPayment 执行期间为 true，用于拒绝并发重入，避免旧闭包串扰/重复拉起钱包 */
     _defineProperty(this, "isSubmitting", false);
+    /**
+     * 当前实例解析出的 merchantId，供 trackXxx / reportApiEnd 统一带上。
+     * 实例隔离：多实例并发 mount 时各自持有，避免原模块级 _merchantId 的共享竞争。
+     */
+    _defineProperty(this, "merchantId", '');
     this.options = options;
     this.onStatusChange = onStatusChange;
     if (options.sessionData) {
@@ -328,6 +322,47 @@ export var ModernElementController = /*#__PURE__*/function () {
     });
   }
   _createClass(ModernElementController, [{
+    key: "track",
+    value:
+    // ── 埋点 helper（实例方法，读 this.merchantId）────────────────────────
+    function track(phase, msg) {
+      var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      try {
+        var code = "".concat(TRACK_CODE_PREFIX).concat(phase === 'error' ? '' : phase);
+        sdkTracker.log(_objectSpread({
+          code: code,
+          msg: msg,
+          merchant_id: this.merchantId
+        }, extra));
+      } catch (_unused3) {
+        /* 埋点失败绝不影响主流程 */
+      }
+    }
+  }, {
+    key: "trackMount",
+    value: function trackMount(msg) {
+      var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      this.track('mount', msg, extra);
+    }
+  }, {
+    key: "trackHandshake",
+    value: function trackHandshake(msg) {
+      var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      this.track('handshake', msg, extra);
+    }
+  }, {
+    key: "trackElement",
+    value: function trackElement(msg) {
+      var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      this.track('element', msg, extra);
+    }
+  }, {
+    key: "trackError",
+    value: function trackError(msg) {
+      var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      this.track('error', msg, extra);
+    }
+  }, {
     key: "mount",
     value: function () {
       var _mount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(renderOptions, sdkSelector) {
@@ -335,16 +370,28 @@ export var ModernElementController = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              // 解析 merchantId（唯一赋值点）：早于 runApi 求值 this.merchantId 与 doMount，
+              // 使 mount_start / api_end 都能带上有值的 merchant_id。checkSessionData 在 sessionData
+              // 缺失/无效时会 throw，这里容错吞掉——失败的校验仍由后续 setup() 内的 checkSessionData
+              // 抛出、走 mount_error 统一上报，不改变错误时序。
+              try {
+                this.merchantId = resolveMerchantId(checkSessionData(this.options.sessionData, 'ELEMENT_PAYMENT'));
+              } catch (_unused4) {
+                /* setup 校验异常会统一上报 */
+              }
               return _context2.abrupt("return", runApi('mount', function () {
                 return _this.doMount(renderOptions, sdkSelector);
-              }));
-            case 1:
+              }, undefined, normalizeApiInput('mount', {
+                renderOptions: renderOptions,
+                sdkSelector: sdkSelector
+              }), this.merchantId));
+            case 2:
             case "end":
               return _context2.stop();
           }
-        }, _callee2);
+        }, _callee2, this);
       }));
-      function mount(_x4, _x5) {
+      function mount(_x6, _x7) {
         return _mount.apply(this, arguments);
       }
       return mount;
@@ -358,7 +405,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              trackMount('mount_start', {
+              this.trackMount('mount_start', {
                 d1: sdkSelector,
                 d2: this.options.sessionData ? 'has_session' : 'no_session'
               });
@@ -367,7 +414,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 _context3.next = 6;
                 break;
               }
-              trackError('selector_not_found', {
+              this.trackError('selector_not_found', {
                 d1: sdkSelector
               });
               (_this$options = this.options) === null || _this$options === void 0 || (_this$options$onEvent = _this$options.onEventCallback) === null || _this$options$onEvent === void 0 || _this$options$onEvent.call(_this$options, {
@@ -398,7 +445,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   if (iframeOrigin && iframeOrigin !== 'null') {
                     this.bridge.setOrigin(iframeOrigin);
                   }
-                } catch (_unused4) {
+                } catch (_unused5) {
                   // URL 解析失败时保持默认 origin
                 }
               } else {
@@ -411,7 +458,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               readyHandshakePromise = this.waitForReadyHandshake();
               this.iframe.src = iframeUrl;
               container.appendChild(this.iframe);
-              trackMount('iframe_loaded', {
+              this.trackMount('iframe_loaded', {
                 d1: iframeUrl
               });
 
@@ -431,7 +478,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               dataStructError = this.validateRenderData(setupConfig.renderData, setupConfig.renderDataError);
               if (dataStructError) {
                 setupConfig.renderDataError = dataStructError;
-                trackError('render_data_invalid', {
+                this.trackError('render_data_invalid', {
                   d1: dataStructError.code,
                   d2: dataStructError.reason
                 });
@@ -456,7 +503,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 error: dataStructError
               });
             case 40:
-              trackMount('mount_success', {
+              this.trackMount('mount_success', {
                 m1: this._mountStartTime ? Date.now() - this._mountStartTime : 0
               });
               return _context3.abrupt("return", {});
@@ -472,7 +519,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 error: _context3.t0
               });
             case 49:
-              trackError('mount_error', {
+              this.trackError('mount_error', {
                 d1: (_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.code) || 'UNKNOWN',
                 d2: (_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message) || ''
               });
@@ -491,7 +538,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           }
         }, _callee3, this, [[8, 44]]);
       }));
-      function doMount(_x6, _x7) {
+      function doMount(_x8, _x9) {
         return _doMount.apply(this, arguments);
       }
       return doMount;
@@ -519,7 +566,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this._mountStartTime = Date.now();
-              trackMount('setup_start');
+              this.trackMount('setup_start');
               // 缓存起来，submit时使用
               this.notRedirectAfterComplete = renderOptions.notRedirectAfterComplete || false;
               sessionData = this.options.sessionData; // checkSessionData 失败会 throw AntomSDKError（SESSION_DATA_INVALID），
@@ -527,9 +574,6 @@ export var ModernElementController = /*#__PURE__*/function () {
               parseData = checkSessionData(sessionData, 'ELEMENT_PAYMENT');
               lastEnv = this.options.environment === 'sandbox' ? 'sandbox' : 'prod';
               this.options.environment;
-              // 解析 merchantId（优先 clientId，缺失时容错回落到 extendInfo.merchantId），
-              // 缓存到模块级变量，使后续所有 trackXxx 埋点统一带上
-              _merchantId = resolveMerchantId(parseData);
 
               // 初始化 request 全局配置，使 sdkQuery 能正确发起请求
               // tracker: sdkTracker —— 接入 HTTP 层自动埋点（B 套），上报每个请求的成败/RTT/错误码
@@ -538,7 +582,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 hostSign: parseHostSign(sessionData),
                 env: lastEnv
               }, getDevReqConfig()), {}, {
-                sdkVersion: "0.0.1786071074-dev.0" || '',
+                sdkVersion: "0.0.1786071074-dev.2" || '',
                 tracker: sdkTracker
               }));
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
@@ -579,21 +623,21 @@ export var ModernElementController = /*#__PURE__*/function () {
                 });
               });
               queryPromise = Promise.all(promises);
-              _context4.next = 20;
+              _context4.next = 19;
               return Promise.race([queryPromise, destroyPromise]).finally(cancelDestroyCallback);
-            case 20:
+            case 19:
               _yield$Promise$race$f = _context4.sent;
               _yield$Promise$race$f2 = _slicedToArray(_yield$Promise$race$f, 2);
               sdkQueryResult = _yield$Promise$race$f2[0];
               oneAccountQueryResult = _yield$Promise$race$f2[1];
               if (sdkQueryResult.error) {
-                trackHandshake('sdk_query_failed', {
+                this.trackHandshake('sdk_query_failed', {
                   d1: ((_sdkQueryResult$error = sdkQueryResult.error) === null || _sdkQueryResult$error === void 0 ? void 0 : _sdkQueryResult$error.code) || '',
                   d2: ((_sdkQueryResult$error2 = sdkQueryResult.error) === null || _sdkQueryResult$error2 === void 0 ? void 0 : _sdkQueryResult$error2.message) || ''
                 });
               }
               if (shouldQueryOneAccountFlag && oneAccountQueryResult !== null && oneAccountQueryResult !== void 0 && oneAccountQueryResult.error) {
-                trackHandshake('one_account_query_failed', {
+                this.trackHandshake('one_account_query_failed', {
                   d1: ((_oneAccountQueryResul = oneAccountQueryResult.error) === null || _oneAccountQueryResul === void 0 ? void 0 : _oneAccountQueryResul.code) || '',
                   d2: ((_oneAccountQueryResul2 = oneAccountQueryResult.error) === null || _oneAccountQueryResul2 === void 0 ? void 0 : _oneAccountQueryResul2.message) || ''
                 });
@@ -628,7 +672,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   paymentMethodCategoryType: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.paymentMethodCategoryType,
                   productSceneVersion: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.productSceneVersion,
                   trackId: parseTrackerId(sessionData),
-                  merchantId: _merchantId,
+                  merchantId: this.merchantId,
                   paymentMethodType: parseData === null || parseData === void 0 || (_parseData$paymentMet = parseData.paymentMethodInfoView) === null || _parseData$paymentMet === void 0 ? void 0 : _parseData$paymentMet.paymentMethodType
                 },
                 // 原老字段
@@ -636,7 +680,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "0.0.1786071074-dev.0" || '',
+                sdkVersion: "0.0.1786071074-dev.2" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
@@ -646,13 +690,13 @@ export var ModernElementController = /*#__PURE__*/function () {
                   env: lastEnv
                 }, getDevReqConfig())
               });
-            case 30:
+            case 29:
             case "end":
               return _context4.stop();
           }
         }, _callee4, this);
       }));
-      function setup(_x8) {
+      function setup(_x10) {
         return _setup.apply(this, arguments);
       }
       return setup;
@@ -771,7 +815,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           schemaUrl = payload.schemaUrl,
           destroy = payload.destroy;
         // d1=mode(redirect/replace) d2=跳转类型 d3=兜底url d4=appLinkUrl d5=schemaUrl d6=是否销毁
-        trackElement('redirect', {
+        _this3.trackElement('redirect', {
           d1: mode || 'redirect',
           d2: appLinkUrl ? 'app_link' : schemaUrl ? 'schema' : 'url',
           d3: url || '',
@@ -794,7 +838,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             var app = new CallApp({
               resultJudgmentTime: 2000,
               fallback: function fallback() {
-                trackElement('redirect_fallback', {
+                _this3.trackElement('redirect_fallback', {
                   d1: 'callapp_failed',
                   d2: url || ''
                 });
@@ -809,7 +853,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             fallbackJump();
           }
         } catch (error) {
-          trackError('redirect_error', {
+          _this3.trackError('redirect_error', {
             d1: 'callapp_exception',
             d2: (error === null || error === void 0 ? void 0 : error.message) || '',
             d3: url || ''
@@ -867,14 +911,14 @@ export var ModernElementController = /*#__PURE__*/function () {
               sessionData = this.options.sessionData;
               applePayProps = payload === null || payload === void 0 || (_paymentMethod = payload.paymentMethod) === null || _paymentMethod === void 0 || (_paymentMethod = _paymentMethod.paymentMethodDetail) === null || _paymentMethod === void 0 ? void 0 : _paymentMethod.applePayProps;
               paymentRequest = applePayProps === null || applePayProps === void 0 ? void 0 : applePayProps.paymentRequest;
-              trackElement('applepay_token_request', {
+              this.trackElement('applepay_token_request', {
                 d1: paymentRequest ? 'has_payment_request' : 'no_payment_request'
               });
               if (paymentRequest) {
                 _context7.next = 8;
                 break;
               }
-              trackError('applepay_token_missing_data', {
+              this.trackError('applepay_token_missing_data', {
                 d1: 'MISSING_DATA'
               });
               this.bridge.send(AMSMessageType.GET_APPLE_PAY_TOKEN_REPLY, {
@@ -886,7 +930,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               return _context7.abrupt("return");
             case 8:
               merchantCapabilities = paymentRequest.merchantCapabilities, merchantInfo = paymentRequest.merchantInfo, paymentAmount = paymentRequest.paymentAmount, supportedNetworks = paymentRequest.supportedNetworks, version = paymentRequest.version, requiredBillingContactFields = paymentRequest.requiredBillingContactFields, requiredShippingContactFields = paymentRequest.requiredShippingContactFields;
-              finalAmount = (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.formattedValue) || (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value);
+              finalAmount = paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value;
               finalCurrency = paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency; // 商户 amount/currency 覆盖（优先级高于 iframe 传来的值，用于 Apple Pay 弹窗展示）
               if (this._merchantAmount) {
                 finalAmount = this._merchantAmount;
@@ -931,7 +975,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                         while (1) switch (_context5.prev = _context5.next) {
                           case 0:
-                            trackElement('applepay_validate_start', {
+                            _this4.trackElement('applepay_validate_start', {
                               d1: 'merchant_validate'
                             });
                             _context5.next = 3;
@@ -951,12 +995,12 @@ export var ModernElementController = /*#__PURE__*/function () {
                               _context5.next = 7;
                               break;
                             }
-                            trackElement('applepay_validate_success', {
+                            _this4.trackElement('applepay_validate_success', {
                               d1: 'got_session'
                             });
                             return _context5.abrupt("return", typeof res.merchantSessionObject === 'string' ? JSON.parse(res.merchantSessionObject) : res.merchantSessionObject);
                           case 7:
-                            trackError('applepay_merchant_validate_failed', {
+                            _this4.trackError('applepay_merchant_validate_failed', {
                               d1: 'VALIDATION_FAILED',
                               d2: (res === null || res === void 0 ? void 0 : res.errorMessage) || 'Merchant validation failed'
                             });
@@ -969,20 +1013,20 @@ export var ModernElementController = /*#__PURE__*/function () {
                         }
                       }, _callee5);
                     }));
-                    function validateMerchant(_x11) {
+                    function validateMerchant(_x13) {
                       return _validateMerchant.apply(this, arguments);
                     }
                     return validateMerchant;
                   }(),
                   onAuthorized: function () {
                     var _onAuthorized = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref4) {
-                      var token, billingContact, shippingContact, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
+                      var token, billingContact, shippingContact, startTime, _yield$executeWithTim, rawResult, timedOut, isTimeout, shouldContinue;
                       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
                         while (1) switch (_context6.prev = _context6.next) {
                           case 0:
                             token = _ref4.token, billingContact = _ref4.billingContact, shippingContact = _ref4.shippingContact;
                             if (!onBeforeConfirm) {
-                              _context6.next = 18;
+                              _context6.next = 19;
                               break;
                             }
                             _context6.prev = 2;
@@ -996,50 +1040,51 @@ export var ModernElementController = /*#__PURE__*/function () {
                             rawResult = _yield$executeWithTim.result;
                             timedOut = _yield$executeWithTim.timedOut;
                             // 双重校验：timedOut（Promise race）+ startTime（实际时间差），与老 ElementController 对齐
-                            shouldContinue = !timedOut && !!rawResult && Date.now() - startTime < BEFORE_CONFIRM_TIMEOUT_MS;
-                            if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
-                              trackError('sdk_before_confirm_timeout', {
+                            isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
+                            shouldContinue = !isTimeout && !!rawResult;
+                            if (isTimeout) {
+                              _this4.trackError('sdk_before_confirm_timeout', {
                                 d1: 'applePay_chrome_modern'
                               });
                             }
                             if (shouldContinue) {
-                              _context6.next = 13;
+                              _context6.next = 14;
                               break;
                             }
                             return _context6.abrupt("return", {
                               success: false,
-                              errorCode: 'MERCHANT_CONFIRM_ABORT'
+                              errorCode: isTimeout ? MERCHANT_CONFIRM_TIMEOUT_CODE : MERCHANT_CONFIRM_ABORT_CODE
                             });
-                          case 13:
-                            _context6.next = 18;
+                          case 14:
+                            _context6.next = 19;
                             break;
-                          case 15:
-                            _context6.prev = 15;
+                          case 16:
+                            _context6.prev = 16;
                             _context6.t0 = _context6["catch"](2);
                             return _context6.abrupt("return", {
                               success: false,
-                              errorCode: 'MERCHANT_CONFIRM_ABORT'
+                              errorCode: MERCHANT_CONFIRM_ABORT_CODE
                             });
-                          case 18:
+                          case 19:
                             capturedResult = {
                               token: token,
                               billingContact: billingContact,
                               shippingContact: shippingContact
                             };
-                            trackElement('applepay_authorized', {
+                            _this4.trackElement('applepay_authorized', {
                               d1: token ? 'has_token' : 'no_token'
                             });
                             return _context6.abrupt("return", {
                               success: true,
                               result: capturedResult
                             });
-                          case 21:
+                          case 22:
                           case "end":
                             return _context6.stop();
                         }
-                      }, _callee6, null, [[2, 15]]);
+                      }, _callee6, null, [[2, 16]]);
                     }));
-                    function onAuthorized(_x12) {
+                    function onAuthorized(_x14) {
                       return _onAuthorized.apply(this, arguments);
                     }
                     return onAuthorized;
@@ -1050,7 +1095,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               _context7.next = 18;
               return service.startPay();
             case 18:
-              trackElement('applepay_token_success', {
+              this.trackElement('applepay_token_success', {
                 d1: (_capturedResult = capturedResult) !== null && _capturedResult !== void 0 && _capturedResult.token ? 'has_token' : 'no_token'
               });
               this.bridge.send(AMSMessageType.GET_APPLE_PAY_TOKEN_REPLY, {
@@ -1066,11 +1111,11 @@ export var ModernElementController = /*#__PURE__*/function () {
               if ((_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.errorCode) !== 'APPLE_PAY_PAYMENT_SESSION_REQUEST_FAILED') {
                 errCode = (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.errorCode) || 'APPLE_PAY_NOT_SUPPORTED'; // 用户主动取消单独标记，便于区分取消与真实失败
                 if (errCode === 'APPLE_PAY_CANCEL') {
-                  trackElement('applepay_cancel', {
+                  this.trackElement('applepay_cancel', {
                     d1: 'user_cancel'
                   });
                 } else {
-                  trackError('applepay_token_failed', {
+                  this.trackError('applepay_token_failed', {
                     d1: errCode,
                     d2: (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.errorMessage) || ''
                   });
@@ -1088,7 +1133,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           }
         }, _callee7, this, [[15, 22]]);
       }));
-      function handleGetApplePayToken(_x9, _x10) {
+      function handleGetApplePayToken(_x11, _x12) {
         return _handleGetApplePayToken.apply(this, arguments);
       }
       return handleGetApplePayToken;
@@ -1121,12 +1166,12 @@ export var ModernElementController = /*#__PURE__*/function () {
       // 否则从 paymentMethodDetail.googlePayProps 取（兼容 v1 的数据结构）
       var environment = (data === null || data === void 0 ? void 0 : data.environment) || (googlePayProps === null || googlePayProps === void 0 ? void 0 : googlePayProps.environment) || 'TEST';
       var paymentRequest = (data === null || data === void 0 ? void 0 : data.paymentRequest) || (googlePayProps === null || googlePayProps === void 0 ? void 0 : googlePayProps.paymentRequest) || {};
-      trackElement('googlepay_token_request', {
+      this.trackElement('googlepay_token_request', {
         d1: environment,
         d2: paymentRequest ? 'has_payment_request' : 'no_payment_request'
       });
       if (!paymentRequest || !Object.keys(paymentRequest).length) {
-        trackError('googlepay_token_missing_data', {
+        this.trackError('googlepay_token_missing_data', {
           d1: 'MISSING_DATA'
         });
         this.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
@@ -1157,7 +1202,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           };
         }).then(function (paymentData) {
           if (paymentData) {
-            trackElement('googlepay_token_success', {
+            _this5.trackElement('googlepay_token_success', {
               d1: 'has_token'
             });
             _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
@@ -1168,11 +1213,11 @@ export var ModernElementController = /*#__PURE__*/function () {
         }).catch(function (err) {
           var statusCode = (err === null || err === void 0 ? void 0 : err.statusCode) || 'GOOGLE_PAY_PAYMENT_FAILED';
           if (statusCode === 'CANCELED') {
-            trackElement('googlepay_cancel', {
+            _this5.trackElement('googlepay_cancel', {
               d1: 'user_cancel'
             });
           } else {
-            trackError('googlepay_token_failed', {
+            _this5.trackError('googlepay_token_failed', {
               d1: statusCode,
               d2: (err === null || err === void 0 ? void 0 : err.statusMessage) || ''
             });
@@ -1209,7 +1254,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         loadAndPay();
       };
       script.onerror = function () {
-        trackError('googlepay_script_load_failed', {
+        _this5.trackError('googlepay_script_load_failed', {
           d1: 'script_error'
         });
         _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
@@ -1232,11 +1277,11 @@ export var ModernElementController = /*#__PURE__*/function () {
     value: function handleHandlePayment() {
       var sessionData = this.options.sessionData;
       var parseData = getMetaData(sessionData);
-      trackElement('handle_payment', {
+      this.trackElement('handle_payment', {
         d1: 'skipRender_applepay_publish'
       });
       if (!parseData) {
-        trackError('handle_payment_meta_failed', {
+        this.trackError('handle_payment_meta_failed', {
           d1: 'meta_parse_failed'
         });
       }
@@ -1286,8 +1331,9 @@ export var ModernElementController = /*#__PURE__*/function () {
         var rawResult = _ref5.result,
           timedOut = _ref5.timedOut;
         // 双重校验：timedOut（Promise race）+ startTime（实际时间差），与老 ElementController 对齐
-        var shouldContinue = !timedOut && !!rawResult && Date.now() - startTime < BEFORE_CONFIRM_TIMEOUT_MS;
-        if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+        var isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
+        var shouldContinue = !isTimeout && !!rawResult;
+        if (isTimeout) {
           logger.logError({
             title: 'sdk_before_confirm_timeout'
           });
@@ -1297,10 +1343,12 @@ export var ModernElementController = /*#__PURE__*/function () {
         }, {
           shouldContinue: shouldContinue
         });
-        _this6.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
+        _this6.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, _objectSpread({
           success: true,
           result: !!shouldContinue
-        });
+        }, isTimeout ? {
+          isTimeout: true
+        } : {}));
       }).catch(function (error) {
         logger.logError({
           title: 'sdk_before_confirm_error'
@@ -1327,7 +1375,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
           cancelDestroyCallback();
-          trackError('ready_handshake_timeout', {
+          _this7.trackError('ready_handshake_timeout', {
             d1: String(MOUNT_TIMEOUT)
           });
           reject({
@@ -1344,7 +1392,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           clearTimeout(timer);
           cancelDestroyCallback();
           if (!((_this7$iframe = _this7.iframe) !== null && _this7$iframe !== void 0 && _this7$iframe.contentWindow)) {
-            trackError('iframe_contentwindow_unavailable', {
+            _this7.trackError('iframe_contentwindow_unavailable', {
               d1: 'after_ready_handshake'
             });
             reject({
@@ -1354,7 +1402,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             return;
           }
           _this7.bridge.setTarget(_this7.iframe.contentWindow);
-          trackHandshake('ready_handshake_received', {
+          _this7.trackHandshake('ready_handshake_received', {
             m1: _this7._mountStartTime ? Date.now() - _this7._mountStartTime : 0
           });
           resolve();
@@ -1369,7 +1417,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "sendHandshake",
     value: function sendHandshake(setupConfig) {
       this.bridge.send(MessageType.HANDSHAKE, setupConfig);
-      trackHandshake('handshake_sent', {
+      this.trackHandshake('handshake_sent', {
         d1: (setupConfig === null || setupConfig === void 0 ? void 0 : setupConfig.sdkVersion) || ''
       });
     }
@@ -1385,7 +1433,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
           cancelDestroyCallback();
-          trackError('handshake_ack_timeout', {
+          _this8.trackError('handshake_ack_timeout', {
             d1: String(MOUNT_TIMEOUT)
           });
           reject({
@@ -1400,7 +1448,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         _this8.bridge.once(MessageType.HANDSHAKE_ACK, function () {
           clearTimeout(timer);
           cancelDestroyCallback();
-          trackHandshake('handshake_ack_received', {
+          _this8.trackHandshake('handshake_ack_received', {
             m1: _this8._mountStartTime ? Date.now() - _this8._mountStartTime : 0
           });
           resolve();
@@ -1421,14 +1469,14 @@ export var ModernElementController = /*#__PURE__*/function () {
                 return _this9.currentPaymentMethodType ? {
                   d4: _this9.currentPaymentMethodType
                 } : {};
-              }));
+              }, normalizeApiInput('submitPayment', params), this.merchantId));
             case 1:
             case "end":
               return _context8.stop();
           }
-        }, _callee8);
+        }, _callee8, this);
       }));
-      function submitPayment(_x13) {
+      function submitPayment(_x15) {
         return _submitPayment.apply(this, arguments);
       }
       return submitPayment;
@@ -1438,7 +1486,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     value: function () {
       var _doSubmitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
         var _this10 = this;
-        var _this$options$loading7, _this$options$loading8, isApplePay, _ref6, onBeforeConfirm, serializableParams, startTime, _yield$executeWithTim2, shouldContinue, timedOut, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, cleanups, _result$error5, resultPromise, result, _this$options$loading9, _this$options$loading10;
+        var _this$options$loading7, _this$options$loading8, isApplePay, _ref6, onBeforeConfirm, serializableParams, startTime, _yield$executeWithTim2, shouldContinue, timedOut, isTimeout, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, cleanups, _result$error5, resultPromise, result, _this$options$loading9, _this$options$loading10;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -1446,7 +1494,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 _context9.next = 3;
                 break;
               }
-              trackError('submit_not_ready', {
+              this.trackError('submit_not_ready', {
                 d1: this.status
               });
               return _context9.abrupt("return", {
@@ -1461,7 +1509,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 _context9.next = 6;
                 break;
               }
-              trackError('submit_in_progress', {});
+              this.trackError('submit_in_progress', {});
               return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
@@ -1475,7 +1523,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY'; // 剥除 onBeforeConfirm 函数，避免 postMessage 序列化报错
               _ref6 = params || {}, onBeforeConfirm = _ref6.onBeforeConfirm, serializableParams = _objectWithoutProperties(_ref6, _excluded2); // ── 非 Apple Pay：同步执行 onBeforeConfirm（submit 前拦截，对齐老 ElementController） ──
               if (!(onBeforeConfirm && !isApplePay)) {
-                _context9.next = 31;
+                _context9.next = 32;
                 break;
               }
               logger.logInfo({
@@ -1494,11 +1542,13 @@ export var ModernElementController = /*#__PURE__*/function () {
               _yield$executeWithTim2 = _context9.sent;
               shouldContinue = _yield$executeWithTim2.result;
               timedOut = _yield$executeWithTim2.timedOut;
-              if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
-                _context9.next = 22;
+              // 双重校验：timedOut（Promise race）+ startTime（实际时间差），防止竞态误判
+              isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
+              if (!(isTimeout || !shouldContinue)) {
+                _context9.next = 23;
                 break;
               }
-              if (timedOut) {
+              if (isTimeout) {
                 logger.logError({
                   title: 'sdk_before_confirm_timeout'
                 }, {
@@ -1516,21 +1566,22 @@ export var ModernElementController = /*#__PURE__*/function () {
               return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
-                  code: 'MERCHANT_CONFIRM_ABORT',
-                  message: 'Merchant canceled payment.'
+                  code: isTimeout ? MERCHANT_CONFIRM_TIMEOUT_CODE : MERCHANT_CONFIRM_ABORT_CODE,
+                  message: isTimeout ? 'Merchant confirmation timed out.' : 'Merchant canceled payment.',
+                  needChangeSessionForRetry: false
                 }
               });
-            case 22:
+            case 23:
               logger.logInfo({
                 title: 'sdk_before_confirm_success'
               }, {
                 paymentMethodType: this.currentPaymentMethodType || 'UNKNOWN',
                 path: 'nonApplePay_sync'
               });
-              _context9.next = 29;
+              _context9.next = 30;
               break;
-            case 25:
-              _context9.prev = 25;
+            case 26:
+              _context9.prev = 26;
               _context9.t0 = _context9["catch"](12);
               logger.logError({
                 title: 'sdk_before_confirm_error'
@@ -1542,14 +1593,15 @@ export var ModernElementController = /*#__PURE__*/function () {
               return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
-                  code: 'MERCHANT_CONFIRM_ABORT',
-                  message: 'Merchant canceled payment.'
+                  code: MERCHANT_CONFIRM_ABORT_CODE,
+                  message: 'Merchant canceled payment.',
+                  needChangeSessionForRetry: false
                 }
               });
-            case 29:
-              _context9.next = 32;
+            case 30:
+              _context9.next = 33;
               break;
-            case 31:
+            case 32:
               if (!onBeforeConfirm) {
                 logger.logInfo({
                   title: 'sdk_before_confirm_skip'
@@ -1558,7 +1610,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
                 });
               }
-            case 32:
+            case 33:
               // Apple Pay: 标记是否有 beforeConfirm，供 SUBMIT 消息的 hasBeforeConfirm 字段使用
               hasBeforeConfirmForApplePay = isApplePay && !!onBeforeConfirm; // ── amount/currency 校验 + 缓存（对齐老 ElementController 逻辑） ──
               hasAmount = !!(serializableParams !== null && serializableParams !== void 0 && serializableParams.amount);
@@ -1575,14 +1627,14 @@ export var ModernElementController = /*#__PURE__*/function () {
               this._merchantAmount = hasAmount && hasCurrency ? serializableParams.amount : null;
               this._merchantCurrency = hasAmount && hasCurrency ? serializableParams.currency : null;
               (_this$options$loading7 = this.options.loading) === null || _this$options$loading7 === void 0 || (_this$options$loading8 = _this$options$loading7.onStartLoading) === null || _this$options$loading8 === void 0 || _this$options$loading8.call(_this$options$loading7);
-              trackElement('submit_start', {
+              this.trackElement('submit_start', {
                 d1: this.notRedirectAfterComplete ? 'if_required' : 'always'
               });
               // 收集本轮 once 监听的 cleanup：submitPayment 每次注册四类监听，但一轮只会命中部分，
               // 未命中的 once wrapper 绑着旧闭包（旧 onBeforeConfirm / 旧 resolve）会残留并串扰后续提交，
               // 在 submit 终态统一释放（二次 off 幂等，已命中的 once 已自行 off）。
               cleanups = [];
-              _context9.prev = 41;
+              _context9.prev = 42;
               resultPromise = new Promise(function (resolve) {
                 // 先注册事件监听，再发送 SUBMIT，避免 webapp 快速响应导致消息丢失
                 // PC 非 Safari：webapp 委托 SDK 拉起 Apple Pay 拿 token
@@ -1608,45 +1660,45 @@ export var ModernElementController = /*#__PURE__*/function () {
                 amount: serializableParams.amount,
                 currency: serializableParams.currency
               } : {}));
-              _context9.next = 46;
+              _context9.next = 47;
               return resultPromise;
-            case 46:
+            case 47:
               result = _context9.sent;
-              trackElement('submit_reply', {
+              this.trackElement('submit_reply', {
                 d1: (result === null || result === void 0 ? void 0 : result.status) || '',
                 d2: (result === null || result === void 0 || (_result$error5 = result.error) === null || _result$error5 === void 0 ? void 0 : _result$error5.code) || ''
               });
               return _context9.abrupt("return", adaptSubmitResult(result));
-            case 51:
-              _context9.prev = 51;
-              _context9.t1 = _context9["catch"](41);
-              trackError('submit_error', {
+            case 52:
+              _context9.prev = 52;
+              _context9.t1 = _context9["catch"](42);
+              this.trackError('submit_error', {
                 d1: (_context9.t1 === null || _context9.t1 === void 0 ? void 0 : _context9.t1.code) || 'UNKNOWN',
                 d2: (_context9.t1 === null || _context9.t1 === void 0 ? void 0 : _context9.t1.message) || ''
               });
               throw _context9.t1;
-            case 55:
-              _context9.prev = 55;
+            case 56:
+              _context9.prev = 56;
               cleanups.forEach(function (fn) {
                 try {
                   fn();
-                } catch (_unused6) {
+                } catch (_unused7) {
                   /* ignore cleanup error */
                 }
               });
               (_this$options$loading9 = this.options.loading) === null || _this$options$loading9 === void 0 || (_this$options$loading10 = _this$options$loading9.onEndLoading) === null || _this$options$loading10 === void 0 || _this$options$loading10.call(_this$options$loading9);
-              return _context9.finish(55);
-            case 59:
-              _context9.prev = 59;
+              return _context9.finish(56);
+            case 60:
+              _context9.prev = 60;
               this.isSubmitting = false;
-              return _context9.finish(59);
-            case 62:
+              return _context9.finish(60);
+            case 63:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[7,, 59, 62], [12, 25], [41, 51, 55, 59]]);
+        }, _callee9, this, [[7,, 60, 63], [12, 26], [42, 52, 56, 60]]);
       }));
-      function doSubmitPayment(_x14) {
+      function doSubmitPayment(_x16) {
         return _doSubmitPayment.apply(this, arguments);
       }
       return doSubmitPayment;
@@ -1661,12 +1713,12 @@ export var ModernElementController = /*#__PURE__*/function () {
             case 0:
               return _context10.abrupt("return", runApi('validateFields', function () {
                 return _this11.doValidateFields();
-              }));
+              }, undefined, undefined, this.merchantId));
             case 1:
             case "end":
               return _context10.stop();
           }
-        }, _callee10);
+        }, _callee10, this);
       }));
       function validateFields() {
         return _validateFields.apply(this, arguments);
@@ -1685,7 +1737,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 _context11.next = 3;
                 break;
               }
-              trackError('validate_not_ready', {
+              this.trackError('validate_not_ready', {
                 d1: this.status
               });
               return _context11.abrupt("return", {
@@ -1695,7 +1747,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               this.send(AMSMessageType.VALIDATE);
               return _context11.abrupt("return", new Promise(function (resolve) {
                 var timer = setTimeout(function () {
-                  trackError('validate_fields_timeout', {
+                  _this12.trackError('validate_fields_timeout', {
                     d1: '15000'
                   });
                   resolve({
@@ -1705,7 +1757,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 _this12.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
                   clearTimeout(timer);
                   var isValid = !!(payload !== null && payload !== void 0 && payload.isValid);
-                  trackElement('validate_result', {
+                  _this12.trackElement('validate_result', {
                     d1: isValid ? 'valid' : 'invalid'
                   });
                   resolve(payload || {
@@ -1738,7 +1790,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           }
         }, _callee12);
       }));
-      function updatePayment(_x15) {
+      function updatePayment(_x17) {
         return _updatePayment.apply(this, arguments);
       }
       return updatePayment;
@@ -1752,7 +1804,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       var _this$iframe;
-      trackElement('destroy', {
+      this.trackElement('destroy', {
         d1: this.status
       });
       if (this.status === 'initialized' || this.status === 'destroyed') {
@@ -1869,7 +1921,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       // 清理已存在的 modal
       this.handleCloseModal();
       var mode = device.isMobile ? 'mobile' : 'desktop';
-      trackElement('open_modal', {
+      this.trackElement('open_modal', {
         d1: mode,
         d2: (payload === null || payload === void 0 ? void 0 : payload.modalId) || ''
       });
@@ -1881,7 +1933,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         payload.url = url.toString();
       } catch (e) {
         var error = new OpenSDKError('Invalid URL', 'INVALID_MODAL_URL', 'APP_RUNTIME');
-        trackError('open_modal_invalid_url', {
+        this.trackError('open_modal_invalid_url', {
           d1: 'INVALID_MODAL_URL',
           d2: (payload === null || payload === void 0 ? void 0 : payload.url) || ''
         });
@@ -1899,9 +1951,10 @@ export var ModernElementController = /*#__PURE__*/function () {
       // 从 appearance 提取主题信息，组装 loadingConfig（对齐 antom.ts openModal 的处理逻辑）
       var appearanceTheme = (payload === null || payload === void 0 || (_payload$appearance = payload.appearance) === null || _payload$appearance === void 0 ? void 0 : _payload$appearance.theme) || 'default';
       var themeConfig = (_themeColorMap$appear = themeColorMap[appearanceTheme]) !== null && _themeColorMap$appear !== void 0 ? _themeColorMap$appear : themeColorMap.default;
+      var appearanceVariables = payload === null || payload === void 0 || (_payload$appearance2 = payload.appearance) === null || _payload$appearance2 === void 0 ? void 0 : _payload$appearance2.variables;
       var loadingConfig = {
         theme: themeConfig.theme,
-        backgroundColor: (payload === null || payload === void 0 || (_payload$appearance2 = payload.appearance) === null || _payload$appearance2 === void 0 || (_payload$appearance2 = _payload$appearance2.variables) === null || _payload$appearance2 === void 0 ? void 0 : _payload$appearance2['background-primary']) || themeConfig.backgroundColor
+        backgroundColor: (appearanceVariables === null || appearanceVariables === void 0 ? void 0 : appearanceVariables['color-background-primary']) || (appearanceVariables === null || appearanceVariables === void 0 ? void 0 : appearanceVariables['background-primary']) || themeConfig.backgroundColor
       };
 
       // 调用 openModal 工具函数创建 DOM（overlay + modal + iframe + 动画 + close icon + loading）
@@ -1920,7 +1973,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         destroy = _openModal.destroy;
       var offReady = modalBridge.once(MessageType.MODAL_TRANSFER_READY, function (_payload, _ports, meta) {
         if (meta && meta.source !== iframe.contentWindow) return;
-        trackElement('modal_loaded', {
+        _this15.trackElement('modal_loaded', {
           d1: payload.url
         });
         // 确保 target 已设置（如果 load 事件尚未触发，在此设置）
@@ -1931,7 +1984,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             if (iframeOrigin && iframeOrigin !== 'null') {
               modalBridge.setOrigin(iframeOrigin);
             }
-          } catch (_unused7) {
+          } catch (_unused8) {
             // URL 解析失败时保持默认 origin
           }
           // 如果 payload 有 appearance，通过 TRANSFER_MODAL_APPEARANCE 消息发送给 modal
@@ -1949,7 +2002,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       this.modalIframe = iframe;
       this.modalDestroy = function () {
         if (payload.closeConfirm) {
-          trackElement('modal_close_confirm', {
+          _this15.trackElement('modal_close_confirm', {
             d1: 'confirm_resolved'
           });
         }
@@ -1966,7 +2019,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "handleCloseModal",
     value: function handleCloseModal() {
       // 如果有等待中的 closeConfirm，resolve 它
-      trackElement('modal_closed', {
+      this.trackElement('modal_closed', {
         d1: this.modalBridge ? 'with_bridge' : 'no_bridge'
       });
       if (this.modalBridge) {