Merge branch 'master' of 115.28.80.125:softwarefactory/vueelementtemplate

config/index.js

@@ -22,7 +22,7 @@ module.exports = {
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
-    port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 9529, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,

src/router/index.js

@@ -127,6 +127,15 @@ export const asyncRouterMap = [
               title: '选项卡',
               icon: 'table'
             }
+          },
+          {
+            path: 'calendar',
+            component: _import('haomo/components/calendar/index'),
+            name: '',
+            meta: {
+              title: 'calendar',
+              icon: 'table'
+            }
           }
         ]
       },