Merge branch '2.0' into 2.0-backtop

This commit is contained in:
Aresn 2017-03-07 10:36:10 +08:00 committed by GitHub
commit 7d535fc915
8 changed files with 71 additions and 40 deletions

View file

@ -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>

View file

@ -144,6 +144,10 @@ const router = new VueRouter({
{
path: '/backtop',
component: require('./routers/back-top.vue')
},
{
path: '/page',
component: require('./routers/page.vue')
}
]
});

View file

@ -1,9 +1,11 @@
<template>
<Page :total="1000" show-sizer show-elevator show-total class="classr" :style="{float: 'right'}" @on-page-size-change="pc"></Page>
<br><br>
<Page :total="1000" show-sizer show-elevator show-total size="small" class="classr2"></Page>
<br><br>
<Page :current="2" :total="50" simple></Page>
<div>
<Page :total="1000" show-sizer show-elevator show-total class="classr" :style="{float: 'right'}" @on-page-size-change="pc"></Page>
<br><br>
<Page :total="1000" show-sizer show-elevator show-total size="small" class="classr2"></Page>
<br><br>
<Page :current="2" :total="50" simple></Page>
</div>
</template>
<script>
import { Page } from 'iview';