diff --git a/src/mock/api/demo.business.issues.142.js b/src/mock/api/demo.business.issues.142.js index 9098c95e..e342b517 100644 --- a/src/mock/api/demo.business.issues.142.js +++ b/src/mock/api/demo.business.issues.142.js @@ -6,9 +6,9 @@ const db = [ ] export default { - path: RegExp('/api/demo/business/issues/142' + '.*'), + path: RegExp('/api/demo/business/issues/142.*'), method: 'get', - handle ({ method, url, params, body, Mock, Random, Generator, Repeat }) { + handle ({ params }) { return { code: 0, msg: '获取数据成功', diff --git a/src/mock/api/demo.business.table.1.js b/src/mock/api/demo.business.table.1.js index b6cb6074..66b638ce 100644 --- a/src/mock/api/demo.business.table.1.js +++ b/src/mock/api/demo.business.table.1.js @@ -1,29 +1,25 @@ export default { path: RegExp('/api/demo/business/table/1'), method: 'post', - handle ({ method, url, params, body, Mock, Random, Generator, Repeat }) { + handle ({ body, Repeat }) { const { page } = body page.total = 1000 - return Mock.mock( - { - code: 0, - msg: '获取数据成功', - data: { - page, - 'list|20': [ - { - 'key': '@guid', - 'value|1': [10, 100, 200, 500], - 'type': '@boolean', - 'admin': '@cname', - 'adminNote': '@cparagraph(0.5)', - 'dateTimeCreat': '@datetime', - 'used': '@boolean', - 'dateTimeUse': '@datetime' - } - ] - } + return { + code: 0, + msg: '获取数据成功', + data: { + page, + list: Repeat(page.size, { + 'key': '@guid', + 'value|1': [10, 100, 200, 500], + 'type': '@boolean', + 'admin': '@cname', + 'adminNote': '@cparagraph(0.5)', + 'dateTimeCreat': '@datetime', + 'used': '@boolean', + 'dateTimeUse': '@datetime' + }) } - ) + } } } diff --git a/src/mock/index.js b/src/mock/index.js index 4d7c7eca..ed02bfe2 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -1,9 +1,8 @@ import d2Mock from './d2-mock' -// 导入所有的接口 const req = context => context.keys().map(context) -const arr = req(require.context('./api/', true, /\.js$/)) +const options = req(require.context('./api/', true, /\.js$/)) .filter(e => e.default) .map(e => e.default) -d2Mock.load(arr) +d2Mock.load(options) diff --git a/src/pages/demo/business/table/1/componnets/PageFooter/index.vue b/src/pages/demo/business/table/1/componnets/PageFooter/index.vue index 46df4540..31ac9067 100644 --- a/src/pages/demo/business/table/1/componnets/PageFooter/index.vue +++ b/src/pages/demo/business/table/1/componnets/PageFooter/index.vue @@ -3,7 +3,7 @@ :current-page="current" :page-size="size" :total="total" - :page-sizes="[100, 200, 300, 400]" + :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" style="margin: -10px;" @size-change="handleSizeChange" diff --git a/src/pages/demo/business/table/1/index.vue b/src/pages/demo/business/table/1/index.vue index ac1b5fe6..c0ce9668 100644 --- a/src/pages/demo/business/table/1/index.vue +++ b/src/pages/demo/business/table/1/index.vue @@ -33,7 +33,7 @@ export default { loading: false, page: { current: 1, - size: 100, + size: 10, total: 0 } }