From e271aa0a0aca3b455ca4b55f06b8fbb4f2e786d4 Mon Sep 17 00:00:00 2001 From: wppd <919138+wppd@users.noreply.github.com> Date: Mon, 3 Feb 2020 23:41:37 +0800 Subject: [PATCH] chore(vue-app): pass error as param to nuxt-loading fail method (#6939) --- packages/vue-app/template/App.js | 4 ++-- packages/vue-app/template/components/nuxt-loading.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vue-app/template/App.js b/packages/vue-app/template/App.js index df31d0a58b..ce1ae6ef2e 100644 --- a/packages/vue-app/template/App.js +++ b/packages/vue-app/template/App.js @@ -178,7 +178,7 @@ export default { try { await Promise.all(promises) } catch (error) { - <% if (loading) { %>this.$loading.fail()<% } %> + <% if (loading) { %>this.$loading.fail(error)<% } %> globalHandleError(error) this.error(error) } @@ -189,7 +189,7 @@ export default { errorChanged () { if (this.nuxt.err && this.$loading) { if (this.$loading.fail) { - this.$loading.fail() + this.$loading.fail(this.nuxt.err) } if (this.$loading.finish) { this.$loading.finish() diff --git a/packages/vue-app/template/components/nuxt-loading.vue b/packages/vue-app/template/components/nuxt-loading.vue index 89cdcd7cb4..fa19f8b4a1 100644 --- a/packages/vue-app/template/components/nuxt-loading.vue +++ b/packages/vue-app/template/components/nuxt-loading.vue @@ -88,7 +88,7 @@ export default { }, 500) return this }, - fail () { + fail (error) { this.canSucceed = false return this },