Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/App.vue

@@ -11,12 +11,5 @@ export default {
 </script>
 
 <style>
-#app {
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
-}
+
 </style>

src/components/homeIndex.vue

+<template>
+  <div class="homeIndex">
+      <div class="head">
+
+      </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'homeIndex'
+}
+</script>
+
+<style>
+.homeIndex .head{
+  
+}
+</style>

src/router/index.js

@@ -10,6 +10,11 @@ export default new Router({
       path: '/',
       name: 'HelloWorld',
       component: HelloWorld
+    },
+    {
+      path: '/homeIndex',
+      name: 'homeIndex',
+      component: resolve => require(['@/components/homeIndex'], resolve),
     }
   ]
 })