Merge branch 'master' of http://121.42.41.42:7070/r/shibeirencai_wechat

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
+    // let segmentIndex = this.data.segmentIndex
-    if (segmentIndex === 2){
+    // if (segmentIndex === 2){
-      wx.stopPullDownRefresh()
+    //   wx.stopPullDownRefresh()
-    }
+    // }
-    if (segmentIndex === 0 || segmentIndex === 1) {
+    // if (segmentIndex === 0 || segmentIndex === 1) {
-      wx.pageScrollTo({
+    //   wx.pageScrollTo({
-        scrollTop: 0,
+    //     scrollTop: 0,
-      })
+    //   })
 
-      this.setData({
+    //   this.setData({
-        currPage: 1,
+    //     currPage: 1,
-      })
+    //   })
-      switch (this.data.segmentIndex) {
+    //   switch (this.data.segmentIndex) {
-        case 0:
+    //     case 0:
-          return this.fetchTopicList()
+    //       return this.fetchTopicList()
-        case 1:
+    //     case 1:
-          // return this.fetchGoodIdeaList()
+    //       // return this.fetchGoodIdeaList()
-          return this.fetchCenterList()
+    //       return this.fetchCenterList()
-      }
+    //   }
-    }
+    // }
   },
 
   /**

pages/topics/index.json

@@ -1,5 +1,5 @@
 {
-  "enablePullDownRefresh": true,
+  "enablePullDownRefresh": false,
   "backgroundTextStyle": "dark",
   "usingComponents": {
     "e-segment":"/components/segment/index",

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

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;