Merge remote-tracking branch 'origin/2.x' into dev

This commit is contained in:
Clark Du 2018-11-28 16:36:36 +00:00
commit 18b9b750f5

View File

@ -145,7 +145,7 @@ async function loadAsyncComponents(to, from, next) {
// Call next() // Call next()
next() next()
} catch (err) { } catch (err) {
this.error(err) const error = this.error(err)
this.<%= globals.nuxt %>.$emit('routeChanged', to, from, error) this.<%= globals.nuxt %>.$emit('routeChanged', to, from, error)
next(false) next(false)
} }