Merge branch '0609guide' into online

src/views/attendanceError/index.vue

@@ -99,19 +99,18 @@ export default {
                 this.loading = false
                 if(res.code == 200) {
                     params.page = result.pageNo
-                    this.dataList = result.rows;
+                    this.dataList = this.dataList.concat(result.rows)
+                    if(params.page >= result.totalPage) {
+                        this.finished = true
+                    }
+                    this.params.page++
+                } else {
                     this.finished = true
-                    // if(params.page >= result.data.totalPage) {
-                    //     this.finished = true
-                    // }
-                    // this.params.page++
-                // } else {
-                //     this.finished = true
-                // }
+                }
                 // 判断是否有数据
                 if(this.dataList.length <= 0) {
                     this.dataShow = false
-                }}
+                }
             })
         },
         onTypeChange(){