From 0545c1958cf2b2dc4b679ed6699fa3e6dadfbc0e Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 25 Dec 2020 09:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=BA=E9=81=93=E6=8D=8Eta?=
 =?UTF-8?q?b=E5=90=8D=E7=A7=B0=EF=BC=9B=E4=BF=AE=E6=94=B9=E9=A1=BA?=
 =?UTF-8?q?=E9=81=93=E6=8D=8E=E5=85=A5=E5=8F=A3=E4=BD=8D=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/heartNew/heartNew.wxss                               | 7 +++----
 pages/toRegister/toRegister.js                             | 2 +-
 .../pages/associationlist/associationlist.js               | 2 +-
 subpages/heart/pages/dropByList/dropByList.wxml            | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index 971815e..55c701e 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -293,15 +293,14 @@ button:last-child {
 .tab-right {
   position: fixed;
   right: 0;
-  bottom: 80rpx;
   z-index: 997;
-  margin-top: 100rpx;
+  margin-top: 20rpx;
   display: flex;
   flex-direction: column;
 }
 .tab-right image {
-  width: 156rpx;
-  height: 78rpx;
+  width: 234rpx;
+  height: 118rpx;
 }
 
 .tab-all {
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index d5adf4d..aa797ae 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.6.9"
+    const versionNum = "1.6.11"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/subpages/associationNew/pages/associationlist/associationlist.js b/subpages/associationNew/pages/associationlist/associationlist.js
index fdb8700..ab58f31 100644
--- a/subpages/associationNew/pages/associationlist/associationlist.js
+++ b/subpages/associationNew/pages/associationlist/associationlist.js
@@ -52,7 +52,7 @@ Page({
   getPartyGroupList () {
     getPartyGroupList().then(res => {
       console.log("获取党群列表", res)
-      const groupNameList = ["进入玫瑰苑社群", "进入玫瑰湖社群", "进入锦水园社群", "进入锦祥园社群", "进入城西社群", "进入子顺社群", "进入土楼社群"]
+      const groupNameList = ["进入玫瑰苑社群", "进入玫瑰湖社群", "进入锦水园社群", "进入锦祥园社群", "进入土楼社群", "进入子顺社群", "进入城西社群"]
       res.data.forEach((item, index) => {
         if (index <= 6) {
           item.groupName = groupNameList[index]
diff --git a/subpages/heart/pages/dropByList/dropByList.wxml b/subpages/heart/pages/dropByList/dropByList.wxml
index 32f790d..34fafe4 100644
--- a/subpages/heart/pages/dropByList/dropByList.wxml
+++ b/subpages/heart/pages/dropByList/dropByList.wxml
@@ -3,10 +3,10 @@
   <view class="tab-all">
     <view class="tab-bar">
       <view class="tab tab0 {{selectedTab === 'tab0' ? 'select' : ''}}" data-tab="tab0" bindtap="tabBarChange">
-        需要捎
+        我要捎
       </view>
       <view class="tab tab1 {{selectedTab === 'tab1' ? 'select' : ''}}" data-tab="tab1" bindtap="tabBarChange">
-        可以捎
+        我能捎
       </view>
       <view class="select-bar {{selectedTab}}"></view>
     </view>