|
@@ -130,7 +130,7 @@ Page({
|
|
|
this.setData({
|
|
this.setData({
|
|
|
page: 1
|
|
page: 1
|
|
|
})
|
|
})
|
|
|
- this.getList();
|
|
|
|
|
|
|
+ this.getList(this.data.startdateStr, this.data.enddateStr || this.data.startdateStr);
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -138,15 +138,15 @@ Page({
|
|
|
*/
|
|
*/
|
|
|
onReachBottom() {
|
|
onReachBottom() {
|
|
|
console.log("上拉加载更多");
|
|
console.log("上拉加载更多");
|
|
|
- if (this.data.startdateStr) {
|
|
|
|
|
- return
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if (this.data.startdateStr) {
|
|
|
|
|
+ // return
|
|
|
|
|
+ // }
|
|
|
var page = this.data.page;
|
|
var page = this.data.page;
|
|
|
page += 1;
|
|
page += 1;
|
|
|
this.setData({
|
|
this.setData({
|
|
|
page: page
|
|
page: page
|
|
|
})
|
|
})
|
|
|
- this.getList();
|
|
|
|
|
|
|
+ this.getList(this.data.startdateStr, this.data.enddateStr || this.data.startdateStr);
|
|
|
|
|
|
|
|
},
|
|
},
|
|
|
checkTime(timeStr) {
|
|
checkTime(timeStr) {
|