From 2f8f19e8218504f1b2a56cfb2a7ef9ea9573ca45 Mon Sep 17 00:00:00 2001
From: xuxu <xuxubarca@163.com>
Date: Thu, 6 Aug 2020 17:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=20bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/topics/index.js           | 40 ++++++++++++++++-----------------
 pages/topics/index.json         |  2 +-
 pages/user/myWhistle/index.js   |  4 ++++
 pages/user/myWhistle/index.wxss |  2 +-
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/pages/topics/index.js b/pages/topics/index.js
index 11ac32f..460029f 100644
--- a/pages/topics/index.js
+++ b/pages/topics/index.js
@@ -131,7 +131,7 @@ Page({
           topicId: item.id,
           userIcon: item.groupAvator || '',
           title: item.title,
-          userIcon: item.groupAvator,
+          // userIcon: item.groupAvator,
           userName: item.author,
           commentNum: item.commentNum,
           topicImg: item.image,
@@ -250,26 +250,26 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-    let segmentIndex = this.data.segmentIndex
-    if (segmentIndex === 2){
-      wx.stopPullDownRefresh()
-    }
-    if (segmentIndex === 0 || segmentIndex === 1) {
-      wx.pageScrollTo({
-        scrollTop: 0,
-      })
+    // let segmentIndex = this.data.segmentIndex
+    // if (segmentIndex === 2){
+    //   wx.stopPullDownRefresh()
+    // }
+    // if (segmentIndex === 0 || segmentIndex === 1) {
+    //   wx.pageScrollTo({
+    //     scrollTop: 0,
+    //   })
 
-      this.setData({
-        currPage: 1,
-      })
-      switch (this.data.segmentIndex) {
-        case 0:
-          return this.fetchTopicList()
-        case 1:
-          // return this.fetchGoodIdeaList()
-          return this.fetchCenterList()
-      }
-    }
+    //   this.setData({
+    //     currPage: 1,
+    //   })
+    //   switch (this.data.segmentIndex) {
+    //     case 0:
+    //       return this.fetchTopicList()
+    //     case 1:
+    //       // return this.fetchGoodIdeaList()
+    //       return this.fetchCenterList()
+    //   }
+    // }
   },
 
   /**
diff --git a/pages/topics/index.json b/pages/topics/index.json
index b8be08a..77c6749 100644
--- a/pages/topics/index.json
+++ b/pages/topics/index.json
@@ -1,5 +1,5 @@
 {
-  "enablePullDownRefresh": true,
+  "enablePullDownRefresh": false,
   "backgroundTextStyle": "dark",
   "usingComponents": {
     "e-segment":"/components/segment/index",
diff --git a/pages/user/myWhistle/index.js b/pages/user/myWhistle/index.js
index 6d4910e..acfef14 100644
--- a/pages/user/myWhistle/index.js
+++ b/pages/user/myWhistle/index.js
@@ -82,6 +82,10 @@ Page({
     }
     var page = th.data.page;
     var nextPage = page + 1;
+
+    th.setData({
+      page:nextPage
+    })
     var data = {
       page:nextPage,
       pageSize:th.data.pageSize
diff --git a/pages/user/myWhistle/index.wxss b/pages/user/myWhistle/index.wxss
index 79b5f02..14c98e3 100644
--- a/pages/user/myWhistle/index.wxss
+++ b/pages/user/myWhistle/index.wxss
@@ -8,7 +8,7 @@ page{
   width:100%;
   height: 130px;
   background-color: white;
-  margin-top:30rpx;
+  margin-top:15rpx;
   display: flex;
   flex-direction: column;
   align-items: center;