From 7a5aed604b08c836461c484f3e9e7588ff35efdb Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 7 Aug 2018 18:50:09 +0800 Subject: [PATCH] no message Former-commit-id: ccca2c3a4920e4af3f169054a099a0d75245dbfe [formerly ccca2c3a4920e4af3f169054a099a0d75245dbfe [formerly ccca2c3a4920e4af3f169054a099a0d75245dbfe [formerly ccca2c3a4920e4af3f169054a099a0d75245dbfe [formerly 7601e194be55be71099b582e55d8e5d258b8d5ca [formerly e069055a2d390c5ddb8ac8ada35def942828f9e5]]]]] Former-commit-id: 32537e9ce0f8e8d0435e1fa87e61dbfaf45ce44d Former-commit-id: e82322f345b5bcdd9f18d6a537f8bc6e01c0fdd1 Former-commit-id: 8ea4e1f8a4457d30efec0632d60066c5d53f3294 [formerly d75aaeb0851c9f4b47ca36b752ecb0b0d7f27654] Former-commit-id: b72f6c445ebc07e4a956625bbca2cf70ca5eea71 Former-commit-id: 29ab36206485313739f835d003917049aa133d95 Former-commit-id: 66cb5ab238b2baf28e853a8c945cc59e3c899e93 Former-commit-id: 8a97bd41fb1603e5d22181b4105fa32828855bd7 Former-commit-id: 00a5825dd750392c15598de7ee745a2b83db8ab3 --- src/mock/{ => api}/demo/business/table/1/index.js | 0 .../{ajax-demo => api/demo/plugins/mock/ajax}/index.js | 2 +- src/mock/{ => api/sys}/login/index.js | 0 src/mock/register.js | 8 +++----- src/pages/demo/plugins/mock/ajax.vue | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) rename src/mock/{ => api}/demo/business/table/1/index.js (100%) rename src/mock/{ajax-demo => api/demo/plugins/mock/ajax}/index.js (82%) rename src/mock/{ => api/sys}/login/index.js (100%) diff --git a/src/mock/demo/business/table/1/index.js b/src/mock/api/demo/business/table/1/index.js similarity index 100% rename from src/mock/demo/business/table/1/index.js rename to src/mock/api/demo/business/table/1/index.js diff --git a/src/mock/ajax-demo/index.js b/src/mock/api/demo/plugins/mock/ajax/index.js similarity index 82% rename from src/mock/ajax-demo/index.js rename to src/mock/api/demo/plugins/mock/ajax/index.js index fd3892e6..fa5a4ce5 100644 --- a/src/mock/ajax-demo/index.js +++ b/src/mock/api/demo/plugins/mock/ajax/index.js @@ -1,6 +1,6 @@ import Mock from 'mockjs' -Mock.mock('/api/ajax-demo', { +Mock.mock('/api/demo/plugins/mock/ajax', { 'list|4-10': [{ 'id|+1': 1, 'name': '@CNAME', diff --git a/src/mock/login/index.js b/src/mock/api/sys/login/index.js similarity index 100% rename from src/mock/login/index.js rename to src/mock/api/sys/login/index.js diff --git a/src/mock/register.js b/src/mock/register.js index b72817ac..86af00fa 100644 --- a/src/mock/register.js +++ b/src/mock/register.js @@ -1,10 +1,8 @@ import Mock from 'mockjs' -import '@/mock/ajax-demo' - -import '@/mock/demo/business/table/1' - -import '@/mock/login' +// 导入所有的接口 +const req = context => context.keys().map(context) +req(require.context('./api/', true, /\.js$/)) // 设置全局延时 没有延时的话有时候会检测不到数据变化 建议保留 Mock.setup({ diff --git a/src/pages/demo/plugins/mock/ajax.vue b/src/pages/demo/plugins/mock/ajax.vue index 838e8a45..19b03daa 100644 --- a/src/pages/demo/plugins/mock/ajax.vue +++ b/src/pages/demo/plugins/mock/ajax.vue @@ -29,7 +29,7 @@ export default { }, methods: { ajax () { - this.$axios.get('/api/ajax-demo') + this.$axios.get('/api/demo/plugins/mock/ajax') .then(res => { this.table.columns = Object.keys(res.list[0]).map(e => ({ label: e,