From 07809bbcbff1b0c029f454e85d19a7ba8a8a4118 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 3 Jun 2020 17:38:03 +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 | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index 396e025..18e7c34 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -69,18 +69,17 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    console.log(':::::::::')
-    this.setData({
-      loadMoreVisible: false,
-      loadMoreType: 'none',
-      indexPage: 1,
-    })
     if(this.data.selectedTab == 'tab1'){//刷新志友
       if(this.data.ifClickImage){//如果为true就不可以刷新,判断完成以后重新置为false
         this.setData({
           ifClickImage: false
         })
       }else{
+        this.setData({
+          loadMoreVisible: false,
+          loadMoreType: 'none',
+          indexPage: 1,
+        })
         this.setData({
           dingdan: true,
           jingcai: true,
@@ -95,6 +94,11 @@ Page({
       }
     }
     if (this.data.actId) {
+      this.setData({
+        loadMoreVisible: false,
+        loadMoreType: 'none',
+        indexPage: 1,
+      })
       this.updateActivityList()
     }
   },