Merge remote-tracking branch 'origin/master'

src/pages/information/contentManage/contentList.vue

@@ -96,6 +96,14 @@ export default {
             this.$get(`${this.api.queryArticleByCondition}/${this.pageNo}/${this.pageSize}`, data).then(res => {
                 this.listData = res.articleList;
                 this.totals = res.total;
+                // 测试中。。。以下可删
+                for(let i=0; i<9; i++) {
+                    this.listData.push(res.articleList[0])
+                }
+                
+                console.log(res)
+
+
                 if (!this.listData.length && this.totals) {
                     this.pageNo--;
                     this.getData();
@@ -208,4 +216,9 @@ export default {
 .off + span {
     display: none;
 }
+
+.page-content {
+    height: 67vh;
+    overflow: auto!important;
+}
 </style>