From fd3112274c7359949820b1e6d2d33192beab212e Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Thu, 28 May 2020 10:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/heartNew/heartNew.js                    | 34 ++++++++++---------
 .../pages/leaderboardNew/leaderboardNew.js    |  4 ++-
 .../pages/leaderboardNew/leaderboardNew.wxml  |  2 +-
 .../pages/leaderboardNew/leaderboardNew.wxss  |  3 ++
 subpages/heart/pages/volunteer/volunteer.js   | 15 ++++++--
 subpages/heart/pages/volunteer/volunteer.wxml |  6 ++--
 6 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index 8e66213..46d9457 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -67,22 +67,24 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    // if (this.data.selectedTab === 'tab3') {
-    //   this.setData({
-    //     selectedTab: 'tab0',
-    //     dingdan: false,//判断订单列表隐藏
-    //     jingcai: true,//判断精彩列表隐藏
-    //     qkdat: true
-    //   })
-    //   let parms = {
-    //     pageIndex: 1,
-    //     pageSize: this.data.pageSize,
-    //     qkdat: this.data.qkdat,
-    //     timestamp: getTimestamp(),
-    //     actType: 0
-    //   }
-    //   this.selectComponent("#state-0").getActivityList(parms)
-    // }
+    this.setData({
+      loadMoreVisible: false,
+      loadMoreType: 'none',
+      indexPage: 1,
+    })
+    if(this.data.selectedTab == 'tab1'){//刷新志友
+      this.setData({
+        dingdan: true,
+        jingcai: true,
+        volunteerlist:[],//列表置空
+        listLength:0
+      })
+      let parms = {
+        pageIndex: this.data.indexPage,
+        pageSize: this.data.pageSize,
+      }
+      this.volunteerlist(parms)
+    }
     if (this.data.actId) {
       this.updateActivityList()
     }
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
index 552992b..6e98c0b 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
@@ -102,7 +102,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.pulldownRefresh()
+    if(this.data.selectTab == 'tab2'){
+      this.pulldownRefresh()
+    }
     if (!app.globalData.previewImage) {
       console.log('过滤previewImage引起的onShow')
     }
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index c7f7256..d8f3004 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -8,7 +8,7 @@
   </view>
   <!-- 积分排行 -->
   <block wx:if="{{selectTab === 'tab1'}}">
-    <view class="bottom">
+    <view class="bottom padding">
       <block wx:if="{{loveRankingList.length === 0 && preloadVisible}}">
         <preload-loveranking-item wx:for="{{[1,2,3,4]}}" wx:for-index="index" wx:key="index">
         </preload-loveranking-item>
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index 56b7be3..d8896ab 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -103,6 +103,9 @@ button::after {
     margin-top: 17rpx;
     /* padding: 0 30rpx; */
 }
+.padding{
+    padding: 0 30rpx;
+}
 
 
 .bottom .love-ranking-list {
diff --git a/subpages/heart/pages/volunteer/volunteer.js b/subpages/heart/pages/volunteer/volunteer.js
index c5da343..9085485 100644
--- a/subpages/heart/pages/volunteer/volunteer.js
+++ b/subpages/heart/pages/volunteer/volunteer.js
@@ -37,6 +37,7 @@ Page({
     getMobileType: 'wx',
     smsCodeText: '获取验证码',
     uploadImageList: [],
+    disabled:false
   },
   onLoad: function(options) {
     this.getPrepareComplete().then(res => {
@@ -377,6 +378,7 @@ Page({
     
     _this.setData({
       uploadImageList: [],
+      disabled:true
     })
     $wuxActionSheet().showSheet({
       buttons: [
@@ -417,7 +419,8 @@ Page({
                   })
 
                   _this.setData({
-                    volunteerFaceImg:uploadImageList[0].ossUrl
+                    volunteerFaceImg:uploadImageList[0].ossUrl,
+                    disabled:false
                   })
                   console.log('>>>>>>>>>>>'+_this.data.volunteerFaceImg)
                 }
@@ -465,7 +468,8 @@ Page({
                       // })
 
                       _this.setData({
-                        volunteerFaceImg:uploadImageList[0].ossUrl
+                        volunteerFaceImg:uploadImageList[0].ossUrl,
+                        disabled:false
                       })
                     }
                   })
@@ -477,7 +481,12 @@ Page({
         return true
       },
       cancelText: '取消',
-      cancel() {},
+      cancel() {
+        _this.setData({
+          disabled:false
+        })
+        console.log(':::::::::::::::')
+      },
       destructiveButtonClicked() {},
     })
   },
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index abb61cf..f32e261 100644
--- a/subpages/heart/pages/volunteer/volunteer.wxml
+++ b/subpages/heart/pages/volunteer/volunteer.wxml
@@ -74,7 +74,7 @@
       <view class="head-portrait">
         <view class="head-portrait-name">昵称</view>
         <view class="nickname">
-          <input maxlength="10" class="nicknameinput" bindblur="nickname" bindinput="nickname" value="{{volunteerNickname}}" placeholder-class="placeholder-style" placeholder="请输入您的昵称" />
+          <input class="nicknameinput" bindblur="nickname" bindinput="nickname" value="{{volunteerNickname}}" placeholder-class="placeholder-style" placeholder="请输入您的昵称" />
         </view>
       </view>
 
@@ -83,7 +83,7 @@
       </view>
       <view class="info-box-last-v2">
         <view class="introduce">
-          <textarea placeholder-class="placeholder-style" value="{{volunteerSignature}}" placeholder="请输入您的签名" bindblur="volunteerSignature" bindinput="volunteerSignature" maxlength="20"></textarea>
+          <textarea disabled= '{{disabled}}' placeholder-class="placeholder-style" value="{{volunteerSignature}}" placeholder="请输入您的签名" bindblur="volunteerSignature" bindinput="volunteerSignature" maxlength="20"></textarea>
         </view>
       </view>
 
@@ -138,7 +138,7 @@
 
       <view class="info-box-last">
         <view class="introduce">
-          <textarea placeholder-class="placeholder-style" value="{{introduce}}" placeholder="请输入自我介绍、是否参加过公益活动、参加了哪些公益活动" bindblur="adInputIntroduce" bindinput="adInputIntroduce" maxlength="500"></textarea>
+          <textarea disabled= '{{disabled}}' placeholder-class="placeholder-style" value="{{introduce}}" placeholder="请输入自我介绍、是否参加过公益活动、参加了哪些公益活动" bindblur="adInputIntroduce" bindinput="adInputIntroduce" maxlength="500"></textarea>
         </view>
       </view>
     </view>