asd123a20 1 gadu atpakaļ
vecāks
revīzija
6e02f511b5
2 mainītis faili ar 5 papildinājumiem un 3 dzēšanām
  1. 4 2
      src/store/wokes/journal.js
  2. 1 1
      src/views/wokes/content/journal.vue

+ 4 - 2
src/store/wokes/journal.js

@@ -20,7 +20,8 @@ const state = () => ({
 
 const actions = {
   async userQuery ({ commit }, { filter, paging } = {}) {
-    const res = await axios.get(api.userQuery, { ...filter, skip: paging.page, limit: paging.size })
+    const { page = 1, size = 10 } = paging
+    const res = await axios.get(api.userQuery, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
     commit('userQuery', res)
     return res
   },
@@ -37,7 +38,8 @@ const actions = {
     return res
   },
   async catalogueQuery ({ commit }, { filter, paging } = {}) {
-    const res = await axios.get(api.catalogueQuery, { ...filter, skip: paging.page, limit: paging.size })
+    const { page = 1, size = 10 } = paging
+    const res = await axios.get(api.catalogueQuery, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
     commit('catalogueQuery', res)
     return res
   },

+ 1 - 1
src/views/wokes/content/journal.vue

@@ -204,7 +204,7 @@ export default {
       })
     },
     // 查询
-    async filterQuery ({ filter = {}, paging = { page: 0, size: 10 } } = {}) {
+    async filterQuery ({ filter = {}, paging = {} } = {}) {
       await this.catalogueQuery({ filter, paging })
     },
     // 表单保存