Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

pages/mine/points/points.vue

@@ -176,6 +176,7 @@
 			/**初始化数据*/
 			initData() {
 				pointList(this.queryParams).then(res => {
+          this.isTriggered = false
 					if (res.code == 200) {
 						if (this.queryParams.pageNum == 1) {
 							this.dataList = res.data.records
@@ -184,6 +185,13 @@
 						}
 						this.total = res.data.total
 					}
+				}).catch((e) => {
+          this.isTriggered = false
+          uni.showToast({
+            icon: 'error',
+            duration: 2000,
+            title: e
+          });
         })
 			},
 			/**
@@ -296,6 +304,7 @@
 				}
 				//页码+1,调用获取数据的方法获取第二页数据
 				this.queryParams.pageNum++
+        this.initData()
 			},
 			/**
 			 * 下拉刷新数据
@@ -304,6 +313,7 @@
 				this.isTriggered = true
 				this.queryParams.pageNum = 1
 				this.total = 0
+        this.initData()
 			},
 		}
 	}