Merge remote-tracking branch 'origin/master'

components/common/page/pageComponent.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="float: right; margin: 30px 0;" class="page-wrap">
+  <div class="page-wrap">
     <el-pagination
       :current-page.sync="current"
       :page-size="pageSize"
@@ -126,6 +126,10 @@
     text-decoration: none;
     height: 31px;
   }
+  .page-wrap{
+    float: right;
+    margin: 30px 0;
+  }
   .page-wrap ul, .page-wrap div {
     display: inline-block;
     margin: 0;