Merge branch 'develop'

Former-commit-id: 117adbdb124dab0ec665e4da6f224d1df93757c2 [formerly 117adbdb124dab0ec665e4da6f224d1df93757c2 [formerly 117adbdb124dab0ec665e4da6f224d1df93757c2 [formerly 117adbdb124dab0ec665e4da6f224d1df93757c2 [formerly 00a586664b0abcec7cfccf224f82f261eadfc3e2 [formerly 921ad0c9b70d91b59e73fb4d96b53ad9ba1cc3f4]]]]]
Former-commit-id: 8437ded4daeabbe1ddda01bcf60094d4385e61b0
Former-commit-id: aab7f3b8394c7ba748295042ea7a527a7e8ba7dc
Former-commit-id: 45a1331c3f736752b258dad0ef56c1763d2f6350 [formerly 5a587becca557d79d8506dd95c057ec2dd7253c4]
Former-commit-id: cf6f57868f604f97f2279e1cba305f4eb0bc233c
Former-commit-id: 73d77c5bc8c90e676b26ccadc68073c26d084268
Former-commit-id: b254a978fab7661d60f04fc0ef9a6adedd03d075
Former-commit-id: 78019c15ab60c3cbd4950a5d99ff3a9f22f0a4c2
Former-commit-id: 5646c041e33a3c67b97b5dcc6de91c862fe4f910

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',

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({

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,