diff --git a/pages.json b/pages.json index ef0d94a..396af21 100644 --- a/pages.json +++ b/pages.json @@ -14,6 +14,14 @@ "pages": [ // pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { + "path": "pages/rechargeDetail/rechargeDetail", + "style": { + "navigationBarTitleText": "充值明细", + "enablePullDownRefresh": true + } + + }, + { "path": "pages/businessCard/cardDetail", "style": { "navigationBarTitleText": "商户卡券明细", @@ -132,14 +140,7 @@ } } }, - { - "path": "pages/rechargeDetail/rechargeDetail", - "style": { - "navigationBarTitleText": "充值明细", - "enablePullDownRefresh": true - } - }, { "path": "pages/rechargeDetail/outDetail", "style": { diff --git a/pages/businessCard/cardDetail.vue b/pages/businessCard/cardDetail.vue index 4146337..1377faa 100644 --- a/pages/businessCard/cardDetail.vue +++ b/pages/businessCard/cardDetail.vue @@ -278,7 +278,13 @@ export default { // 上拉加载触发 onReachBottom() { console.log('上拉加载触发') - this.fetchData(); // 每次滑动请求接口,实现上拉加载更多数据 + if (this.totalPages == this.dataList.length) { + this.status = 'no-more' + console.log('111') + return + } else { + this.pageNum++; + } }, @@ -294,13 +300,7 @@ export default { fetchData: function () { console.log(this.totalPages) console.log(this.dataList.length) - if (this.totalPages == this.dataList.length) { - this.status = 'no-more' - console.log('111') - return - } else { - this.pageNum++; - } + let that = this that.status = 'loading' let paramsData = { diff --git a/pages/rechargeDetail/rechargeDetail.vue b/pages/rechargeDetail/rechargeDetail.vue index aa29eb4..699c2b6 100644 --- a/pages/rechargeDetail/rechargeDetail.vue +++ b/pages/rechargeDetail/rechargeDetail.vue @@ -135,7 +135,13 @@ // 上拉加载触发 onReachBottom() { this.fetchData(); - + if (this.totalPages == this.orderList.length) { + this.status = 'no-more' + console.log('111') + return + } else { + this.page++; + } }, computed: { @@ -239,13 +245,7 @@ fetchData() { console.log(this.totalPages) console.log(this.orderList.length) - if (this.totalPages == this.orderList.length) { - this.status = 'no-more' - console.log('111') - return - } else { - this.page++; - } + let that = this that.status = 'loading'