diff --git a/app.js b/app.js index b262d8d..c19a5ae 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 2, // 0: 开发版本;1:测试版本;2:生产版本 + evn: 0, // 0: 开发版本;1:测试版本;2:生产版本 tmplIds: [''], version: 152, xAppId: '503258978847953926', diff --git a/pages/client/factory-list/index.js b/pages/client/factory-list/index.js index b387c96..2828ed9 100644 --- a/pages/client/factory-list/index.js +++ b/pages/client/factory-list/index.js @@ -28,12 +28,10 @@ Page({ this.fetchOrderList() }, onRefreshList: function () { - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - finished: false - }) + if (this.data.requesting) { + return + } + this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) this.fetchOrderList() }, //1:待定价,2:待过皮重,3:待过磅审核,4:待付款,5:已完成 diff --git a/pages/client/order-list/index.js b/pages/client/order-list/index.js index 78b6bfc..4433236 100644 --- a/pages/client/order-list/index.js +++ b/pages/client/order-list/index.js @@ -44,17 +44,15 @@ Page({ if (this.data.tabIndex == Number(detail.index)) { return } - this.setData({ tabIndex: detail.index}) + this.setData({ tabIndex: detail.index, requesting: false}) this.data.form.status = this.data.tabList[detail.index].status this.onRefreshList() }, onRefreshList: function () { - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - finished: false - }) + if (this.data.requesting) { + return + } + this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) this.data.lastTime = null this.fetchOrderList() }, diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js index 73d951f..54bb002 100644 --- a/pages/home/customer-list/index.js +++ b/pages/home/customer-list/index.js @@ -32,12 +32,10 @@ Page({ this.fetchCustomerList() }, onRefreshList: function () { - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - finished: false - }) + if (this.data.requesting) { + return + } + this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) this.fetchCustomerList() }, //1:待定价,2:待过皮重,3:待过磅审核,4:待付款,5:已完成 diff --git a/pages/process/check-list/index.js b/pages/process/check-list/index.js index 39da943..54d1fcd 100644 --- a/pages/process/check-list/index.js +++ b/pages/process/check-list/index.js @@ -50,6 +50,9 @@ Page({ } }, onRefreshList: function () { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) this.data.lastTime = null this.fetchOrderList() diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js index 761f72f..67d0ab8 100644 --- a/pages/process/order-list/index.js +++ b/pages/process/order-list/index.js @@ -63,17 +63,15 @@ Page({ if (this.data.tabIndex == Number(detail.index)) { return } - this.setData({ tabIndex: detail.index}) + this.setData({ tabIndex: detail.index, requesting: false }) this.data.form.status = this.data.tabList[detail.index].status this.onRefreshList() }, onRefreshList: function () { - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - finished: false - }) + if (this.data.requesting) { + return + } + this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) this.data.lastTime = null this.fetchOrderList() }, diff --git a/pages/process/payment-list/index.js b/pages/process/payment-list/index.js index b666016..d2907b0 100644 --- a/pages/process/payment-list/index.js +++ b/pages/process/payment-list/index.js @@ -30,6 +30,9 @@ Page({ this.onRefreshList(this.data.form.isSameCustomer ? 0 : 1) }, onRefreshList: function (isame) { + if (this.data.requesting) { + return + } this.setData({ orderList: [], ['form.pageNum']: 1,