From 7c47e4f676e9c54be96783a8847866e9035aa59b Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 9 Jun 2020 16:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../membersListNew/membersListNew.wxml        | 21 +++++--
 .../membersListNew/membersListNew.wxss        | 56 +++++++++++++++----
 .../pages/eventlist/eventlist.wxml            |  2 +-
 3 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/subpages/associationNew/components/membersListNew/membersListNew.wxml b/subpages/associationNew/components/membersListNew/membersListNew.wxml
index 430f4b2..9a8ee2b 100644
--- a/subpages/associationNew/components/membersListNew/membersListNew.wxml
+++ b/subpages/associationNew/components/membersListNew/membersListNew.wxml
@@ -4,12 +4,23 @@
   wx:for-index="index"
   wx:for-item="item"
   wx:key="index">
-    <image data-src="{{item.faceImg}}" bindtap="preViewImage" src="{{item.faceImg}}" />
+    <image class="photo" data-src="{{item.faceImg}}" bindtap="preViewImage" src="{{item.faceImg}}" />
     <view class="name">{{item.name}}</view>
-    <view class="autograph">{{item.motto}}</view>
-
-    <view class="autograph">{{item.areaResponsibility}}</view>
+    <view class="autograph-all">
     
-    <view bindtap="onPhone" data-number="{{item.mobile}}" class="autograph">{{item.mobile}}</view>
+      <view class="autograph">格言：{{item.motto}}</view>
+
+      <view class="autograph">负责区域：{{item.areaResponsibility}}</view>
+
+      <view class="autograph">电话：{{item.mobile}}</view>
+
+    </view>
+
+    <view class="click-button">
+      <button plain='true' hover-class="hover-btn" bindtap="onPhone" data-number="{{item.mobile}}">
+        <image class="button-bg" src="../../images/call.png"/>
+      </button>
+    </view>
+
   </view>
 </view>
diff --git a/subpages/associationNew/components/membersListNew/membersListNew.wxss b/subpages/associationNew/components/membersListNew/membersListNew.wxss
index 742c3cc..4921fbf 100644
--- a/subpages/associationNew/components/membersListNew/membersListNew.wxss
+++ b/subpages/associationNew/components/membersListNew/membersListNew.wxss
@@ -1,16 +1,16 @@
-
 .item {
   width: 320rpx;
-  height: 354rpx;
+  /* height: 354rpx; */
   margin-top: 20rpx;
   background: #fff;
   border-radius: 20rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding-bottom: 30rpx;
 }
 
-.item image {
+.item .photo {
   width: 110rpx;
   height: 110rpx;
   border-radius: 50%;
@@ -20,18 +20,53 @@
 .item .name {
   margin-top: 11rpx;
   font-size: 30rpx;
+  line-height: 30rpx;
   font-weight: bold;
   color: rgba(51, 51, 51, 1);
 }
 
-.item .autograph {
+.item .autograph-all {
+  margin-top: 13rpx;
+  width: 100%;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+  word-wrap: break-word
+}
+
+.item .autograph-all .autograph {
+  text-align: left;
+  margin-bottom: 7rpx;
+  font-size: 26rpx;
+  line-height: 36rpx;
+  /* font-weight:500; */
+  color: rgba(193, 193, 193, 1);
+
+}
+
+.item .click-button{
   margin-top: 8rpx;
-  font-size:26rpx;
-  font-weight:500;
-  color:rgba(193,193,193,1);
-  padding: 0 20rpx;
+  width: 100%;
+  height: 56rpx;
+  display: flex;
+  align-items: center;
 }
 
+.item .click-button button{
+  width: 156rpx;
+  height: 56rpx;    
+  padding: 0 !important;
+  border: none !important;
+  line-height: 0 !important;
+}
+
+.item .click-button button .button-bg{
+  width: 156rpx;
+  height: 56rpx;
+} 
+
+.item .click-button button::after {
+  border: 0rpx !important;
+}
 .show {
   padding: 0rpx 40rpx;
   height: 24rpx;
@@ -40,10 +75,11 @@
   font-weight: 500;
   color: #C5C5C5;
 }
+
 .volunteer-box {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   justify-content: space-between;
   flex-wrap: wrap;
   padding: 0rpx 40rpx 19rpx 40rpx;
-}
\ No newline at end of file
+}
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml
index 5dba400..3269904 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxml
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxml
@@ -17,7 +17,7 @@
 	<view class="attitude">
 		<view class="all" data-id="{{item.id}}" bindtap="clicklike" data-likeFlag="{{item.likeFlag}}"
 			data-index="{{index}}">
-			<!-- 用户是否已点赞 0否；1是 -->
+			<!-- 用户是否已点赞 0否；1是 -->5
 			<!--  -->
 			<image src="{{item.likeFlag == '0' ? '../../images/give.png' : '../../images/give_2.png'}}"></image>
 			<view class="give-data {{item.likeFlag == '1' ? 'color' : ''}}">{{item.supportNum}}</view>