From ba81755fd589f09a2565ee28ecdde0140d5be756 Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Tue, 21 Jul 2020 13:10:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/components/Guide/main.vue | 6 +++--- vue/src/layout/components/TagsView/index.vue | 4 ++-- vue/src/mixins/bizDocDetailMixin.js | 2 +- vue/src/router/authority/modules/sell.js | 2 +- vue/src/views/message/user/MessageStream.vue | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vue/src/components/Guide/main.vue b/vue/src/components/Guide/main.vue index b33cf15..02d0532 100644 --- a/vue/src/components/Guide/main.vue +++ b/vue/src/components/Guide/main.vue @@ -122,7 +122,7 @@ if (this.beforeExit) { const result = this.beforeExit(this.hasDone) if (result && result.then) { - result.then(this.$_clear) + result.then(() => this.$_clear()) } else result !== false && this.$_clear() return @@ -138,7 +138,7 @@ if (this.step.onPrevious) { const result = this.step.onPrevious() if (result && result.then) { - result.then(this.$_movePrevious) + result.then(() => this.$_movePrevious()) } else result !== false && this.$_movePrevious() } @@ -152,7 +152,7 @@ if (this.step.onNext) { const result = this.step.onNext() if (result && result.then) { - result.then(this.$_moveNext) + result.then(() => this.$_moveNext()) } else result !== false && this.$_moveNext() } diff --git a/vue/src/layout/components/TagsView/index.vue b/vue/src/layout/components/TagsView/index.vue index 4833bfc..f46294f 100644 --- a/vue/src/layout/components/TagsView/index.vue +++ b/vue/src/layout/components/TagsView/index.vue @@ -66,7 +66,7 @@ watch: { $route(to, from) { this.decideRouteTransition && this.decideRouteTransition(to, from) - this.addTags(to).then(this.moveToCurrentTag) + this.addTags(to).then(() => this.moveToCurrentTag()) }, 'contextmenu.show'(v) { @@ -148,7 +148,7 @@ closeAllTags() { this.$store .dispatch('tagsView/delAllViews') - .then(this.gotoLastView) + .then(() => this.gotoLastView()) }, gotoLastView() { diff --git a/vue/src/mixins/bizDocDetailMixin.js b/vue/src/mixins/bizDocDetailMixin.js index 967d60c..3015006 100644 --- a/vue/src/mixins/bizDocDetailMixin.js +++ b/vue/src/mixins/bizDocDetailMixin.js @@ -205,7 +205,7 @@ export default { if (!data || id !== data.id) return Promise.reject() return Promise.resolve(mergeObj(this.form, data)) }) - .then(this.afterInit || Promise.resolve) + .then(() => this.afterInit ? this.afterInit() : Promise.resolve()) .catch(e => { console.log(e) return elAlert(`获取${this.docName}数据失败,请重试`, this.close) diff --git a/vue/src/router/authority/modules/sell.js b/vue/src/router/authority/modules/sell.js index 0ba208b..5aa1fb2 100644 --- a/vue/src/router/authority/modules/sell.js +++ b/vue/src/router/authority/modules/sell.js @@ -16,7 +16,7 @@ const router = { }, { path: 'order/detail/:type(see|add|edit)/:id?', - name: 'purchaseOrderDetail', + name: 'sellOrderDetail', hidden: true, props: true, component: lazyLoadView(import('@/views/sell/order/detail')), diff --git a/vue/src/views/message/user/MessageStream.vue b/vue/src/views/message/user/MessageStream.vue index e321865..b26f1ac 100644 --- a/vue/src/views/message/user/MessageStream.vue +++ b/vue/src/views/message/user/MessageStream.vue @@ -132,7 +132,7 @@ }, readAll() { - readAll().then(this.search) + readAll().then(() => this.search()) }, transformType(type) {