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

src/router/index.js

@@ -30,6 +30,11 @@ export default new Router({
       name: 'index',
       component: resolve => require(['@/components/index'], resolve),
     },
+    {
+      path: '/basicSetUp',
+      name: 'basicSetUp',
+      component: resolve => require(['@/components/setUp/basicSetUp'], resolve),
+    },
     {
       path: '/main',
       name: 'main',