From b88f41dda2646dbbca116e087a5f9f875e1020c5 Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Thu, 14 Oct 2021 14:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=98=9F=E4=BC=8D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-resident-mp-yushan/pages/toRegister/toRegister.js    | 2 +-
 epdc-resident-mp-yushan/project.private.config.json       | 6 ++++++
 .../subpages/gridArmy/pages/index/index.js                | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
index a168218..e51d197 100644
--- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
+++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
       }
     })
     let that = this
-    const versionNum = '1.2.18'
+    const versionNum = '1.2.19'
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data ? res.data.scanFlag : '1'
diff --git a/epdc-resident-mp-yushan/project.private.config.json b/epdc-resident-mp-yushan/project.private.config.json
index f861de6..bfc0ccb 100644
--- a/epdc-resident-mp-yushan/project.private.config.json
+++ b/epdc-resident-mp-yushan/project.private.config.json
@@ -56,6 +56,12 @@
           "pathName": "pages/toRegister/toRegister",
           "query": "",
           "scene": null
+        },
+        {
+          "name": "网格队伍",
+          "pathName": "subpages/gridArmy/pages/index/index",
+          "query": "",
+          "scene": null
         }
       ]
     }
diff --git a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.js b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.js
index 4bead79..d630d4d 100644
--- a/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.js
+++ b/epdc-resident-mp-yushan/subpages/gridArmy/pages/index/index.js
@@ -69,8 +69,8 @@ Page({
         griderList: res.data,
         loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none'
       })
-      const { griderList, griderLeftList, griderRightList } = this.data
-      for (const item of griderList) {
+      const { griderLeftList, griderRightList } = this.data
+      for (const item of res.data) {
         leftHeight <= rightHeight ? griderLeftList.push(item) : griderRightList.push(item) //判断两边高度，来觉得添加到那边
         await this.getBoxHeight(griderLeftList, griderRightList)
       }
@@ -97,8 +97,8 @@ Page({
         griderList: this.data.griderList.concat(res.data),
         loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none'
       })
-      const { griderList, griderLeftList, griderRightList } = this.data
-      for (const item of griderList) {
+      const { griderLeftList, griderRightList } = this.data
+      for (const item of res.data) {
         leftHeight <= rightHeight ? griderLeftList.push(item) : griderRightList.push(item) //判断两边高度，来觉得添加到那边
         await this.getBoxHeight(griderLeftList, griderRightList)
       }