diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index a7a89a1..f244b41 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.14" + const versionNum = "1.6.15" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/associationNew/components/communityList/communityList.wxml b/subpages/associationNew/components/communityList/communityList.wxml index 2b3e27a..3618ed9 100644 --- a/subpages/associationNew/components/communityList/communityList.wxml +++ b/subpages/associationNew/components/communityList/communityList.wxml @@ -11,7 +11,7 @@ diff --git a/subpages/associationNew/pages/associationlist/associationlist.js b/subpages/associationNew/pages/associationlist/associationlist.js index ab58f31..314ddd6 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.js +++ b/subpages/associationNew/pages/associationlist/associationlist.js @@ -52,14 +52,14 @@ Page({ getPartyGroupList () { getPartyGroupList().then(res => { console.log("获取党群列表", res) - const groupNameList = ["进入玫瑰苑社群", "进入玫瑰湖社群", "进入锦水园社群", "进入锦祥园社群", "进入土楼社群", "进入子顺社群", "进入城西社群"] - res.data.forEach((item, index) => { - if (index <= 6) { - item.groupName = groupNameList[index] - } else { - item.groupName = "进入社群" - } - }) + // const groupNameList = ["进入玫瑰苑社群", "进入玫瑰湖社群", "进入锦水园社群", "进入锦祥园社群", "进入土楼社群", "进入子顺社群", "进入城西社群"] + // res.data.forEach((item, index) => { + // if (index <= 6) { + // item.groupName = groupNameList[index] + // } else { + // item.groupName = "进入社群" + // } + // }) this.setData({ associationList: [...this.data.associationList, ...res.data], loadMoreType: res.data.length === this.data.pageSize ? "loading": "none" diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxml b/subpages/heart/pages/groupBuyList/groupBuyList.wxml index e762275..5bb3a0b 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.wxml +++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxml @@ -1,6 +1,6 @@ - +