@alipay/ams-checkout 2.0.22 → 2.0.24

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

@@ -1,15 +1,12 @@
 var _excluded = ["onStatusChange"],
   _excluded2 = ["onBeforeConfirm"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -24,15 +21,20 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 } from "../../../../modern/tools";
+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 { shouldQueryOneAccount } from "../../../utils/connectConfig";
 import { device } from "../../../../util";
 import { EventCallbackCode } from "../type";
 import { adaptSubmitResult, adaptAppearance } from "./adapter";
+import { safeParse } from "../util";
 import { v4 as uuid } from 'uuid';
 
 // ============================================================
@@ -43,18 +45,45 @@ 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
+      msg: msg,
+      merchant_id: _merchantId
     }, extra));
   } catch (_unused) {
     /* 埋点失败绝不影响主流程 */
   }
 };
+
+/**
+ * 优先取 sessionData 解析出的 clientId；
+ * 缺失时从容错角度回落到 extendInfo 中的 merchantId（URL 编码需解码）。
+ * 全程容错：任一步骤缺失/解析失败都返回空串，绝不抛异常。
+ */
+var resolveMerchantId = function resolveMerchantId(parseData) {
+  if (parseData !== null && parseData !== void 0 && parseData.clientId) {
+    return parseData.clientId;
+  }
+  try {
+    var info = safeParse(parseData === null || parseData === void 0 ? void 0 : parseData.extendInfo, {});
+    var merchantId = info === null || info === void 0 ? void 0 : info.merchantId;
+    if (!merchantId || typeof merchantId !== 'string') {
+      return '';
+    }
+    return decodeURIComponent(merchantId);
+  } catch (_unused2) {
+    return '';
+  }
+};
 var trackMount = function trackMount(msg) {
   var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return track('mount', msg, extra);
@@ -71,6 +100,81 @@ 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] : {};
+  try {
+    sdkTracker.log(_objectSpread({
+      code: "".concat(TRACK_CODE_PREFIX, "api"),
+      msg: api,
+      m1: durationMs,
+      merchant_id: _merchantId
+    }, extra));
+  } catch (_unused3) {
+    /* 埋点失败绝不影响主流程 */
+  }
+};
+
+// 将返回给商户的结果对象归一为埋点维度：d1 状态/成败、d2 error.code、d3 traceId、d4 扩展
+var normalizeApiResult = function normalizeApiResult(api, result) {
+  var acc = {};
+  if (api === 'submitPayment') {
+    var _result$error, _result$error2;
+    acc.d1 = (result === null || result === void 0 ? void 0 : result.status) || '';
+    acc.d2 = (result === null || result === void 0 || (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.code) || '';
+    if (result !== null && result !== void 0 && (_result$error2 = result.error) !== null && _result$error2 !== void 0 && _result$error2.traceId) acc.d3 = result.error.traceId;
+    // d4 固定留给 paymentMethodType（与 submit_reply 链 d4 口径一致，便于跨链关联）
+    if (result !== null && result !== void 0 && result.userCanceled3D) acc.d5 = 'true';
+  } else if (api === 'mount') {
+    var _result$error3, _result$error4;
+    acc.d1 = result !== null && result !== void 0 && result.error ? 'fail' : 'success';
+    acc.d2 = (result === null || result === void 0 || (_result$error3 = result.error) === null || _result$error3 === void 0 ? void 0 : _result$error3.code) || '';
+    if (result !== null && result !== void 0 && (_result$error4 = result.error) !== null && _result$error4 !== void 0 && _result$error4.traceId) acc.d3 = result.error.traceId;
+  } else if (api === 'validateFields') {
+    acc.d1 = result !== null && result !== void 0 && result.isValid ? 'valid' : 'invalid';
+  }
+  return acc;
+};
+
+// 统一包裹：捕获终态（resolve/reject）后上报，原值/原异常原样透传，不影响任何已有逻辑。
+// extraBuilder 供调用方注入实例上下文字段（如 paymentMethodType），其值覆盖 normalizeApiResult 结果。
+var runApi = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, fn, extraBuilder) {
+    var startedAt, result;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          startedAt = Date.now();
+          _context.prev = 1;
+          _context.next = 4;
+          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)));
+          return _context.abrupt("return", result);
+        case 9:
+          _context.prev = 9;
+          _context.t0 = _context["catch"](1);
+          reportApiEnd(api, Date.now() - startedAt, _objectSpread({
+            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)));
+          throw _context.t0;
+        case 13:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1, 9]]);
+  }));
+  return function runApi(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
 import CallApp from "../../../../util/intl-callapp/es/main";
 import { getApplePayPaymentSession } from "../../../../service";
 import { BusManager, BusMessage } from "../../../bus";
@@ -175,9 +279,9 @@ var AMSMessageType = {
  * 7. ready 后发送缓存的消息
  */
 export var ModernElementController = /*#__PURE__*/function () {
-  function ModernElementController(_ref) {
-    var onStatusChange = _ref.onStatusChange,
-      options = _objectWithoutProperties(_ref, _excluded);
+  function ModernElementController(_ref2) {
+    var onStatusChange = _ref2.onStatusChange,
+      options = _objectWithoutProperties(_ref2, _excluded);
     _classCallCheck(this, ModernElementController);
     _defineProperty(this, "options", void 0);
     _defineProperty(this, "onStatusChange", void 0);
@@ -190,7 +294,6 @@ export var ModernElementController = /*#__PURE__*/function () {
     _defineProperty(this, "modalBridge", null);
     _defineProperty(this, "modalDestroy", null);
     _defineProperty(this, "modalIframe", null);
-    _defineProperty(this, "_closeConfirmResolve", null);
     _defineProperty(this, "notRedirectAfterComplete", false);
     _defineProperty(this, "_sdkInitTime", Date.now());
     _defineProperty(this, "_mountStartTime", 0);
@@ -227,11 +330,33 @@ export var ModernElementController = /*#__PURE__*/function () {
   _createClass(ModernElementController, [{
     key: "mount",
     value: function () {
-      var _mount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(renderOptions, sdkSelector) {
+      var _mount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(renderOptions, sdkSelector) {
+        var _this = this;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", runApi('mount', function () {
+                return _this.doMount(renderOptions, sdkSelector);
+              }));
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function mount(_x4, _x5) {
+        return _mount.apply(this, arguments);
+      }
+      return mount;
+    }()
+  }, {
+    key: "doMount",
+    value: function () {
+      var _doMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(renderOptions, sdkSelector) {
         var _this$options$loading, _this$options$loading2;
         var container, _this$options, _this$options$onEvent, _this$options$loading3, _this$options$loading4, iframeUrl, iframeOrigin, readyHandshakePromise, _yield$Promise$all, _yield$Promise$all2, setupConfig, dataStructError, _this$options$loading5, _this$options$loading6, _this$options2, _this$options2$onEven, errorResult;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               trackMount('mount_start', {
                 d1: sdkSelector,
@@ -239,7 +364,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               });
               container = document.querySelector(sdkSelector);
               if (container) {
-                _context.next = 6;
+                _context3.next = 6;
                 break;
               }
               trackError('selector_not_found', {
@@ -249,7 +374,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 code: EventCallbackCode.SDK_CREATE_COMPONENT_ERROR,
                 message: "Element with selector ".concat(sdkSelector, " not found.")
               });
-              return _context.abrupt("return", {
+              return _context3.abrupt("return", {
                 error: {
                   code: 'PARAM_INVALID',
                   message: "selector not found"
@@ -258,7 +383,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             case 6:
               (_this$options$loading = this.options.loading) === null || _this$options$loading === void 0 || (_this$options$loading2 = _this$options$loading.onStartLoading) === null || _this$options$loading2 === void 0 || _this$options$loading2.call(_this$options$loading);
               this.setStatus('mounting');
-              _context.prev = 8;
+              _context3.prev = 8;
               // 1. 创建 iframe（先不设置 src，避免提前触发加载）
               iframeUrl = this.buildIframeUrl();
               this.iframe = document.createElement('iframe');
@@ -273,7 +398,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   if (iframeOrigin && iframeOrigin !== 'null') {
                     this.bridge.setOrigin(iframeOrigin);
                   }
-                } catch (_unused2) {
+                } catch (_unused4) {
                   // URL 解析失败时保持默认 origin
                 }
               } else {
@@ -291,14 +416,14 @@ export var ModernElementController = /*#__PURE__*/function () {
               });
 
               // 3. setup()（网络请求）与 waitForReadyHandshake()（等待 iframe 加载）并行执行
-              _context.next = 24;
+              _context3.next = 24;
               return Promise.all([this.setup(renderOptions), readyHandshakePromise]);
             case 24:
-              _yield$Promise$all = _context.sent;
+              _yield$Promise$all = _context3.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 1);
               setupConfig = _yield$Promise$all2[0];
               if (!(this.status === 'destroyed')) {
-                _context.next = 29;
+                _context3.next = 29;
                 break;
               }
               throw getDestroyedError();
@@ -317,59 +442,59 @@ export var ModernElementController = /*#__PURE__*/function () {
               this.sendHandshake(setupConfig);
 
               // 5. 等待 HANDSHAKE_ACK
-              _context.next = 35;
+              _context3.next = 35;
               return this.waitForHandshakeAck();
             case 35:
               this.setStatus('ready');
               this.flushCachedMessages();
               (_this$options$loading3 = this.options.loading) === null || _this$options$loading3 === void 0 || (_this$options$loading4 = _this$options$loading3.onEndLoading) === null || _this$options$loading4 === void 0 || _this$options$loading4.call(_this$options$loading3);
               if (!dataStructError) {
-                _context.next = 40;
+                _context3.next = 40;
                 break;
               }
-              return _context.abrupt("return", {
+              return _context3.abrupt("return", {
                 error: dataStructError
               });
             case 40:
               trackMount('mount_success', {
                 m1: this._mountStartTime ? Date.now() - this._mountStartTime : 0
               });
-              return _context.abrupt("return", {});
+              return _context3.abrupt("return", {});
             case 44:
-              _context.prev = 44;
-              _context.t0 = _context["catch"](8);
+              _context3.prev = 44;
+              _context3.t0 = _context3["catch"](8);
               (_this$options$loading5 = this.options.loading) === null || _this$options$loading5 === void 0 || (_this$options$loading6 = _this$options$loading5.onEndLoading) === null || _this$options$loading6 === void 0 || _this$options$loading6.call(_this$options$loading5);
-              if (!isDestroyedError(_context.t0)) {
-                _context.next = 49;
+              if (!isDestroyedError(_context3.t0)) {
+                _context3.next = 49;
                 break;
               }
-              return _context.abrupt("return", {
-                error: _context.t0
+              return _context3.abrupt("return", {
+                error: _context3.t0
               });
             case 49:
               trackError('mount_error', {
-                d1: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) || 'UNKNOWN',
-                d2: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || ''
+                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) || ''
               });
               this.cleanup();
               errorResult = {
-                code: _context.t0.code || 'UNKNOWN',
-                message: _context.t0.message || ''
+                code: _context3.t0.code || 'UNKNOWN',
+                message: _context3.t0.message || ''
               };
               (_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2$onEven = _this$options2.onEventCallback) === null || _this$options2$onEven === void 0 || _this$options2$onEven.call(_this$options2, errorResult);
-              return _context.abrupt("return", {
+              return _context3.abrupt("return", {
                 error: errorResult
               });
             case 54:
             case "end":
-              return _context.stop();
+              return _context3.stop();
           }
-        }, _callee, this, [[8, 44]]);
+        }, _callee3, this, [[8, 44]]);
       }));
-      function mount(_x, _x2) {
-        return _mount.apply(this, arguments);
+      function doMount(_x6, _x7) {
+        return _doMount.apply(this, arguments);
       }
-      return mount;
+      return doMount;
     }()
     /**
      * setup() — 解析 sessionData 获取 metaData，发起 sdkQuery 获取渲染数据，准备 HANDSHAKE 配置
@@ -384,14 +509,14 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "setup",
     value: (function () {
-      var _setup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(renderOptions) {
+      var _setup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(renderOptions) {
         var _parseData$connectFac,
-          _this = this,
+          _this2 = this,
           _parseData$paymentMet,
           _sdkQueryResult$data;
-        var sessionData, parseData, lastEnv, isConnect, paymentSessionConfig, genSdkQueryPromise, genOneAccountQueryPromise, promises, cancelDestroyCallback, destroyPromise, queryPromise, _yield$Promise$race$f, _yield$Promise$race$f2, sdkQueryResult, oneAccountQueryResult, _sdkQueryResult$error, _sdkQueryResult$error2, _oneAccountQueryResul, _oneAccountQueryResul2, preferredLocale, locale, renderDataError;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        var sessionData, parseData, lastEnv, isConnect, shouldQueryOneAccountFlag, paymentSessionConfig, genSdkQueryPromise, genOneAccountQueryPromise, promises, cancelDestroyCallback, destroyPromise, queryPromise, _yield$Promise$race$f, _yield$Promise$race$f2, sdkQueryResult, oneAccountQueryResult, _sdkQueryResult$error, _sdkQueryResult$error2, _oneAccountQueryResul, _oneAccountQueryResul2, preferredLocale, locale, renderDataError;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this._mountStartTime = Date.now();
               trackMount('setup_start');
@@ -402,6 +527,10 @@ 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/错误码
               // 与 antom.ts 入口对齐；不传则 sdkQuery/submitPay/inquiry 等网络细节不可观测
@@ -409,10 +538,11 @@ export var ModernElementController = /*#__PURE__*/function () {
                 hostSign: parseHostSign(sessionData),
                 env: lastEnv
               }, getDevReqConfig()), {}, {
-                sdkVersion: "2.0.22" || '',
+                sdkVersion: "2.0.24" || '',
                 tracker: sdkTracker
               }));
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
+              shouldQueryOneAccountFlag = shouldQueryOneAccount(isConnect, parseData === null || parseData === void 0 ? void 0 : parseData.extendInfo);
               paymentSessionConfig = parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig;
               genSdkQueryPromise = function genSdkQueryPromise() {
                 var _renderOptions$mercha;
@@ -421,14 +551,14 @@ export var ModernElementController = /*#__PURE__*/function () {
                     isUserPreferredLocale: true
                   },
                   merchantAppointParam: (_renderOptions$mercha = renderOptions.merchantAppointParam) !== null && _renderOptions$mercha !== void 0 && _renderOptions$mercha.storedCard ? renderOptions.merchantAppointParam : undefined,
-                  notRedirectAfterComplete: _this.notRedirectAfterComplete,
+                  notRedirectAfterComplete: _this2.notRedirectAfterComplete,
                   // sdk需要传入该字段
                   paymentSessionConfig: parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig,
                   paymentSessionData: sessionData
                 }, {
                   // 传商户初始化的 locale，服务端据此返回对应语言（缺失则回落用户偏好/en_US）
                   envInfo: {
-                    locale: _this.options.locale
+                    locale: _this2.options.locale
                   }
                 }).catch(recoverSdkQueryBusinessResponse));
               };
@@ -441,18 +571,18 @@ export var ModernElementController = /*#__PURE__*/function () {
                   }
                 }));
               };
-              promises = isConnect ? [genSdkQueryPromise(), genOneAccountQueryPromise()] : [genSdkQueryPromise(), undefined];
+              promises = shouldQueryOneAccountFlag ? [genSdkQueryPromise(), genOneAccountQueryPromise()] : [genSdkQueryPromise(), undefined];
               cancelDestroyCallback = function cancelDestroyCallback() {};
               destroyPromise = new Promise(function (_, reject) {
-                cancelDestroyCallback = _this.onDestroy(function () {
+                cancelDestroyCallback = _this2.onDestroy(function () {
                   return reject(getDestroyedError());
                 });
               });
               queryPromise = Promise.all(promises);
-              _context2.next = 18;
+              _context4.next = 20;
               return Promise.race([queryPromise, destroyPromise]).finally(cancelDestroyCallback);
-            case 18:
-              _yield$Promise$race$f = _context2.sent;
+            case 20:
+              _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];
@@ -462,7 +592,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   d2: ((_sdkQueryResult$error2 = sdkQueryResult.error) === null || _sdkQueryResult$error2 === void 0 ? void 0 : _sdkQueryResult$error2.message) || ''
                 });
               }
-              if (isConnect && oneAccountQueryResult !== null && oneAccountQueryResult !== void 0 && oneAccountQueryResult.error) {
+              if (shouldQueryOneAccountFlag && oneAccountQueryResult !== null && oneAccountQueryResult !== void 0 && oneAccountQueryResult.error) {
                 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) || ''
@@ -473,7 +603,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               preferredLocale = getLocaleFromRenderData(sdkQueryResult.data);
               locale = preferredLocale || this.options.locale; // 优先使用请求错误，其次使用数据结构校验错误
               renderDataError = sdkQueryResult.error || (oneAccountQueryResult === null || oneAccountQueryResult === void 0 ? void 0 : oneAccountQueryResult.error);
-              return _context2.abrupt("return", {
+              return _context4.abrupt("return", {
                 sdkTiming: {
                   sdkInitTime: this._sdkInitTime,
                   mountStartTime: this._mountStartTime
@@ -498,7 +628,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: parseData === null || parseData === void 0 ? void 0 : parseData.clientId,
+                  merchantId: _merchantId,
                   paymentMethodType: parseData === null || parseData === void 0 || (_parseData$paymentMet = parseData.paymentMethodInfoView) === null || _parseData$paymentMet === void 0 ? void 0 : _parseData$paymentMet.paymentMethodType
                 },
                 // 原老字段
@@ -506,7 +636,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "2.0.22" || '',
+                sdkVersion: "2.0.24" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
@@ -516,13 +646,13 @@ export var ModernElementController = /*#__PURE__*/function () {
                   env: lastEnv
                 }, getDevReqConfig())
               });
-            case 28:
+            case 30:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
-        }, _callee2, this);
+        }, _callee4, this);
       }));
-      function setup(_x3) {
+      function setup(_x8) {
         return _setup.apply(this, arguments);
       }
       return setup;
@@ -588,10 +718,10 @@ export var ModernElementController = /*#__PURE__*/function () {
       // 金额存在性校验
       var hasAmountViews = !!orderAmountView && !!paymentAmountView;
       if (!success) {
-        var _ref2 = renderData,
-          traceId = _ref2.traceId,
-          errorCode = _ref2.errorCode,
-          errorMessage = _ref2.errorMessage;
+        var _ref3 = renderData,
+          traceId = _ref3.traceId,
+          errorCode = _ref3.errorCode,
+          errorMessage = _ref3.errorMessage;
         return this.getLegacySdkQueryError({
           errorCode: errorCode,
           errorMessage: errorMessage,
@@ -619,20 +749,20 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "bindBridgeEvents",
     value: function bindBridgeEvents() {
-      var _this2 = this;
+      var _this3 = this;
       this.bridge.on(MessageType.HEIGHT_UPDATE, function (height) {
-        if (_this2.iframe) _this2.iframe.style.height = "".concat(height, "px");
+        if (_this3.iframe) _this3.iframe.style.height = "".concat(height, "px");
       });
       this.bridge.on(AMSMessageType.SHOWTOAST, function (payload, _ports, meta) {
-        var _this2$iframe, _this2$modalIframe;
-        if (meta && meta.source !== ((_this2$iframe = _this2.iframe) === null || _this2$iframe === void 0 ? void 0 : _this2$iframe.contentWindow) && meta.source !== ((_this2$modalIframe = _this2.modalIframe) === null || _this2$modalIframe === void 0 ? void 0 : _this2$modalIframe.contentWindow)) {
+        var _this3$iframe, _this3$modalIframe;
+        if (meta && meta.source !== ((_this3$iframe = _this3.iframe) === null || _this3$iframe === void 0 ? void 0 : _this3$iframe.contentWindow) && meta.source !== ((_this3$modalIframe = _this3.modalIframe) === null || _this3$modalIframe === void 0 ? void 0 : _this3$modalIframe.contentWindow)) {
           return;
         }
         showToast(payload);
       });
       this.bridge.on(MessageType.REDIRECT, function (payload, _ports, meta) {
-        var _this2$iframe2, _this2$modalIframe2;
-        if (meta && meta.source !== ((_this2$iframe2 = _this2.iframe) === null || _this2$iframe2 === void 0 ? void 0 : _this2$iframe2.contentWindow) && meta.source !== ((_this2$modalIframe2 = _this2.modalIframe) === null || _this2$modalIframe2 === void 0 ? void 0 : _this2$modalIframe2.contentWindow)) {
+        var _this3$iframe2, _this3$modalIframe2;
+        if (meta && meta.source !== ((_this3$iframe2 = _this3.iframe) === null || _this3$iframe2 === void 0 ? void 0 : _this3$iframe2.contentWindow) && meta.source !== ((_this3$modalIframe2 = _this3.modalIframe) === null || _this3$modalIframe2 === void 0 ? void 0 : _this3$modalIframe2.contentWindow)) {
           return;
         }
         var url = payload.url,
@@ -650,7 +780,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           d6: destroy ? '1' : '0'
         });
         if (destroy) {
-          _this2.destroy();
+          _this3.destroy();
         }
         function fallbackJump() {
           if (mode === 'replace') {
@@ -688,34 +818,34 @@ export var ModernElementController = /*#__PURE__*/function () {
         }
       });
       this.bridge.on(MessageType.OPEN_MODAL, function (payload, _ports, meta) {
-        var _this2$iframe3;
-        if (meta && meta.source !== ((_this2$iframe3 = _this2.iframe) === null || _this2$iframe3 === void 0 ? void 0 : _this2$iframe3.contentWindow)) {
+        var _this3$iframe3;
+        if (meta && meta.source !== ((_this3$iframe3 = _this3.iframe) === null || _this3$iframe3 === void 0 ? void 0 : _this3$iframe3.contentWindow)) {
           return;
         }
-        _this2.handleOpenModal(payload);
-        _this2.bridge.once(MessageType.CLOSE_MODAL, function () {
-          _this2.handleCloseModal();
+        _this3.handleOpenModal(payload);
+        _this3.bridge.once(MessageType.CLOSE_MODAL, function () {
+          _this3.handleCloseModal();
         });
       });
       this.bridge.on(MessageType.DESTROY_ELEMENT, function (_payload, _ports, meta) {
-        var _this2$iframe4;
-        if (meta && meta.source !== ((_this2$iframe4 = _this2.iframe) === null || _this2$iframe4 === void 0 ? void 0 : _this2$iframe4.contentWindow)) {
+        var _this3$iframe4;
+        if (meta && meta.source !== ((_this3$iframe4 = _this3.iframe) === null || _this3$iframe4 === void 0 ? void 0 : _this3$iframe4.contentWindow)) {
           return;
         }
-        _this2.destroy();
+        _this3.destroy();
       });
 
       // skipRenderPaymentMethod 场景：webapp 委托 SDK 全权拉起 ApplePay,fire-and-forget
       // 走 plugin/applepay 标准链路(onEventCallback 自动通知商户)
       this.bridge.on(AMSMessageType.HANDLE_PAYMENT, function () {
-        _this2.handleHandlePayment();
+        _this3.handleHandlePayment();
       });
 
       // Apple Pay beforeConfirm：在 submitPayment 内通过 bridge.once 监听，此处不再注册
 
       // 支付方式变化：iframe 通知 SDK 当前选中的支付方式类型
       this.bridge.on(AMSMessageType.PAYMENT_METHOD_CHANGED, function (payload) {
-        _this2.currentPaymentMethodType = (payload === null || payload === void 0 ? void 0 : payload.type) || '';
+        _this3.currentPaymentMethodType = (payload === null || payload === void 0 ? void 0 : payload.type) || '';
       });
     }
 
@@ -727,12 +857,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "handleGetApplePayToken",
     value: (function () {
-      var _handleGetApplePayToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(payload, onBeforeConfirm) {
+      var _handleGetApplePayToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(payload, onBeforeConfirm) {
         var _paymentMethod,
-          _this3 = this;
+          _this4 = this;
         var sessionData, applePayProps, paymentRequest, merchantCapabilities, merchantInfo, paymentAmount, supportedNetworks, version, requiredBillingContactFields, requiredShippingContactFields, finalAmount, finalCurrency, capturedResult, recurringRequest, service, _capturedResult, errCode;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               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;
@@ -741,7 +871,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 d1: paymentRequest ? 'has_payment_request' : 'no_payment_request'
               });
               if (paymentRequest) {
-                _context5.next = 8;
+                _context7.next = 8;
                 break;
               }
               trackError('applepay_token_missing_data', {
@@ -753,7 +883,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   errorCode: 'APPLE_PAY_MISSING_DATA'
                 }
               });
-              return _context5.abrupt("return");
+              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);
@@ -796,35 +926,35 @@ export var ModernElementController = /*#__PURE__*/function () {
                 enableModalCloseListener: true,
                 callbacks: {
                   validateMerchant: function () {
-                    var _validateMerchant = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(validationURL) {
+                    var _validateMerchant = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(validationURL) {
                       var res;
-                      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                        while (1) switch (_context3.prev = _context3.next) {
+                      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                        while (1) switch (_context5.prev = _context5.next) {
                           case 0:
                             trackElement('applepay_validate_start', {
                               d1: 'merchant_validate'
                             });
-                            _context3.next = 3;
+                            _context5.next = 3;
                             return getApplePayPaymentSession(sessionData, {
                               validateUrl: validationURL,
                               paymentSessionData: sessionData,
                               merchantDomain: window.location.hostname
                             }, {
-                              env: _this3.options.environment,
+                              env: _this4.options.environment,
                               envInfo: {
                                 deviceId: ''
                               }
                             }, logger);
                           case 3:
-                            res = _context3.sent;
+                            res = _context5.sent;
                             if (!(res !== null && res !== void 0 && res.success && res.merchantSessionObject)) {
-                              _context3.next = 7;
+                              _context5.next = 7;
                               break;
                             }
                             trackElement('applepay_validate_success', {
                               d1: 'got_session'
                             });
-                            return _context3.abrupt("return", typeof res.merchantSessionObject === 'string' ? JSON.parse(res.merchantSessionObject) : res.merchantSessionObject);
+                            return _context5.abrupt("return", typeof res.merchantSessionObject === 'string' ? JSON.parse(res.merchantSessionObject) : res.merchantSessionObject);
                           case 7:
                             trackError('applepay_merchant_validate_failed', {
                               d1: 'VALIDATION_FAILED',
@@ -835,34 +965,34 @@ export var ModernElementController = /*#__PURE__*/function () {
                             };
                           case 9:
                           case "end":
-                            return _context3.stop();
+                            return _context5.stop();
                         }
-                      }, _callee3);
+                      }, _callee5);
                     }));
-                    function validateMerchant(_x6) {
+                    function validateMerchant(_x11) {
                       return _validateMerchant.apply(this, arguments);
                     }
                     return validateMerchant;
                   }(),
                   onAuthorized: function () {
-                    var _onAuthorized = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref3) {
+                    var _onAuthorized = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref4) {
                       var token, billingContact, shippingContact, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
-                      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                        while (1) switch (_context4.prev = _context4.next) {
+                      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                        while (1) switch (_context6.prev = _context6.next) {
                           case 0:
-                            token = _ref3.token, billingContact = _ref3.billingContact, shippingContact = _ref3.shippingContact;
+                            token = _ref4.token, billingContact = _ref4.billingContact, shippingContact = _ref4.shippingContact;
                             if (!onBeforeConfirm) {
-                              _context4.next = 18;
+                              _context6.next = 18;
                               break;
                             }
-                            _context4.prev = 2;
+                            _context6.prev = 2;
                             startTime = Date.now();
-                            _context4.next = 6;
+                            _context6.next = 6;
                             return executeWithTimeout(function () {
                               return onBeforeConfirm();
                             });
                           case 6:
-                            _yield$executeWithTim = _context4.sent;
+                            _yield$executeWithTim = _context6.sent;
                             rawResult = _yield$executeWithTim.result;
                             timedOut = _yield$executeWithTim.timedOut;
                             // 双重校验：timedOut（Promise race）+ startTime（实际时间差），与老 ElementController 对齐
@@ -873,20 +1003,20 @@ export var ModernElementController = /*#__PURE__*/function () {
                               });
                             }
                             if (shouldContinue) {
-                              _context4.next = 13;
+                              _context6.next = 13;
                               break;
                             }
-                            return _context4.abrupt("return", {
+                            return _context6.abrupt("return", {
                               success: false,
                               errorCode: 'MERCHANT_CONFIRM_ABORT'
                             });
                           case 13:
-                            _context4.next = 18;
+                            _context6.next = 18;
                             break;
                           case 15:
-                            _context4.prev = 15;
-                            _context4.t0 = _context4["catch"](2);
-                            return _context4.abrupt("return", {
+                            _context6.prev = 15;
+                            _context6.t0 = _context6["catch"](2);
+                            return _context6.abrupt("return", {
                               success: false,
                               errorCode: 'MERCHANT_CONFIRM_ABORT'
                             });
@@ -899,25 +1029,25 @@ export var ModernElementController = /*#__PURE__*/function () {
                             trackElement('applepay_authorized', {
                               d1: token ? 'has_token' : 'no_token'
                             });
-                            return _context4.abrupt("return", {
+                            return _context6.abrupt("return", {
                               success: true,
                               result: capturedResult
                             });
                           case 21:
                           case "end":
-                            return _context4.stop();
+                            return _context6.stop();
                         }
-                      }, _callee4, null, [[2, 15]]);
+                      }, _callee6, null, [[2, 15]]);
                     }));
-                    function onAuthorized(_x7) {
+                    function onAuthorized(_x12) {
                       return _onAuthorized.apply(this, arguments);
                     }
                     return onAuthorized;
                   }()
                 }
               });
-              _context5.prev = 15;
-              _context5.next = 18;
+              _context7.prev = 15;
+              _context7.next = 18;
               return service.startPay();
             case 18:
               trackElement('applepay_token_success', {
@@ -927,14 +1057,14 @@ export var ModernElementController = /*#__PURE__*/function () {
                 success: true,
                 result: capturedResult
               });
-              _context5.next = 26;
+              _context7.next = 26;
               break;
             case 22:
-              _context5.prev = 22;
-              _context5.t0 = _context5["catch"](15);
+              _context7.prev = 22;
+              _context7.t0 = _context7["catch"](15);
               // 商户验证失败已在 validateMerchant 内单独埋点(applepay_merchant_validate_failed)，此处跳过避免重复
-              if ((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorCode) !== 'APPLE_PAY_PAYMENT_SESSION_REQUEST_FAILED') {
-                errCode = (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorCode) || 'APPLE_PAY_NOT_SUPPORTED'; // 用户主动取消单独标记，便于区分取消与真实失败
+              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', {
                     d1: 'user_cancel'
@@ -942,23 +1072,23 @@ export var ModernElementController = /*#__PURE__*/function () {
                 } else {
                   trackError('applepay_token_failed', {
                     d1: errCode,
-                    d2: (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorMessage) || ''
+                    d2: (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.errorMessage) || ''
                   });
                 }
               }
               this.bridge.send(AMSMessageType.GET_APPLE_PAY_TOKEN_REPLY, {
                 success: false,
                 result: {
-                  errorCode: (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorCode) || 'APPLE_PAY_NOT_SUPPORTED'
+                  errorCode: (_context7.t0 === null || _context7.t0 === void 0 ? void 0 : _context7.t0.errorCode) || 'APPLE_PAY_NOT_SUPPORTED'
                 }
               });
             case 26:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
-        }, _callee5, this, [[15, 22]]);
+        }, _callee7, this, [[15, 22]]);
       }));
-      function handleGetApplePayToken(_x4, _x5) {
+      function handleGetApplePayToken(_x9, _x10) {
         return _handleGetApplePayToken.apply(this, arguments);
       }
       return handleGetApplePayToken;
@@ -983,7 +1113,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "handleGetGooglePayToken",
     value: function handleGetGooglePayToken(payload) {
       var _data$paymentMethodDe,
-        _this4 = this,
+        _this5 = this,
         _google;
       var data = payload === null || payload === void 0 ? void 0 : payload.data;
       var googlePayProps = data === null || data === void 0 || (_data$paymentMethodDe = data.paymentMethodDetail) === null || _data$paymentMethodDe === void 0 ? void 0 : _data$paymentMethodDe.googlePayProps;
@@ -1030,7 +1160,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             trackElement('googlepay_token_success', {
               d1: 'has_token'
             });
-            _this4.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
+            _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
               success: true,
               result: paymentData
             });
@@ -1047,7 +1177,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               d2: (err === null || err === void 0 ? void 0 : err.statusMessage) || ''
             });
           }
-          _this4.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
+          _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
             success: false,
             err: _objectSpread({
               statusCode: statusCode
@@ -1082,7 +1212,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         trackError('googlepay_script_load_failed', {
           d1: 'script_error'
         });
-        _this4.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
+        _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
           success: false,
           err: {
             statusCode: 'GOOGLE_PAY_NOT_SUPPORTED'
@@ -1131,7 +1261,7 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "handleBeforeConfirmInternal",
     value: function handleBeforeConfirmInternal(onBeforeConfirm) {
-      var _this5 = this;
+      var _this6 = this;
       if (!onBeforeConfirm) {
         logger.logInfo({
           title: 'sdk_before_confirm_skip'
@@ -1152,9 +1282,9 @@ export var ModernElementController = /*#__PURE__*/function () {
       var startTime = Date.now();
       executeWithTimeout(function () {
         return onBeforeConfirm();
-      }).then(function (_ref4) {
-        var rawResult = _ref4.result,
-          timedOut = _ref4.timedOut;
+      }).then(function (_ref5) {
+        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) {
@@ -1167,7 +1297,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         }, {
           shouldContinue: shouldContinue
         });
-        _this5.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
+        _this6.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
           success: true,
           result: !!shouldContinue
         });
@@ -1178,7 +1308,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           errorMessage: String((error === null || error === void 0 ? void 0 : error.message) || error).slice(0, 200),
           path: 'modernController_bridge'
         });
-        _this5.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
+        _this6.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
           success: false,
           result: false
         });
@@ -1192,7 +1322,7 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "waitForReadyHandshake",
     value: function waitForReadyHandshake() {
-      var _this6 = this;
+      var _this7 = this;
       return new Promise(function (resolve, reject) {
         var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
@@ -1205,15 +1335,15 @@ export var ModernElementController = /*#__PURE__*/function () {
             message: 'An error occurred; the transaction cannot be initiated.'
           });
         }, MOUNT_TIMEOUT);
-        cancelDestroyCallback = _this6.onDestroy(function () {
+        cancelDestroyCallback = _this7.onDestroy(function () {
           clearTimeout(timer);
           reject(getDestroyedError());
         });
-        _this6.bridge.once(MessageType.READY_HANDSHAKE, function () {
-          var _this6$iframe;
+        _this7.bridge.once(MessageType.READY_HANDSHAKE, function () {
+          var _this7$iframe;
           clearTimeout(timer);
           cancelDestroyCallback();
-          if (!((_this6$iframe = _this6.iframe) !== null && _this6$iframe !== void 0 && _this6$iframe.contentWindow)) {
+          if (!((_this7$iframe = _this7.iframe) !== null && _this7$iframe !== void 0 && _this7$iframe.contentWindow)) {
             trackError('iframe_contentwindow_unavailable', {
               d1: 'after_ready_handshake'
             });
@@ -1223,9 +1353,9 @@ export var ModernElementController = /*#__PURE__*/function () {
             });
             return;
           }
-          _this6.bridge.setTarget(_this6.iframe.contentWindow);
+          _this7.bridge.setTarget(_this7.iframe.contentWindow);
           trackHandshake('ready_handshake_received', {
-            m1: _this6._mountStartTime ? Date.now() - _this6._mountStartTime : 0
+            m1: _this7._mountStartTime ? Date.now() - _this7._mountStartTime : 0
           });
           resolve();
         });
@@ -1250,7 +1380,7 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "waitForHandshakeAck",
     value: function waitForHandshakeAck() {
-      var _this7 = this;
+      var _this8 = this;
       return new Promise(function (resolve, reject) {
         var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
@@ -1263,15 +1393,15 @@ export var ModernElementController = /*#__PURE__*/function () {
             message: 'An error occurred; the transaction cannot be initiated.'
           });
         }, MOUNT_TIMEOUT);
-        cancelDestroyCallback = _this7.onDestroy(function () {
+        cancelDestroyCallback = _this8.onDestroy(function () {
           clearTimeout(timer);
           reject(getDestroyedError());
         });
-        _this7.bridge.once(MessageType.HANDSHAKE_ACK, function () {
+        _this8.bridge.once(MessageType.HANDSHAKE_ACK, function () {
           clearTimeout(timer);
           cancelDestroyCallback();
           trackHandshake('handshake_ack_received', {
-            m1: _this7._mountStartTime ? Date.now() - _this7._mountStartTime : 0
+            m1: _this8._mountStartTime ? Date.now() - _this8._mountStartTime : 0
           });
           resolve();
         });
@@ -1280,20 +1410,46 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "submitPayment",
     value: function () {
-      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
-        var _this8 = this;
-        var _this$options$loading7, _this$options$loading8, isApplePay, _ref5, onBeforeConfirm, serializableParams, startTime, _yield$executeWithTim2, shouldContinue, timedOut, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, cleanups, _result$error, resultPromise, result, _this$options$loading9, _this$options$loading10;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
+        var _this9 = this;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              return _context8.abrupt("return", runApi('submitPayment', function () {
+                return _this9.doSubmitPayment(params);
+              }, function () {
+                return _this9.currentPaymentMethodType ? {
+                  d4: _this9.currentPaymentMethodType
+                } : {};
+              }));
+            case 1:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee8);
+      }));
+      function submitPayment(_x13) {
+        return _submitPayment.apply(this, arguments);
+      }
+      return submitPayment;
+    }()
+  }, {
+    key: "doSubmitPayment",
+    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;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (!(this.status !== 'ready')) {
-                _context6.next = 3;
+                _context9.next = 3;
                 break;
               }
               trackError('submit_not_ready', {
                 d1: this.status
               });
-              return _context6.abrupt("return", {
+              return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
                   code: 'UI_STATE_ERROR',
@@ -1302,11 +1458,11 @@ export var ModernElementController = /*#__PURE__*/function () {
               });
             case 3:
               if (!this.isSubmitting) {
-                _context6.next = 6;
+                _context9.next = 6;
                 break;
               }
               trackError('submit_in_progress', {});
-              return _context6.abrupt("return", {
+              return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
                   code: 'UI_STATE_ERROR',
@@ -1315,11 +1471,11 @@ export var ModernElementController = /*#__PURE__*/function () {
               });
             case 6:
               this.isSubmitting = true;
-              _context6.prev = 7;
+              _context9.prev = 7;
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY'; // 剥除 onBeforeConfirm 函数，避免 postMessage 序列化报错
-              _ref5 = params || {}, onBeforeConfirm = _ref5.onBeforeConfirm, serializableParams = _objectWithoutProperties(_ref5, _excluded2); // ── 非 Apple Pay：同步执行 onBeforeConfirm（submit 前拦截，对齐老 ElementController） ──
+              _ref6 = params || {}, onBeforeConfirm = _ref6.onBeforeConfirm, serializableParams = _objectWithoutProperties(_ref6, _excluded2); // ── 非 Apple Pay：同步执行 onBeforeConfirm（submit 前拦截，对齐老 ElementController） ──
               if (!(onBeforeConfirm && !isApplePay)) {
-                _context6.next = 31;
+                _context9.next = 31;
                 break;
               }
               logger.logInfo({
@@ -1328,18 +1484,18 @@ export var ModernElementController = /*#__PURE__*/function () {
                 paymentMethodType: this.currentPaymentMethodType || 'UNKNOWN',
                 path: 'nonApplePay_sync'
               });
-              _context6.prev = 12;
+              _context9.prev = 12;
               startTime = Date.now();
-              _context6.next = 16;
+              _context9.next = 16;
               return executeWithTimeout(function () {
                 return onBeforeConfirm();
               });
             case 16:
-              _yield$executeWithTim2 = _context6.sent;
+              _yield$executeWithTim2 = _context9.sent;
               shouldContinue = _yield$executeWithTim2.result;
               timedOut = _yield$executeWithTim2.timedOut;
               if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
-                _context6.next = 22;
+                _context9.next = 22;
                 break;
               }
               if (timedOut) {
@@ -1357,7 +1513,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   path: 'nonApplePay_sync'
                 });
               }
-              return _context6.abrupt("return", {
+              return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
                   code: 'MERCHANT_CONFIRM_ABORT',
@@ -1371,19 +1527,19 @@ export var ModernElementController = /*#__PURE__*/function () {
                 paymentMethodType: this.currentPaymentMethodType || 'UNKNOWN',
                 path: 'nonApplePay_sync'
               });
-              _context6.next = 29;
+              _context9.next = 29;
               break;
             case 25:
-              _context6.prev = 25;
-              _context6.t0 = _context6["catch"](12);
+              _context9.prev = 25;
+              _context9.t0 = _context9["catch"](12);
               logger.logError({
                 title: 'sdk_before_confirm_error'
               }, {
                 paymentMethodType: this.currentPaymentMethodType || 'UNKNOWN',
-                errorMessage: String((_context6.t0 === null || _context6.t0 === void 0 ? void 0 : _context6.t0.message) || _context6.t0).slice(0, 200),
+                errorMessage: String((_context9.t0 === null || _context9.t0 === void 0 ? void 0 : _context9.t0.message) || _context9.t0).slice(0, 200),
                 path: 'nonApplePay_sync'
               });
-              return _context6.abrupt("return", {
+              return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
                   code: 'MERCHANT_CONFIRM_ABORT',
@@ -1391,7 +1547,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 }
               });
             case 29:
-              _context6.next = 32;
+              _context9.next = 32;
               break;
             case 31:
               if (!onBeforeConfirm) {
@@ -1426,24 +1582,24 @@ export var ModernElementController = /*#__PURE__*/function () {
               // 未命中的 once wrapper 绑着旧闭包（旧 onBeforeConfirm / 旧 resolve）会残留并串扰后续提交，
               // 在 submit 终态统一释放（二次 off 幂等，已命中的 once 已自行 off）。
               cleanups = [];
-              _context6.prev = 41;
+              _context9.prev = 41;
               resultPromise = new Promise(function (resolve) {
                 // 先注册事件监听，再发送 SUBMIT，避免 webapp 快速响应导致消息丢失
                 // PC 非 Safari：webapp 委托 SDK 拉起 Apple Pay 拿 token
-                cleanups.push(_this8.bridge.once(AMSMessageType.GET_APPLE_PAY_TOKEN, function (payload) {
-                  _this8.handleGetApplePayToken(payload, onBeforeConfirm).then(function () {
+                cleanups.push(_this10.bridge.once(AMSMessageType.GET_APPLE_PAY_TOKEN, function (payload) {
+                  _this10.handleGetApplePayToken(payload, onBeforeConfirm).then(function () {
                     // token 已回传 webapp，继续等 SUBMIT_REPLY
                   });
                 }));
                 // Web element GP：webapp 委托 SDK/父 frame 调 loadPaymentData 拿 token
-                cleanups.push(_this8.bridge.once(AMSMessageType.GET_GOOGLE_PAY_TOKEN, function (payload) {
-                  _this8.handleGetGooglePayToken(payload);
+                cleanups.push(_this10.bridge.once(AMSMessageType.GET_GOOGLE_PAY_TOKEN, function (payload) {
+                  _this10.handleGetGooglePayToken(payload);
                 }));
                 // Safari：webapp 请求执行商户 onBeforeConfirm 回调
-                cleanups.push(_this8.bridge.once(AMSMessageType.BEFORE_CONFIRM, function () {
-                  _this8.handleBeforeConfirmInternal(onBeforeConfirm || null);
+                cleanups.push(_this10.bridge.once(AMSMessageType.BEFORE_CONFIRM, function () {
+                  _this10.handleBeforeConfirmInternal(onBeforeConfirm || null);
                 }));
-                cleanups.push(_this8.bridge.once(MessageType.SUBMIT_REPLY, resolve));
+                cleanups.push(_this10.bridge.once(MessageType.SUBMIT_REPLY, resolve));
               }); // 监听注册完成后再发送 SUBMIT，确保不会遗漏快速响应
               this.send(MessageType.SUBMIT, _objectSpread(_objectSpread({}, serializableParams), {}, {
                 redirect: this.notRedirectAfterComplete ? 'if_required' : 'always',
@@ -1452,70 +1608,92 @@ export var ModernElementController = /*#__PURE__*/function () {
                 amount: serializableParams.amount,
                 currency: serializableParams.currency
               } : {}));
-              _context6.next = 46;
+              _context9.next = 46;
               return resultPromise;
             case 46:
-              result = _context6.sent;
+              result = _context9.sent;
               trackElement('submit_reply', {
                 d1: (result === null || result === void 0 ? void 0 : result.status) || '',
-                d2: (result === null || result === void 0 || (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.code) || ''
+                d2: (result === null || result === void 0 || (_result$error5 = result.error) === null || _result$error5 === void 0 ? void 0 : _result$error5.code) || ''
               });
-              return _context6.abrupt("return", adaptSubmitResult(result));
+              return _context9.abrupt("return", adaptSubmitResult(result));
             case 51:
-              _context6.prev = 51;
-              _context6.t1 = _context6["catch"](41);
+              _context9.prev = 51;
+              _context9.t1 = _context9["catch"](41);
               trackError('submit_error', {
-                d1: (_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.code) || 'UNKNOWN',
-                d2: (_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.message) || ''
+                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 _context6.t1;
+              throw _context9.t1;
             case 55:
-              _context6.prev = 55;
+              _context9.prev = 55;
               cleanups.forEach(function (fn) {
                 try {
                   fn();
-                } catch (_unused4) {
+                } catch (_unused6) {
                   /* 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 _context6.finish(55);
+              return _context9.finish(55);
             case 59:
-              _context6.prev = 59;
+              _context9.prev = 59;
               this.isSubmitting = false;
-              return _context6.finish(59);
+              return _context9.finish(59);
             case 62:
             case "end":
-              return _context6.stop();
+              return _context9.stop();
           }
-        }, _callee6, this, [[7,, 59, 62], [12, 25], [41, 51, 55, 59]]);
+        }, _callee9, this, [[7,, 59, 62], [12, 25], [41, 51, 55, 59]]);
       }));
-      function submitPayment(_x8) {
-        return _submitPayment.apply(this, arguments);
+      function doSubmitPayment(_x14) {
+        return _doSubmitPayment.apply(this, arguments);
       }
-      return submitPayment;
+      return doSubmitPayment;
     }()
   }, {
     key: "validateFields",
     value: function () {
-      var _validateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        var _this9 = this;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _validateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+        var _this11 = this;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              return _context10.abrupt("return", runApi('validateFields', function () {
+                return _this11.doValidateFields();
+              }));
+            case 1:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee10);
+      }));
+      function validateFields() {
+        return _validateFields.apply(this, arguments);
+      }
+      return validateFields;
+    }()
+  }, {
+    key: "doValidateFields",
+    value: function () {
+      var _doValidateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        var _this12 = this;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               if (!(this.status !== 'ready')) {
-                _context7.next = 3;
+                _context11.next = 3;
                 break;
               }
               trackError('validate_not_ready', {
                 d1: this.status
               });
-              return _context7.abrupt("return", {
+              return _context11.abrupt("return", {
                 isValid: false
               });
             case 3:
               this.send(AMSMessageType.VALIDATE);
-              return _context7.abrupt("return", new Promise(function (resolve) {
+              return _context11.abrupt("return", new Promise(function (resolve) {
                 var timer = setTimeout(function () {
                   trackError('validate_fields_timeout', {
                     d1: '15000'
@@ -1524,7 +1702,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                     isValid: false
                   });
                 }, 15000);
-                _this9.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
+                _this12.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
                   clearTimeout(timer);
                   var isValid = !!(payload !== null && payload !== void 0 && payload.isValid);
                   trackElement('validate_result', {
@@ -1537,30 +1715,30 @@ export var ModernElementController = /*#__PURE__*/function () {
               }));
             case 5:
             case "end":
-              return _context7.stop();
+              return _context11.stop();
           }
-        }, _callee7, this);
+        }, _callee11, this);
       }));
-      function validateFields() {
-        return _validateFields.apply(this, arguments);
+      function doValidateFields() {
+        return _doValidateFields.apply(this, arguments);
       }
-      return validateFields;
+      return doValidateFields;
     }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "updatePayment",
     value: function () {
-      var _updatePayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(paymentSessionData) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _updatePayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(paymentSessionData) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              return _context8.abrupt("return", false);
+              return _context12.abrupt("return", false);
             case 1:
             case "end":
-              return _context8.stop();
+              return _context12.stop();
           }
-        }, _callee8);
+        }, _callee12);
       }));
-      function updatePayment(_x9) {
+      function updatePayment(_x15) {
         return _updatePayment.apply(this, arguments);
       }
       return updatePayment;
@@ -1610,7 +1788,7 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "onDestroy",
     value: function onDestroy(callback) {
-      var _this10 = this;
+      var _this13 = this;
       if (this.status === 'destroyed') {
         callback();
         return function () {
@@ -1619,7 +1797,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       }
       this.destroyCallbacks.push(callback);
       return function () {
-        _this10.destroyCallbacks = _this10.destroyCallbacks.filter(function (item) {
+        _this13.destroyCallbacks = _this13.destroyCallbacks.filter(function (item) {
           return item !== callback;
         });
       };
@@ -1659,12 +1837,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "flushCachedMessages",
     value: function flushCachedMessages() {
-      var _this11 = this;
+      var _this14 = this;
       if (this.cachedSend.length > 0) {
-        this.cachedSend.forEach(function (_ref6) {
-          var type = _ref6.type,
-            payload = _ref6.payload;
-          _this11.bridge.send(type, payload);
+        this.cachedSend.forEach(function (_ref7) {
+          var type = _ref7.type,
+            payload = _ref7.payload;
+          _this14.bridge.send(type, payload);
         });
         this.cachedSend = [];
       }
@@ -1687,7 +1865,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       var _payload$appearance,
         _themeColorMap$appear,
         _payload$appearance2,
-        _this12 = this;
+        _this15 = this;
       // 清理已存在的 modal
       this.handleCloseModal();
       var mode = device.isMobile ? 'mobile' : 'desktop';
@@ -1730,17 +1908,18 @@ export var ModernElementController = /*#__PURE__*/function () {
       var _openModal = openModal(_objectSpread(_objectSpread({}, payload), {}, {
           mode: mode,
           loadingConfig: loadingConfig,
-          onClose: payload.closeConfirm ? function () {
-            return new Promise(function (resolve) {
-              // closeConfirm 时等待确认关闭（由 CLOSE_MODAL 消息触发 resolve）
-              _this12._closeConfirmResolve = resolve;
-            });
-          } : undefined
+          onClose: function onClose() {
+            if (payload.closeConfirm) {
+              // 这里提前关闭了
+              var modalPort = new ModalPort(payload.modalId, messageChannel.port2);
+              return modalPort.close(true);
+            }
+          }
         })),
         iframe = _openModal.iframe,
         destroy = _openModal.destroy;
-      var handler = function handler() {
-        iframe.removeEventListener('load', handler);
+      var offReady = modalBridge.once(MessageType.MODAL_TRANSFER_READY, function (_payload, _ports, meta) {
+        if (meta && meta.source !== iframe.contentWindow) return;
         trackElement('modal_loaded', {
           d1: payload.url
         });
@@ -1752,7 +1931,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             if (iframeOrigin && iframeOrigin !== 'null') {
               modalBridge.setOrigin(iframeOrigin);
             }
-          } catch (_unused5) {
+          } catch (_unused7) {
             // URL 解析失败时保持默认 origin
           }
           // 如果 payload 有 appearance，通过 TRANSFER_MODAL_APPEARANCE 消息发送给 modal
@@ -1766,16 +1945,18 @@ export var ModernElementController = /*#__PURE__*/function () {
           // 发送 port2 给 modal
           modalBridge.send(MessageType.TRANSFER_MODAL_PORT, payload.modalId, [messageChannel.port2]);
         }
-      };
+      });
       this.modalIframe = iframe;
       this.modalDestroy = function () {
+        if (payload.closeConfirm) {
+          trackElement('modal_close_confirm', {
+            d1: 'confirm_resolved'
+          });
+        }
         destroy();
-        iframe.removeEventListener('load', handler);
-        _this12.modalIframe = null;
+        offReady();
+        _this15.modalIframe = null;
       };
-
-      // 监听 modal 的 iframe load 事件
-      iframe.addEventListener('load', handler);
     }
 
     /**
@@ -1785,13 +1966,6 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "handleCloseModal",
     value: function handleCloseModal() {
       // 如果有等待中的 closeConfirm，resolve 它
-      if (this._closeConfirmResolve) {
-        trackElement('modal_close_confirm', {
-          d1: 'confirm_resolved'
-        });
-        this._closeConfirmResolve();
-        this._closeConfirmResolve = null;
-      }
       trackElement('modal_closed', {
         d1: this.modalBridge ? 'with_bridge' : 'no_bridge'
       });