Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/sallCenter/templateMarket.vue

@@ -36,6 +36,9 @@
           </div>
         </div>
       </div>
+       <el-pagination style="text-align:right" background @current-change="handleCurrentChange"
+          :page-size="qMsg.pageSize" layout="prev, pager, next" :total="total">
+        </el-pagination>
     </div>
     <el-dialog title="手机端预览" :visible.sync="viewDialog" width="600px">
       <div class="MarketView" ref="MarketView">
@@ -58,7 +61,7 @@
         dataList: [],
         qMsg: {
           pageIndex: 1,
-          pageSize: 15,
+          pageSize: 30,
           IsUse: 1,
           IsShow: 1,
         },
@@ -126,13 +129,14 @@
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
   }
+
   .templateMarket .template_comheader {
     padding: 13px 20px;
     border-bottom: 1px solid #EBEEF5;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     background: #fff;
-    margin-bottom:10px;
+    margin-bottom: 10px;
   }
 
   .templateMarket .template_comheader>div {