From 626c31a975bdf264a9284c7040ded701200f981f Mon Sep 17 00:00:00 2001
From: sunyongmofang <sunyongmofang@163.com>
Date: Mon, 7 Jan 2019 11:34:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86requiresAuth=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAauth?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 97617e634f37e7911d1a43def2eaaf968bc5dc5c
---
 src/router/modules/demo.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/router/modules/demo.js b/src/router/modules/demo.js
index 40c70c6..b2f54d0 100644
--- a/src/router/modules/demo.js
+++ b/src/router/modules/demo.js
@@ -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-')
 }

From 556964891845db21cb54e390d59870bc203cb328 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 8 Jan 2019 14:54:21 +0800
Subject: [PATCH 2/2] errorCreate

Former-commit-id: ae769a84dc297376e8db7264c8786f3fa0719bcb
---
 src/plugin/axios/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugin/axios/index.js b/src/plugin/axios/index.js
index fa35dc8..fb19752 100644
--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -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
       }
     }