Merge branch 'master' into permission-control

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-node_js: stable
+node_js: 10
 script: npm run test
 notifications:
   email: false

mock/mock-server.js

@@ -48,6 +48,7 @@ module.exports = app => {
     ignoreInitial: true
   }).on('all', (event, path) => {
     if (event === 'change' || event === 'add') {
+      try {
         // remove mock routes stack
         app._router.stack.splice(mockStartIndex, mockRoutesLength)
 
@@ -59,6 +60,9 @@ module.exports = app => {
         mockStartIndex = mockRoutes.mockStartIndex
 
         console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
+      } catch (error) {
+        console.log(chalk.redBright(error))
+      }
     }
   })
 }

src/layout/components/AppMain.vue

@@ -27,5 +27,7 @@ export default {
 }
 .fixed-header+.app-main {
   padding-top: 50px;
+  height: 100vh;
+  overflow: auto;
 }
 </style>

vue.config.js

@@ -7,6 +7,9 @@ function resolve(dir) {
 }
 
 const name = defaultSettings.title || 'vue Admin Template' // page title
+// If your port is set to 80,
+// use administrator privileges to execute the command line.
+// For example, Mac: sudo npm run
 const port = 9528 // dev port
 
 // All configuration item explanations can be find in https://cli.vuejs.org/config/