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/app.vue
+++ b/examples/app.vue
@ -45,6 +45,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
                <li><router-link to="/cascader">Cascader</router-link></li>
                <li><router-link to="/select">Select</router-link></li>
                <li><router-link to="/backtop">Backtop</router-link></li>
+                <li><router-link to="/page">Page</router-link></li>
            </ul>
        </nav>
        <router-view></router-view>