浏览代码

Merge branch 'dev1.1' of http://192.168.3.207:10080/jianyu/page_dataexport into dev1.1

cuiyalong 5 年之前
父节点
当前提交
619c7299bd
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 5 3
      src/views/main/Home.vue
  2. 4 0
      src/views/main/ReportDetail.vue

+ 5 - 3
src/views/main/Home.vue

@@ -128,7 +128,7 @@ export default class Home extends Vue {
         if (this.listState.currentPage === 1) {
           if (type === 'refresh') {
             this.isLoading = false
-            Toast('刷新成功')
+            Toast({ message: '刷新成功', duration: 1000 })
           }
           this.listState.list = rows
         } else {
@@ -143,8 +143,10 @@ export default class Home extends Vue {
   }
 
   onLoad () {
-    this.listState.currentPage++
-    this.getReportList()
+    if (this.listState.currentPage < this.listState.totalPage) {
+      this.listState.currentPage++
+      this.getReportList()
+    }
   }
 
   goDetail (item) {

+ 4 - 0
src/views/main/ReportDetail.vue

@@ -206,6 +206,10 @@ export default class Home extends Vue {
           line-height: 22px;
           color: #5F5E64;
           text-align: justify;
+          .c-title{
+            font-size: 18px;
+            line-height: 26px;
+          }
         }
       }
     }