Merge branch 'master' of http://git.cc-lotus.info/wxy/website-admin into master

src/views/lunbo/index.vue

@@ -4,24 +4,22 @@
       <el-col :span="24">
         <!-- 哪个组件活跃就显示哪个的meta的title -->
         <breadcrumb :breadcrumbTitle="this.$route.meta.title"></breadcrumb>
-        <el-col :span="24" class="contain">
+        <el-col :span="24" class="container">
           <!-- text-align: right 按钮移到右侧 -->
           <el-col :span="24" style="margin:15px 0;text-align:right;">
             <el-button type="primary" size="mini" @click="dialogFormVisible = true">添加</el-button>
           </el-col>
           <el-col :span="24">
-            <template>
-              <el-table :data="list" style="width: 100%">
-                <el-table-column prop="name" label="名称" width="180"> </el-table-column>
-                <el-table-column prop="create_time" label="创建时间" width="180"> </el-table-column>
-                <el-table-column label="操作">
-                  <template slot-scope="scope">
-                    <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </template>
+            <el-table :data="list" style="width: 100%">
+              <el-table-column prop="name" label="名称" width="180"> </el-table-column>
+              <el-table-column prop="create_time" label="创建时间" width="180"> </el-table-column>
+              <el-table-column label="操作">
+                <template slot-scope="scope">
+                  <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
+                  <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
           </el-col>
         </el-col>
       </el-col>

src/views/test/dialogs.vue

@@ -8,7 +8,7 @@
             <el-button type="primary" size="mini" @click="dialogFormVisible = true">添加</el-button>
           </el-col>
           <el-col :span="24">
-            <el-table :data="list" style="width: 100%">
+            <el-table :data="list" style="width: 100%" border>
               <el-table-column prop="name" label="名称" align="center"> </el-table-column>
               <el-table-column prop="create_time" label="创建时间" align="center"> </el-table-column>
               <el-table-column label="操作" align="center">
@@ -18,6 +18,17 @@
                 </template>
               </el-table-column>
             </el-table>
+            <el-col :span="24" class="page">
+              <el-pagination
+                background
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                layout="total, prev, pager, next, jumper"
+                :total="total"
+                :page-size="pageSize"
+              >
+              </el-pagination>
+            </el-col>
           </el-col>
         </el-col>
       </el-col>
@@ -60,8 +71,12 @@ export default {
   data: function() {
     return {
       list: [],
+      total: 0,
       dialogFormVisible: false,
       form: {},
+      currentPage: 0,
+      pageSize: 10,
+      skip: 0,
     };
   },
   created() {
@@ -71,9 +86,11 @@ export default {
     ...lunbo(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询列表
     async search({ skip = 0, limit = 10, ...info } = {}) {
+      skip = this.skip;
       let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
+        this.$set(this, `total`, res.total);
       }
     },
     // 提交
@@ -124,6 +141,10 @@ export default {
     uploadSuccess({ type, data }) {
       this.$set(this.form, `${type}`, data.uri);
     },
+    handleCurrentChange(currentPage) {
+      this.$set(this, `skip`, (currentPage - 1) * this.pageSize);
+      this.search();
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -131,4 +152,9 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.page {
+  text-align: center;
+  margin: 15px 0;
+}
+</style>

src/views/test/route.vue

@@ -8,7 +8,7 @@
             <el-button type="primary" size="mini" @click="add()">添加</el-button>
           </el-col>
           <el-col :span="24">
-            <el-table :data="list" style="width: 100%">
+            <el-table :data="list" style="width: 100%" border>
               <el-table-column prop="name" label="名称" align="center"> </el-table-column>
               <el-table-column prop="create_time" label="创建时间" align="center"> </el-table-column>
               <el-table-column label="操作" align="center">
@@ -18,6 +18,17 @@
                 </template>
               </el-table-column>
             </el-table>
+            <el-col :span="24" class="page">
+              <el-pagination
+                background
+                @current-change="handleCurrentChange"
+                :current-page="currentPage"
+                layout="total, prev, pager, next, jumper"
+                :total="total"
+                :page-size="pageSize"
+              >
+              </el-pagination>
+            </el-col>
           </el-col>
         </el-col>
       </el-col>
@@ -41,6 +52,10 @@ export default {
   data: function() {
     return {
       list: [],
+      total: 0,
+      currentPage: 0,
+      pageSize: 10,
+      skip: 0,
     };
   },
   created() {
@@ -50,9 +65,11 @@ export default {
     ...lunbo(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询列表
     async search({ skip = 0, limit = 10, ...info } = {}) {
+      skip = this.skip;
       let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
+        this.$set(this, `total`, res.total);
       }
     },
     // 删除
@@ -74,6 +91,10 @@ export default {
     handleEdit(data) {
       this.$router.push({ path: '/routeDetail', query: { id: data.id } });
     },
+    handleCurrentChange(currentPage) {
+      this.$set(this, `skip`, (currentPage - 1) * this.pageSize);
+      this.search();
+    },
   },
   computed: {
     ...mapState(['user']),
@@ -81,4 +102,9 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.page {
+  text-align: center;
+  margin: 15px 0;
+}
+</style>