diff --git a/packages/api-proxy/src/platform/api/route/index.ios.js b/packages/api-proxy/src/platform/api/route/index.ios.js index a50a376ff..09a5084f2 100644 --- a/packages/api-proxy/src/platform/api/route/index.ios.js +++ b/packages/api-proxy/src/platform/api/route/index.ios.js @@ -48,18 +48,10 @@ const transitionEndCallback = function (callback) { } function navigateTo (options = {}) { -<<<<<<< HEAD if (toPending) { return } toPending = true -======= - // if (toPending) { - // return - // } - // toPending = true - const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1] ->>>>>>> 1941c56cb5f08268746e6235fa4330d6b99577a9 const navigationHelper = global.__navigationHelper const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1] if (navigation && navigationHelper) { @@ -82,17 +74,10 @@ function navigateTo (options = {}) { } } function redirectTo (options = {}) { -<<<<<<< HEAD if (redirectPending) { return } redirectPending = true -======= - // if (redirectPending) { - // return - // } - // redirectPending = true ->>>>>>> 1941c56cb5f08268746e6235fa4330d6b99577a9 const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1] const navigationHelper = global.__navigationHelper if (navigation && navigationHelper) { @@ -114,15 +99,11 @@ function redirectTo (options = {}) { }) } } -<<<<<<< HEAD -======= -// let backPending = false ->>>>>>> 1941c56cb5f08268746e6235fa4330d6b99577a9 function navigateBack (options = {}) { - // if (backPending) { - // return - // } - // backPending = true + if (backPending) { + return + } + backPending = true const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1] const navigationHelper = global.__navigationHelper if (navigation && navigationHelper) {