e 5 years ago
parent
commit
2e94e089ea
7 changed files with 28 additions and 42 deletions
  1. 6 6
      mock/article.js
  2. 8 11
      mock/index.js
  3. 2 2
      mock/remote-search.js
  4. 5 5
      mock/role/index.js
  5. 5 5
      mock/user.js
  6. 1 1
      package.json
  7. 1 12
      vue.config.js

+ 6 - 6
mock/article.js

@@ -18,7 +18,7 @@ for (let i = 0; i < count; i++) {
     forecast: '@float(0, 100, 2, 2)',
     importance: '@integer(1, 3)',
     'type|1': ['CN', 'US', 'JP', 'EU'],
-    'status|1': ['published', 'draft', 'deleted'],
+    'status|1': ['published', 'draft'],
     display_time: '@datetime',
     comment_disabled: true,
     pageviews: '@integer(300, 5000)',
@@ -29,7 +29,7 @@ for (let i = 0; i < count; i++) {
 
 export default [
   {
-    url: '/article/list',
+    url: '/vue-element-admin/article/list',
     type: 'get',
     response: config => {
       const { importance, type, title, page = 1, limit = 20, sort } = config.query
@@ -58,7 +58,7 @@ export default [
   },
 
   {
-    url: '/article/detail',
+    url: '/vue-element-admin/article/detail',
     type: 'get',
     response: config => {
       const { id } = config.query
@@ -74,7 +74,7 @@ export default [
   },
 
   {
-    url: '/article/pv',
+    url: '/vue-element-admin/article/pv',
     type: 'get',
     response: _ => {
       return {
@@ -92,7 +92,7 @@ export default [
   },
 
   {
-    url: '/article/create',
+    url: '/vue-element-admin/article/create',
     type: 'post',
     response: _ => {
       return {
@@ -103,7 +103,7 @@ export default [
   },
 
   {
-    url: '/article/update',
+    url: '/vue-element-admin/article/update',
     type: 'post',
     response: _ => {
       return {

+ 8 - 11
mock/index.js

@@ -2,11 +2,15 @@ import Mock from 'mockjs'
 import { param2Obj } from '../src/utils'
 
 import user from './user'
-import table from './table'
+import role from './role'
+import article from './article'
+import search from './remote-search'
 
 const mocks = [
   ...user,
-  ...table
+  ...role,
+  ...article,
+  ...search
 ]
 
 // for front mock
@@ -52,19 +56,12 @@ export function mockXHR() {
 
 // for mock server
 const responseFake = (url, type, respond) => {
-/*  return {
-    url: new RegExp(`/mock${url}`),
-    type: type || 'get',
-    response(req, res) {
-      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
-    }
-  }*/
   return {
     url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
     type: type || 'get',
     response(req, res) {
-      console.log('request invoke:' + req.path);
-      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond));
+      console.log('request invoke:' + req.path)
+      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
     }
   }
 }

+ 2 - 2
mock/remote-search.js

@@ -13,7 +13,7 @@ NameList.push({ name: 'mock-Pan' })
 export default [
   // username search
   {
-    url: '/search/user',
+    url: '/vue-element-admin/search/user',
     type: 'get',
     response: config => {
       const { name } = config.query
@@ -30,7 +30,7 @@ export default [
 
   // transaction list
   {
-    url: '/transaction/list',
+    url: '/vue-element-admin/transaction/list',
     type: 'get',
     response: _ => {
       return {

+ 5 - 5
mock/role/index.js

@@ -38,7 +38,7 @@ const roles = [
 export default [
   // mock get all routes form server
   {
-    url: '/routes',
+    url: '/vue-element-admin/routes',
     type: 'get',
     response: _ => {
       return {
@@ -50,7 +50,7 @@ export default [
 
   // mock get all roles form server
   {
-    url: '/roles',
+    url: '/vue-element-admin/roles',
     type: 'get',
     response: _ => {
       return {
@@ -62,7 +62,7 @@ export default [
 
   // add role
   {
-    url: '/role',
+    url: '/vue-element-admin/role',
     type: 'post',
     response: {
       code: 20000,
@@ -74,7 +74,7 @@ export default [
 
   // update role
   {
-    url: '/role/[A-Za-z0-9]',
+    url: '/vue-element-admin/role/[A-Za-z0-9]',
     type: 'put',
     response: {
       code: 20000,
@@ -86,7 +86,7 @@ export default [
 
   // delete role
   {
-    url: '/role/[A-Za-z0-9]',
+    url: '/vue-element-admin/role/[A-Za-z0-9]',
     type: 'delete',
     response: {
       code: 20000,

+ 5 - 5
mock/user.js

@@ -26,7 +26,7 @@ const users = {
 export default [
   // user login
   {
-    url: '/user/login',
+    url: '/vue-element-admin/user/login',
     type: 'post',
     response: config => {
       const { username } = config.body
@@ -49,11 +49,11 @@ export default [
 
   // get user info
   {
-    url: '/user/info\.*',
+    url: '/vue-element-admin/user/info\.*',
     type: 'get',
     response: config => {
-      // const { token } = config.query
-      const info = users['admin-token']
+      const { token } = config.query
+      const info = users[token]
 
       // mock error
       if (!info) {
@@ -72,7 +72,7 @@ export default [
 
   // user logout
   {
-    url: '/user/logout',
+    url: '/vue-element-admin/user/logout',
     type: 'post',
     response: _ => {
       return {

+ 1 - 1
package.json

@@ -49,7 +49,7 @@
     "driver.js": "0.9.5",
     "dropzone": "5.5.1",
     "echarts": "4.2.1",
-    "element-ui": "2.7.0",
+    "element-ui": "2.13.0",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
     "js-cookie": "2.2.0",

+ 1 - 12
vue.config.js

@@ -36,19 +36,8 @@ module.exports = {
     overlay: {
       warnings: false,
       errors: true
-    }/* ,
-    proxy: {
-      // change xxx-api/login => mock/login
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:${port}/mock`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
     },
-    before: require('./mock/mock-server.js') */
+    before: require('./mock/mock-server.js')
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that