Merge branch 'master' of http://git.cc-lotus.info/smart-center/web-common

src/layout/list/mainRight.vue

@@ -30,7 +30,7 @@
           <el-col :span="24" class="page">
             <div class="block">
               <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                             :current-page="currentPage" layout="total,prev, pager, next, jumper" :total="1">
+                             :current-page="currentPage" layout="total,prev, pager, next, jumper" :total="total">
               </el-pagination>
             </div>
           </el-col>
@@ -45,6 +45,7 @@ export default {
   name: 'mainRight',
   props: {
     mainRightList: null,
+    total:null,
   },
   components: {},
   data: () => ({

src/views/list/list.vue

@@ -17,7 +17,7 @@
             <mainLeft></mainLeft>
           </el-col>
           <el-col :span="17" class="mainRight">
-            <mainRight :mainRightList="mainRightList"></mainRight>
+            <mainRight :mainRightList="mainRightList" :total="total"></mainRight>
           </el-col>
         </div>
       </el-col>
@@ -39,6 +39,7 @@ export default {
   props: {
     topInfo:null,
     mainRightList:null,
+    total: null,
   },
   components: {
     top,