Merge branch 'master' of http://git.cc-lotus.info/service-platform/admin-cms

src/layout/technical/messageInfo.vue

@@ -31,6 +31,7 @@
                 :current-page="currentPage"
                 layout="total, prev, pager, next, jumper"
                 :total="total"
+                :page-size="pageSize"
               >
               </el-pagination>
             </el-col>
@@ -51,6 +52,7 @@ export default {
   components: {},
   data: () => ({
     currentPage: 1,
+    pageSize: 4,
   }),
   created() {},
   computed: {},
@@ -58,8 +60,9 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+
+    handleCurrentChange(currentPage) {
+      this.$emit('page', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
     addData() {
       this.$router.push({ path: '/technical/messageInfoDetail' });

src/views/technical/index.vue

@@ -9,7 +9,7 @@
           <column :columnInfo="columnInfo" @delete="deleteData" @list="handleList"></column>
         </el-col>
         <el-col :span="17" class="message">
-          <messageInfo :message="message" :total="total" @delete="deleteMess"></messageInfo>
+          <messageInfo :message="message" :total="total" @delete="deleteMess" @page="pages"></messageInfo>
         </el-col>
       </el-col>
     </el-row>
@@ -37,6 +37,7 @@ export default {
     message: [],
     total: 0,
     leftId: null,
+    skip: '',
   }),
   created() {
     this.search();
@@ -60,7 +61,8 @@ export default {
       this.$set(this, `leftId`, data.id);
       this.searchRight();
     },
-    async searchRight({ skip = 0, limit = 10, column_id } = {}) {
+    async searchRight({ skip = 0, limit = 4, column_id } = {}) {
+      skip = this.skip;
       const res = await this.queryList({ skip, limit, column_id: this.leftId });
       for (const val of res.data) {
         const result = await this.fetch(val.column_id);
@@ -74,6 +76,11 @@ export default {
       this.$checkRes(res, '删除成功', '删除失败');
       this.search();
     },
+    async pages({ skip, limit, currentPage }) {
+      console.log('ccc');
+      this.$set(this, `skip`, skip);
+      this.searchRight();
+    },
   },
 };
 </script>