Merge branch '2.0' into 2.0-backtop

2017-03-07 10:36:10 +08:00 · 2017-03-07 10:36:10 +08:00 · 7d535fc915
commit 7d535fc915
parent adb2a0476b 87c515977f
8 changed files with 71 additions and 40 deletions
--- a/examples/main.js
+++ b/examples/main.js
@ -144,6 +144,10 @@ const router = new VueRouter({
        {
            path: '/backtop',
            component: require('./routers/back-top.vue')
+        },
+        {
+            path: '/page',
+            component: require('./routers/page.vue')
        }
    ]
 });