Merge branch 'hotfix/错词' into develop

Former-commit-id: 8373c73980b8531d2e278333d05b055b0f31b375
This commit is contained in:
liyang
2019-01-08 14:54:27 +08:00
2 changed files with 7 additions and 7 deletions
+3 -3
View File
@@ -4,7 +4,7 @@ import { Message } from 'element-ui'
import util from '@/libs/util'
// 创建一个错误
function errorCreat (msg) {
function errorCreate (msg) {
const err = new Error(msg)
errorLog(err)
throw err
@@ -72,11 +72,11 @@ service.interceptors.response.use(
return dataAxios.data
case 'xxx':
// [ 示例 ] 其它和后台约定的 code
errorCreat(`[ code: xxx ] ${dataAxios.msg}: ${response.config.url}`)
errorCreate(`[ code: xxx ] ${dataAxios.msg}: ${response.config.url}`)
break
default:
// 不是正确的 code
errorCreat(`${dataAxios.msg}: ${response.config.url}`)
errorCreate(`${dataAxios.msg}: ${response.config.url}`)
break
}
}
+4 -4
View File
@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo',
@@ -9,8 +9,8 @@ export default {
redirect: { name: 'demo-page1' },
component: layoutHeaderAside,
children: (pre => [
{ path: 'page1', name: `${pre}page1`, component: () => import('@/pages/demo/page1'), meta: { meta, title: '页面 1' } },
{ path: 'page2', name: `${pre}page2`, component: () => import('@/pages/demo/page2'), meta: { meta, title: '页面 2' } },
{ path: 'page3', name: `${pre}page3`, component: () => import('@/pages/demo/page3'), meta: { meta, title: '页面 3' } }
{ path: 'page1', name: `${pre}page1`, component: () => import('@/pages/demo/page1'), meta: { ...meta, title: '页面 1' } },
{ path: 'page2', name: `${pre}page2`, component: () => import('@/pages/demo/page2'), meta: { ...meta, title: '页面 2' } },
{ path: 'page3', name: `${pre}page3`, component: () => import('@/pages/demo/page3'), meta: { ...meta, title: '页面 3' } }
])('demo-')
}