diff --git a/config.js b/config.js index 0705968..1cef874 100644 --- a/config.js +++ b/config.js @@ -2,7 +2,7 @@ module.exports = { // baseUrl: 'https://www.nuoyunr.com/admin-api', // baseUrl: 'http://127.0.0.1:48080/admin-api', - baseUrl: 'http://wcw8ax.natappfree.cc/admin-api', + baseUrl: 'http://9ahrr4.natappfree.cc/admin-api', imagesUrl: 'http://www.nuoyunr.com/lananRsc', baseImageUrl: 'https://www.nuoyunr.com/minio', wsUrl: 'ws://127.0.0.1:48080', diff --git a/pages/index/TodayTable.vue b/pages/index/TodayTable.vue index e116ebc..93d9759 100644 --- a/pages/index/TodayTable.vue +++ b/pages/index/TodayTable.vue @@ -26,7 +26,7 @@ 是否支付 支付方式 - + {{ index + 1 }} {{ item.carNum }} {{ item.type }} @@ -58,6 +58,7 @@ export default { }, loading: false, // 加载更多时的标志位 payTypes: [], + pages: 0, }; }, onReady() { @@ -69,12 +70,17 @@ export default { this.resetOrientation(); }, onReachBottom() { // 当用户滚动到底部时触发 - if (!this.loading) { + if (!this.loading && this.queryParams.pageNum < this.pages) { this.queryParams.pageNum += 1; this.getTableData(true); } }, methods: { + handleShow(id){ + uni.navigateTo({ + url: "/pages/index/orderdetails?inspectionInfoId=" + id + }) + }, maskClick(){ this.handleReset() }, @@ -117,6 +123,7 @@ export default { method: 'get', params: this.queryParams }).then(res => { + this.pages = res.data.pages const newData = res.data.records || []; if (isLoadMore) { this.tableData = this.tableData.concat(newData); // 合并新旧数据