diff --git a/pages/area-proxy/my-team.vue b/pages/area-proxy/my-team.vue index 82c5dc6..e6f5548 100644 --- a/pages/area-proxy/my-team.vue +++ b/pages/area-proxy/my-team.vue @@ -121,6 +121,7 @@ }) }, loadBasicData() { + this.pageNum = this.$globalData.initPageNum; this.pageSize = this.$globalData.initPageSize; this.curUserInfo = this.$request.getCurUserInfo(); }, @@ -131,7 +132,7 @@ this.loadTeamPage(); }, async reloadData() { - this.pageNum = 0; + this.loadBasicData(); this.members = []; this.loadData(); }, @@ -147,7 +148,8 @@ this.members = this.members.concat(res.rows); this.pageNum++; if (rowsLength === this.pageSize) { - this.$refs.loadStatusBar.showLoadMore(); + this.$refs.loadStatusBar.showLoadMore(); + return; } } this.$refs.loadStatusBar.showLoadOver(); diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue index 649b34d..ebf7ed6 100644 --- a/pages/demand-center/accept-demand-center.vue +++ b/pages/demand-center/accept-demand-center.vue @@ -197,7 +197,7 @@ tabCur: 0, scrollLeft: 0, stickyTop: this.CustomBar, - pageNum: 0, + pageNum: 1, pageSize: 0, // type: 0=升降序,1=功能按钮;order: 0=升序,1=降序; taskConditions: [{ @@ -324,9 +324,7 @@ let res = await this.$request.qryMasterOrderPage(params); if (res && res.rows) { let rowsLength = res.rows.length; - if (rowsLength === 0) { - this.tasks = []; - } else if (rowsLength > 0) { + if (rowsLength > 0) { this.tasks = this.tasks.concat(res.rows); // this.pageParams[this.tabCur].pageNum++; this.pageNum++; @@ -343,7 +341,7 @@ } }, reloadMasterOrderPage(params = {}) { - this.pageNum = 0; + this.pageNum = 1; this.tasks = []; this.$refs.loadStatusBar.showLoadMore(); this.loadMasterOrderPage(params); diff --git a/pages/index/goods-manage.vue b/pages/index/goods-manage.vue index da205fd..61d7e48 100644 --- a/pages/index/goods-manage.vue +++ b/pages/index/goods-manage.vue @@ -161,11 +161,13 @@ }, methods: { loadData() { + this.pageNum = this.$globalData.initPageNum; this.pageSize = this.$globalData.initPageSize; this.loadProductPage(); }, resetData() { - this.pageNum = 0; + this.pageNum = this.$globalData.initPageNum; + this.pageSize = this.$globalData.initPageSize; this.goodsList = []; }, reloadData() { diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index 78846b6..dc3ec54 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -308,7 +308,7 @@ myOrders: {}, orderList: [], // pageParams: [], - pageNum: 0, + pageNum: 1, pageSize: 0, curOrder: {}, myTeamMembers: [], @@ -369,7 +369,7 @@ // pageNum: 0 // }); // } - this.pageNum = 0; + this.pageNum = 1; this.orderList = []; this.$refs.loadStatusBar.showLoadMore(); this.loadMasterOrderPage(); @@ -398,9 +398,7 @@ } if (res && res.rows) { let rowsLength = res.rows.length; - if (rowsLength === 0) { - this.orderList = []; - } else if (rowsLength > 0) { + if (rowsLength > 0) { this.orderList = this.orderList.concat(res.rows); // this.pageParams[this.tabCur].pageNum++; this.pageNum++;