Merge branch '2.0' into anchor

2018-06-20 11:00:05 +08:00 · 2018-06-20 11:00:05 +08:00 · 754eedf571
commit 754eedf571
parent 1287ac7f8c 92ffd65dda
156 changed files with 61134 additions and 18815 deletions
--- a/examples/main.js
+++ b/examples/main.js
@ -206,6 +206,10 @@ const router = new VueRouter({
        {
            path: '/scroll',
            component: (resolve) => require(['./routers/scroll.vue'], resolve)
+        },
+        {
+            path: '/time',
+            component: (resolve) => require(['./routers/time.vue'], resolve)
        }
    ]
 });