recompose

icreazy · Oct 30, 2018 · 74034bf · 74034bf
1 parent 10427c6
commit 74034bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/mpvue/index.js b/packages/mpvue/index.js
@@ -4947,10 +4947,6 @@ function callHook$1 (vm, hook, params) {
     handlers = [handlers];
   }
 
-  if (hook = 'onPageNotFound' && handlers) {
-    handlers = [handlers];
-  }
-
   var ret;
   if (handlers) {
     for (var i = 0, j = handlers.length; i < j; i++) {
@@ -5164,10 +5160,6 @@ function initMP (mpType, next) {
 
       onError: function onError (err) {
         callHook$1(rootVueVM, 'onError', err);
-      },
-
-      onPageNotFound: function onPageNotFound (err) {
-        callHook$1(rootVueVM, 'onPageNotFound', err)
       }
     });
   } else if (mpType === 'component') {

diff --git a/src/platforms/mp/runtime/lifecycle.js b/src/platforms/mp/runtime/lifecycle.js
@@ -12,6 +12,8 @@ export function callHook (vm, hook, params) {
   let handlers = vm.$options[hook]
   if (hook === 'onError' && handlers) {
     handlers = [handlers]
+  } else if (hook === 'onPageNotFound' && handlers) {
+    handlers = [handlers]
   }
 
   let ret
@@ -225,6 +227,10 @@ export function initMP (mpType, next) {
 
       onError (err) {
         callHook(rootVueVM, 'onError', err)
+      },
+
+      onPageNotFound (err) {
+        callHook(rootVueVM, 'onPageNotFound', err)
       }
     })
   } else if (mpType === 'component') {