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) }