diff --git a/components/layouts/pc/main.vue b/components/layouts/pc/main.vue index 8a6e325..15b4d23 100644 --- a/components/layouts/pc/main.vue +++ b/components/layouts/pc/main.vue @@ -4,7 +4,7 @@ - + diff --git a/pages/admin/articles.vue b/pages/admin/articles.vue index 6ed3951..d21a11a 100644 --- a/pages/admin/articles.vue +++ b/pages/admin/articles.vue @@ -110,7 +110,8 @@ export default { components: { EditTags }, - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('admin/fetchArticles', params) diff --git a/pages/admin/bank-accounts.vue b/pages/admin/bank-accounts.vue index 4079342..bd91284 100644 --- a/pages/admin/bank-accounts.vue +++ b/pages/admin/bank-accounts.vue @@ -76,7 +76,8 @@ import Records from "../../components/common/bank/account/records"; export default { name: "bank-accounts", components: {Records}, - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('bank-account/fetchList', params) diff --git a/pages/admin/banks.vue b/pages/admin/banks.vue index 2e65c5f..4e53bff 100644 --- a/pages/admin/banks.vue +++ b/pages/admin/banks.vue @@ -87,7 +87,8 @@ import {mapState} from 'vuex'; export default { name: "banks", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('bank/fetchList', params) diff --git a/pages/admin/comments.vue b/pages/admin/comments.vue index a311719..db406d0 100644 --- a/pages/admin/comments.vue +++ b/pages/admin/comments.vue @@ -97,7 +97,8 @@ import {mapState} from 'vuex'; export default { name: "comments", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('admin/fetchComments', params) diff --git a/pages/admin/currency-rules.vue b/pages/admin/currency-rules.vue index 2dcce23..546923f 100644 --- a/pages/admin/currency-rules.vue +++ b/pages/admin/currency-rules.vue @@ -81,7 +81,8 @@ import {mapState} from 'vuex'; export default { name: "currency-rules", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('currency-rule/fetchList', params) diff --git a/pages/admin/dashboard.vue b/pages/admin/dashboard.vue index 2238f15..e007989 100644 --- a/pages/admin/dashboard.vue +++ b/pages/admin/dashboard.vue @@ -251,7 +251,8 @@ export default { components: { EditTags }, - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('dashboard/fetchDashboard', params) diff --git a/pages/admin/products.vue b/pages/admin/products.vue index 8fcf49e..c586118 100644 --- a/pages/admin/products.vue +++ b/pages/admin/products.vue @@ -80,7 +80,8 @@ import {mapState} from 'vuex'; export default { name: "products", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('admin/fetchProducts', params) diff --git a/pages/admin/roles.vue b/pages/admin/roles.vue index 6f38f48..2d2d40b 100644 --- a/pages/admin/roles.vue +++ b/pages/admin/roles.vue @@ -91,7 +91,8 @@ export default { name: "roles", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('admin/fetchRoles', params) diff --git a/pages/admin/tags.vue b/pages/admin/tags.vue index 96af92d..96e9996 100644 --- a/pages/admin/tags.vue +++ b/pages/admin/tags.vue @@ -48,7 +48,8 @@ export default { name: "tags", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('tag/fetchList', params) diff --git a/pages/admin/topic/_topic_uri.vue b/pages/admin/topic/_topic_uri.vue index 253b27a..30f7e89 100644 --- a/pages/admin/topic/_topic_uri.vue +++ b/pages/admin/topic/_topic_uri.vue @@ -77,7 +77,8 @@ export default { } return params.topic_uri }, - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store.dispatch('topic/fetchDetail', params) .catch(err => error({statusCode: 404})), diff --git a/pages/admin/topics.vue b/pages/admin/topics.vue index 5a4aaca..347a5a2 100644 --- a/pages/admin/topics.vue +++ b/pages/admin/topics.vue @@ -39,7 +39,8 @@ export default { name: "topics", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('topic/fetchList', params) diff --git a/pages/admin/users.vue b/pages/admin/users.vue index cc3a64e..0f9cb1f 100644 --- a/pages/admin/users.vue +++ b/pages/admin/users.vue @@ -119,7 +119,8 @@ import {mapState} from 'vuex'; export default { name: "users", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('admin/fetchUsers', params) diff --git a/pages/drafts.vue b/pages/drafts.vue index 91ca082..7b6f141 100644 --- a/pages/drafts.vue +++ b/pages/drafts.vue @@ -16,7 +16,8 @@ components: { DraftList }, - fetch({store, error}) { + fetch() { + let {store, error} = this.$nuxt.context return Promise.all([ store .dispatch('draft/fetchList') diff --git a/pages/index.vue b/pages/index.vue index 5384dc7..ec1032e 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -11,7 +11,8 @@ import {mapState} from 'vuex'; export default { name: 'Index', - fetch({store, query}) { + fetch() { + let {store, query, error} = this.$nuxt.context return Promise.all([ store.dispatch('article/fetchList', {page: query.page || 1}), store.dispatch('article/fetchAnnouncementList', {page: query.page || 1}) diff --git a/pages/notification.vue b/pages/notification.vue index f03155d..65a3b04 100644 --- a/pages/notification.vue +++ b/pages/notification.vue @@ -17,7 +17,8 @@ components: { NotificationList }, - fetch({store, query, error}) { + fetch() { + let {store, query, error} = this.$nuxt.context return Promise.all([ store .dispatch('notification/fetchList', {page: query.page || 1}) diff --git a/pages/open-data.vue b/pages/open-data.vue index 9932273..7ba5d18 100644 --- a/pages/open-data.vue +++ b/pages/open-data.vue @@ -54,7 +54,8 @@ import gzh from "assets/rymcugzh.jpg"; Vue.prototype.$echarts = echarts; export default { name: "openData", - fetch({store, params, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('open-data/fetchLastThirtyDays', params) diff --git a/pages/portfolios.vue b/pages/portfolios.vue index e046378..f88e62f 100644 --- a/pages/portfolios.vue +++ b/pages/portfolios.vue @@ -16,7 +16,8 @@ import PortfolioList from "~/components/common/portfolio/list"; export default { name: "Portfolios", components: {PortfolioList}, - fetch({store, query, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('portfolio/fetchList', {page: query.page || 1}) diff --git a/pages/products.vue b/pages/products.vue index 8cfc8f4..7f0ec90 100644 --- a/pages/products.vue +++ b/pages/products.vue @@ -13,7 +13,8 @@ import ProductList from "~/components/common/product/list"; export default { name: "products", components: {ProductList}, - fetch({store, query, error}) { + fetch() { + let {store, params, error} = this.$nuxt.context return Promise.all([ store .dispatch('product/fetchList', {page: query.page || 1})