From 47ef00abd07b1dd4ace2d5b93ef3f6c995db7672 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 31 Dec 2020 15:57:26 +0800
Subject: [PATCH] =?UTF-8?q?v1.6.15=20=E5=85=9A=E7=BE=A41+1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=87=E7=AD=BE=E6=94=B9=E4=B8=BA=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js                   |  2 +-
 .../components/communityList/communityList.wxml  |  2 +-
 .../pages/associationlist/associationlist.js     | 16 ++++++++--------
 .../heart/pages/groupBuyList/groupBuyList.wxml   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

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 @@
       </view>
       <view class="btn-container">
         <button bindtap="navigateToAss"data-join="{{item.isJoin}}" data-code="{{item.id}}" class="community-add" plain='true' hover-class="hover-btn">
-          <view>{{item.groupName}}</view>
+          <view>进入{{item.relationCommunity}}社群</view>
         </button>
       </view>
     </view>
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 @@
 <!--subpages/heart/pages/groupBuyList/groupBuyList.wxml-->
 <view class="group-buy-list">
-  <view class="my-publish" bindtap="toNoticeNewList" wx:if="{{groupbuylist.length > 0}}">
+  <view class="my-publish" bindtap="toNoticeNewList">
     <image src="../../images/my-groupbuy.png" />
   </view>
   <view class="item-list">