chore: build

packages/uni-app-plus/dist/index.js

@@ -461,6 +461,7 @@ var en = {
 	"uni.scanCode.flash.on": "Tap to turn light on",
 	"uni.scanCode.flash.off": "Tap to turn light off",
 	"uni.startSoterAuthentication.authContent": "Fingerprint recognition",
+	"uni.startSoterAuthentication.waitingContent": "Unrecognizable",
 	"uni.picker.done": "Done",
 	"uni.picker.cancel": "Cancel",
 	"uni.video.danmu": "Danmu",
@@ -497,6 +498,7 @@ var es = {
 	"uni.scanCode.flash.on": "Toque para encender la luz",
 	"uni.scanCode.flash.off": "Toque para apagar la luz",
 	"uni.startSoterAuthentication.authContent": "Reconocimiento de huellas dactilares",
+	"uni.startSoterAuthentication.waitingContent": "Irreconocible",
 	"uni.picker.done": "OK",
 	"uni.picker.cancel": "Cancelar",
 	"uni.video.danmu": "Danmu",
@@ -533,6 +535,7 @@ var fr = {
 	"uni.scanCode.flash.on": "Appuyez pour activer l'éclairage",
 	"uni.scanCode.flash.off": "Appuyez pour désactiver l'éclairage",
 	"uni.startSoterAuthentication.authContent": "Reconnaissance de l'empreinte digitale",
+	"uni.startSoterAuthentication.waitingContent": "Méconnaissable",
 	"uni.picker.done": "OK",
 	"uni.picker.cancel": "Annuler",
 	"uni.video.danmu": "Danmu",
@@ -569,6 +572,7 @@ var zhHans = {
 	"uni.scanCode.flash.on": "轻触照亮",
 	"uni.scanCode.flash.off": "轻触关闭",
 	"uni.startSoterAuthentication.authContent": "指纹识别中...",
+	"uni.startSoterAuthentication.waitingContent": "无法识别",
 	"uni.picker.done": "完成",
 	"uni.picker.cancel": "取消",
 	"uni.video.danmu": "弹幕",
@@ -605,6 +609,7 @@ var zhHant = {
 	"uni.scanCode.flash.on": "輕觸照亮",
 	"uni.scanCode.flash.off": "輕觸關閉",
 	"uni.startSoterAuthentication.authContent": "指紋識別中...",
+	"uni.startSoterAuthentication.waitingContent": "無法識別",
 	"uni.picker.done": "完成",
 	"uni.picker.cancel": "取消",
 	"uni.video.danmu": "彈幕",
@@ -1857,15 +1862,10 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
 const hooks = [

packages/uni-app-plus/dist/index.v3.js

@@ -677,7 +677,7 @@ var serviceContext = (function () {
     const modeStyle = themeConfig[mode];
     const styles = {};
     if (!modeStyle) {
-      return styles
+      return pageStyle
     }
     Object.keys(pageStyle).forEach((key) => {
       const styleItem = pageStyle[key]; // Object Array String
@@ -1697,6 +1697,7 @@ var serviceContext = (function () {
   	"uni.scanCode.flash.on": "Tap to turn light on",
   	"uni.scanCode.flash.off": "Tap to turn light off",
   	"uni.startSoterAuthentication.authContent": "Fingerprint recognition",
+  	"uni.startSoterAuthentication.waitingContent": "Unrecognizable",
   	"uni.picker.done": "Done",
   	"uni.picker.cancel": "Cancel",
   	"uni.video.danmu": "Danmu",
@@ -1733,6 +1734,7 @@ var serviceContext = (function () {
   	"uni.scanCode.flash.on": "Toque para encender la luz",
   	"uni.scanCode.flash.off": "Toque para apagar la luz",
   	"uni.startSoterAuthentication.authContent": "Reconocimiento de huellas dactilares",
+  	"uni.startSoterAuthentication.waitingContent": "Irreconocible",
   	"uni.picker.done": "OK",
   	"uni.picker.cancel": "Cancelar",
   	"uni.video.danmu": "Danmu",
@@ -1769,6 +1771,7 @@ var serviceContext = (function () {
   	"uni.scanCode.flash.on": "Appuyez pour activer l'éclairage",
   	"uni.scanCode.flash.off": "Appuyez pour désactiver l'éclairage",
   	"uni.startSoterAuthentication.authContent": "Reconnaissance de l'empreinte digitale",
+  	"uni.startSoterAuthentication.waitingContent": "Méconnaissable",
   	"uni.picker.done": "OK",
   	"uni.picker.cancel": "Annuler",
   	"uni.video.danmu": "Danmu",
@@ -1805,6 +1808,7 @@ var serviceContext = (function () {
   	"uni.scanCode.flash.on": "轻触照亮",
   	"uni.scanCode.flash.off": "轻触关闭",
   	"uni.startSoterAuthentication.authContent": "指纹识别中...",
+  	"uni.startSoterAuthentication.waitingContent": "无法识别",
   	"uni.picker.done": "完成",
   	"uni.picker.cancel": "取消",
   	"uni.video.danmu": "弹幕",
@@ -1841,6 +1845,7 @@ var serviceContext = (function () {
   	"uni.scanCode.flash.on": "輕觸照亮",
   	"uni.scanCode.flash.off": "輕觸關閉",
   	"uni.startSoterAuthentication.authContent": "指紋識別中...",
+  	"uni.startSoterAuthentication.waitingContent": "無法識別",
   	"uni.picker.done": "完成",
   	"uni.picker.cancel": "取消",
   	"uni.video.danmu": "彈幕",
@@ -6237,7 +6242,7 @@ var serviceContext = (function () {
           case e.AUTHENTICATE_MISMATCH:
             if (waiting) {
               clearTimeout(waitingTimer);
-              waiting.setTitle('无法识别');
+              waiting.setTitle(t('uni.startSoterAuthentication.waitingContent'));
               waitingTimer = setTimeout(() => {
                 waiting && waiting.setTitle(waitingTitle);
               }, 1000);
@@ -10560,14 +10565,22 @@ var serviceContext = (function () {
       }
       return proxy;
   }
-  function resolveSyncResult(res, returnOptions, instanceId, proxy) {
-      // devtools 环境是字符串？
-      if (isString(res)) {
-          res = JSON.parse(res);
-      }
+  function resolveSyncResult(args, res, returnOptions, instanceId, proxy) {
       if ((process.env.NODE_ENV !== 'production')) {
           console.log('uts.invokeSync.result', res, returnOptions, instanceId, typeof proxy);
       }
+      if (!res) {
+          throw new Error(JSON.stringify(args));
+      }
+      // devtools 环境是字符串？
+      if (isString(res)) {
+          try {
+              res = JSON.parse(res);
+          }
+          catch (e) {
+              throw new Error(`JSON.parse(${res}): ` + e);
+          }
+      }
       if (res.errMsg) {
           throw new Error(res.errMsg);
       }
@@ -10596,7 +10609,7 @@ var serviceContext = (function () {
       if ((process.env.NODE_ENV !== 'production')) {
           console.log('uts.invokePropGetter.args', args);
       }
-      return resolveSyncResult(getProxy().invokeSync(args, () => { }));
+      return resolveSyncResult(args, getProxy().invokeSync(args, () => { }));
   }
   function initProxyFunction(async, { moduleName, moduleType, package: pkg, class: cls, name: propOrMethod, method, companion, params: methodParams, return: returnOptions, errMsg, }, instanceId, proxy) {
       const invokeCallback = ({ id, name, params, keepAlive, }) => {
@@ -10661,7 +10674,7 @@ var serviceContext = (function () {
           if ((process.env.NODE_ENV !== 'production')) {
               console.log('uts.invokeSync.args', invokeArgs);
           }
-          return resolveSyncResult(getProxy().invokeSync(invokeArgs, invokeCallback), returnOptions, instanceId, proxy);
+          return resolveSyncResult(invokeArgs, getProxy().invokeSync(invokeArgs, invokeCallback), returnOptions, instanceId, proxy);
       };
   }
   function initUTSStaticMethod(async, opts) {

packages/uni-mp-alipay/dist/index.js

@@ -687,8 +687,6 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 let id = 0;
 
 function initEventChannel (events, cache = true) {
@@ -696,31 +694,30 @@ function initEventChannel (events, cache = true) {
   const eventChannel = new EventChannel(id, events);
   if (cache) {
     eventChannels[id] = eventChannel;
-    eventChannelStack.push(eventChannel);
   }
   return eventChannel
 }
 
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
-var navigateTo = {
-  args (fromArgs, toArgs) {
-    const id = initEventChannel(fromArgs.events).id;
-    if (fromArgs.url) {
-      fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + id;
+function navigateTo () {
+  let eventChannel;
+  return {
+    args (fromArgs, toArgs) {
+      eventChannel = initEventChannel(fromArgs.events);
+      if (fromArgs.url) {
+        fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + eventChannel.id;
+      }
+    },
+    returnValue (fromRes, toRes) {
+      fromRes.eventChannel = eventChannel;
     }
-  },
-  returnValue (fromRes, toRes) {
-    fromRes.eventChannel = getEventChannel();
   }
-};
+}
 
 function findExistsPageIndex (url) {
   const pages = getCurrentPages();
@@ -1010,7 +1007,7 @@ function _handleNetworkInfo (result) {
 }
 
 const protocols = { // 需要做转换的 API 列表
-  navigateTo,
+  navigateTo: navigateTo(),
   redirectTo,
   returnValue (methodName, res = {}) { // 通用 returnValue 解析
     if (res.error || res.errorMessage) {
@@ -2878,6 +2875,9 @@ const hooks = [
 
 function initEventChannel$1 () {
   Vue.prototype.getOpenerEventChannel = function () {
+    {
+      if (my.canIUse('getOpenerEventChannel')) { return this.$scope.getOpenerEventChannel() }
+    }
     if (!this.__eventChannel__) {
       this.__eventChannel__ = new EventChannel();
     }
@@ -3483,7 +3483,7 @@ if (typeof Proxy !== 'undefined' && "mp-alipay" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
 

packages/uni-mp-baidu/dist/index.js

@@ -687,8 +687,6 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 let id = 0;
 
 function initEventChannel (events, cache = true) {
@@ -696,31 +694,30 @@ function initEventChannel (events, cache = true) {
   const eventChannel = new EventChannel(id, events);
   if (cache) {
     eventChannels[id] = eventChannel;
-    eventChannelStack.push(eventChannel);
   }
   return eventChannel
 }
 
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
-var navigateTo = {
-  args (fromArgs, toArgs) {
-    const id = initEventChannel(fromArgs.events).id;
-    if (fromArgs.url) {
-      fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + id;
+function navigateTo () {
+  let eventChannel;
+  return {
+    args (fromArgs, toArgs) {
+      eventChannel = initEventChannel(fromArgs.events);
+      if (fromArgs.url) {
+        fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + eventChannel.id;
+      }
+    },
+    returnValue (fromRes, toRes) {
+      fromRes.eventChannel = eventChannel;
     }
-  },
-  returnValue (fromRes, toRes) {
-    fromRes.eventChannel = getEventChannel();
   }
-};
+}
 
 function findExistsPageIndex (url) {
   const pages = getCurrentPages();
@@ -1022,7 +1019,7 @@ const protocols = {
       method: false
     }
   },
-  navigateTo,
+  navigateTo: navigateTo(),
   redirectTo,
   previewImage,
   getSystemInfo,
@@ -2945,7 +2942,7 @@ if (typeof Proxy !== 'undefined' && "mp-baidu" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
 

packages/uni-mp-jd/dist/index.js

@@ -1940,15 +1940,10 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
 const hooks = [
@@ -2465,7 +2460,7 @@ if (typeof Proxy !== 'undefined' && "mp-jd" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
 

packages/uni-mp-kuaishou/dist/index.js

@@ -687,8 +687,6 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 let id = 0;
 
 function initEventChannel (events, cache = true) {
@@ -696,31 +694,30 @@ function initEventChannel (events, cache = true) {
   const eventChannel = new EventChannel(id, events);
   if (cache) {
     eventChannels[id] = eventChannel;
-    eventChannelStack.push(eventChannel);
   }
   return eventChannel
 }
 
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
-var navigateTo = {
-  args (fromArgs, toArgs) {
-    const id = initEventChannel(fromArgs.events).id;
-    if (fromArgs.url) {
-      fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + id;
+function navigateTo () {
+  let eventChannel;
+  return {
+    args (fromArgs, toArgs) {
+      eventChannel = initEventChannel(fromArgs.events);
+      if (fromArgs.url) {
+        fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + eventChannel.id;
+      }
+    },
+    returnValue (fromRes, toRes) {
+      fromRes.eventChannel = eventChannel;
     }
-  },
-  returnValue (fromRes, toRes) {
-    fromRes.eventChannel = getEventChannel();
   }
-};
+}
 
 function findExistsPageIndex (url) {
   const pages = getCurrentPages();
@@ -952,7 +949,7 @@ var getUserProfile = {
 };
 
 const protocols = {
-  navigateTo,
+  navigateTo: navigateTo(),
   redirectTo,
   previewImage,
   getSystemInfo,
@@ -2606,7 +2603,7 @@ if (typeof Proxy !== 'undefined' && "mp-kuaishou" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
 

packages/uni-mp-lark/dist/index.js

@@ -687,8 +687,6 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 let id = 0;
 
 function initEventChannel (events, cache = true) {
@@ -696,31 +694,30 @@ function initEventChannel (events, cache = true) {
   const eventChannel = new EventChannel(id, events);
   if (cache) {
     eventChannels[id] = eventChannel;
-    eventChannelStack.push(eventChannel);
   }
   return eventChannel
 }
 
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
-var navigateTo = {
-  args (fromArgs, toArgs) {
-    const id = initEventChannel(fromArgs.events).id;
-    if (fromArgs.url) {
-      fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + id;
+function navigateTo () {
+  let eventChannel;
+  return {
+    args (fromArgs, toArgs) {
+      eventChannel = initEventChannel(fromArgs.events);
+      if (fromArgs.url) {
+        fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + eventChannel.id;
+      }
+    },
+    returnValue (fromRes, toRes) {
+      fromRes.eventChannel = eventChannel;
     }
-  },
-  returnValue (fromRes, toRes) {
-    fromRes.eventChannel = getEventChannel();
   }
-};
+}
 
 function findExistsPageIndex (url) {
   const pages = getCurrentPages();
@@ -953,7 +950,7 @@ var getUserProfile = {
 
 // 需要做转换的 API 列表
 const protocols = {
-  navigateTo,
+  navigateTo: navigateTo(),
   redirectTo,
   previewImage,
   getSystemInfo,
@@ -2716,7 +2713,7 @@ if (typeof Proxy !== 'undefined' && "mp-lark" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
 

packages/uni-mp-qq/dist/index.js

@@ -687,8 +687,6 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 let id = 0;
 
 function initEventChannel (events, cache = true) {
@@ -696,31 +694,30 @@ function initEventChannel (events, cache = true) {
   const eventChannel = new EventChannel(id, events);
   if (cache) {
     eventChannels[id] = eventChannel;
-    eventChannelStack.push(eventChannel);
   }
   return eventChannel
 }
 
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
-var navigateTo = {
-  args (fromArgs, toArgs) {
-    const id = initEventChannel(fromArgs.events).id;
-    if (fromArgs.url) {
-      fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + id;
+function navigateTo () {
+  let eventChannel;
+  return {
+    args (fromArgs, toArgs) {
+      eventChannel = initEventChannel(fromArgs.events);
+      if (fromArgs.url) {
+        fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + eventChannel.id;
+      }
+    },
+    returnValue (fromRes, toRes) {
+      fromRes.eventChannel = eventChannel;
     }
-  },
-  returnValue (fromRes, toRes) {
-    fromRes.eventChannel = getEventChannel();
   }
-};
+}
 
 function findExistsPageIndex (url) {
   const pages = getCurrentPages();
@@ -952,7 +949,7 @@ var getUserProfile = {
 };
 
 const protocols = {
-  navigateTo,
+  navigateTo: navigateTo(),
   redirectTo,
   previewImage,
   getSystemInfo,
@@ -2725,7 +2722,7 @@ if (typeof Proxy !== 'undefined' && "mp-qq" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
 

packages/uni-mp-toutiao/dist/index.js

@@ -687,8 +687,6 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 let id = 0;
 
 function initEventChannel (events, cache = true) {
@@ -696,31 +694,30 @@ function initEventChannel (events, cache = true) {
   const eventChannel = new EventChannel(id, events);
   if (cache) {
     eventChannels[id] = eventChannel;
-    eventChannelStack.push(eventChannel);
   }
   return eventChannel
 }
 
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
-var navigateTo = {
-  args (fromArgs, toArgs) {
-    const id = initEventChannel(fromArgs.events).id;
-    if (fromArgs.url) {
-      fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + id;
+function navigateTo () {
+  let eventChannel;
+  return {
+    args (fromArgs, toArgs) {
+      eventChannel = initEventChannel(fromArgs.events);
+      if (fromArgs.url) {
+        fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + eventChannel.id;
+      }
+    },
+    returnValue (fromRes, toRes) {
+      fromRes.eventChannel = eventChannel;
     }
-  },
-  returnValue (fromRes, toRes) {
-    fromRes.eventChannel = getEventChannel();
   }
-};
+}
 
 function findExistsPageIndex (url) {
   const pages = getCurrentPages();
@@ -1045,7 +1042,7 @@ const canIUses = [
 
 // 需要做转换的 API 列表
 const protocols = {
-  navigateTo,
+  navigateTo: navigateTo(),
   redirectTo,
   previewImage,
   getSystemInfo,

packages/uni-mp-weixin/dist/index.js

@@ -2084,15 +2084,10 @@ function handleEvent (event) {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
 const hooks = [
@@ -2606,7 +2601,7 @@ if (typeof Proxy !== 'undefined' && "mp-weixin" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
 

packages/uni-mp-xhs/dist/index.js

@@ -1938,15 +1938,10 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
 const hooks = [
@@ -2590,7 +2585,7 @@ if (typeof Proxy !== 'undefined' && "mp-xhs" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }
 

packages/uni-quickapp-webview/dist/index.js

@@ -687,8 +687,6 @@ class EventChannel {
 
 const eventChannels = {};
 
-const eventChannelStack = [];
-
 let id = 0;
 
 function initEventChannel (events, cache = true) {
@@ -696,31 +694,30 @@ function initEventChannel (events, cache = true) {
   const eventChannel = new EventChannel(id, events);
   if (cache) {
     eventChannels[id] = eventChannel;
-    eventChannelStack.push(eventChannel);
   }
   return eventChannel
 }
 
 function getEventChannel (id) {
-  if (id) {
-    const eventChannel = eventChannels[id];
-    delete eventChannels[id];
-    return eventChannel
-  }
-  return eventChannelStack.shift()
+  const eventChannel = eventChannels[id];
+  delete eventChannels[id];
+  return eventChannel
 }
 
-var navigateTo = {
-  args (fromArgs, toArgs) {
-    const id = initEventChannel(fromArgs.events).id;
-    if (fromArgs.url) {
-      fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + id;
+function navigateTo () {
+  let eventChannel;
+  return {
+    args (fromArgs, toArgs) {
+      eventChannel = initEventChannel(fromArgs.events);
+      if (fromArgs.url) {
+        fromArgs.url = fromArgs.url + (fromArgs.url.indexOf('?') === -1 ? '?' : '&') + '__id__=' + eventChannel.id;
+      }
+    },
+    returnValue (fromRes, toRes) {
+      fromRes.eventChannel = eventChannel;
     }
-  },
-  returnValue (fromRes, toRes) {
-    fromRes.eventChannel = getEventChannel();
   }
-};
+}
 
 function findExistsPageIndex (url) {
   const pages = getCurrentPages();
@@ -944,7 +941,7 @@ var getSystemInfo = {
 };
 
 const protocols = {
-  navigateTo,
+  navigateTo: navigateTo(),
   redirectTo,
   previewImage,
   getSystemInfo,
@@ -2593,7 +2590,7 @@ if (typeof Proxy !== 'undefined' && "quickapp-webview" !== 'app-plus') {
       uni[name] = promisify(name, todoApis[name]);
     });
     Object.keys(extraApi).forEach(name => {
-      uni[name] = promisify(name, todoApis[name]);
+      uni[name] = promisify(name, extraApi[name]);
     });
   }