2018.11.17临时保存

njuwuyuxin · Nov 17, 2018 · 642064b · 642064b
1 parent 01df3ee
commit 642064b
Show file tree

Hide file tree

Showing 19 changed files with 1,433 additions and 69 deletions.
diff --git a/README.md b/README.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,8 @@
     "build": "node build/build.js"
   },
   "dependencies": {
-    "vue": "^2.5.2"
+    "vue": "^2.5.2",
+    "vue-concise-slider": "^3.3.2"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
@@ -42,6 +43,7 @@
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
     "vue-loader": "^13.3.0",
+    "vue-router": "^3.0.1",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.5.2",
     "webpack": "^3.6.0",

diff --git a/src/App.vue b/src/App.vue
@@ -1,20 +1,20 @@
 <template>
   <div id="app">
-    <top_nav></top_nav>
-    <slide_img></slide_img>
-
+    <Nav></Nav>
+    <router-view></router-view>
+    <BottomNav></BottomNav>
   </div>
 </template>
 
 <script>
-// import top-nav from './components/HelloWorld'
-import top_nav from'./components/Nav'
-import slide_img from'./components/SlideImg'
+import Index from'./components/index'
+import Nav from'./components/utils/Nav'
+import BottomNav from'./components/utils/BottomNav'
 export default {
   name: 'App',
   components: {
-    top_nav,
-    slide_img
+    Nav,
+    BottomNav
   }
 }
 </script>
@@ -24,6 +24,11 @@ export default {
   margin: 0;
   padding: 0;
 }
+a{
+  text-decoration: none;
+  color:inherit;
+}
+html, body { font-family: Segoe, "Segoe UI", "DejaVu Sans", "Trebuchet MS", Verdana, sans-serif;}
 #app {
 }
 </style>