diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 1959cfb..61b8576 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -271,7 +271,7 @@ Page({ getNewsList: function () { let that = this let para = { - pageIndex: 1, + pageIndex: this.data.pageNo, pageSize: 5, timestamp: getTimestamp() } @@ -279,7 +279,7 @@ Page({ that.setData({ first: false, newsList: that.data.newsList.concat(res.data), - loadMoreType: res.data.length === that.data.pageSize ? "loading" : "none", + loadMoreType: res.data.length === 5 ? "loading" : "none", }) }).catch(() => { that.setData({ diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index eb54d2a..ae42543 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.7.30" + const versionNum = "1.7.31" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data ? res.data.scanFlag : '1'