From b7d6e7d289e215b3869ef1bd2ed12595da622426 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 11 Jul 2022 09:23:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E6=96=B0?=
 =?UTF-8?q?=E9=97=BB=E5=88=97=E8=A1=A8=E7=BF=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/indexNew/indexNew.js     | 4 ++--
 pages/toRegister/toRegister.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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'