Merge refs/heads/feature/association into refs/heads/release

subpages/associationNew/pages/addTopic/addTopic.js

@@ -32,7 +32,7 @@ Page({
     })
     if(options.topicType == 0){
       wx.setNavigationBarTitle({
-        title: '事好儿鼓个掌' 
+        title: '事好鼓个掌' 
       })
     }else{
       wx.setNavigationBarTitle({

subpages/associationNew/pages/eventlist/eventlist.js

@@ -35,7 +35,7 @@ Page({
     })
     if (options.topicType == 0) {
       wx.setNavigationBarTitle({
-        title: '事好儿鼓个掌'
+        title: '事好鼓个掌'
       })
     } else {
       wx.setNavigationBarTitle({
@@ -56,6 +56,7 @@ Page({
       partyGroupId: this.data.partyGroupId, //党群id
     }
     topiclist(para).then(res => {
+      wx.stopPullDownRefresh();
       that.setData({
         bannedFlag: res.data.bannedFlag,
         nodata: false,
@@ -71,6 +72,7 @@ Page({
         })
       }
     }).catch(err => {
+      wx.stopPullDownRefresh();
       that.setData({
         topiclist: [],
         nodata: true,
@@ -129,7 +131,12 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+    this.setData({
+      pageIndex: 1,
+      pageSize: 10,
+      topiclist: [],
+    })
+    this.topiclist()
   },
 
   /**
@@ -210,7 +217,8 @@ Page({
   // 失去焦点
   bindAddressInput(e) {
     this.setData({ //失去焦点以后view隐藏
-      ifcomment: false
+      ifcomment: false,
+      commentContent:''
     })
   },
   // 双向绑定

subpages/associationNew/pages/eventlist/eventlist.json

@@ -3,5 +3,8 @@
     "load-more": "../../../../components/loadMore/loadMore",
     "no-data":"../../../../components/nodata/nodata"
   },
-  "navigationBarTitleText": ""
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": true,
+  "backgroundColor": "#f8f8f8",
+  "backgroundTextStyle": "dark"
 }

subpages/associationNew/pages/eventlist/eventlist.wxss

@@ -64,7 +64,7 @@ page {
 }
 
 .attitude {
-  width: calc(100% - 158rpx);
+  width: calc(100% - 300rpx);
   margin-top: 21rpx;
   display: flex;
   align-items: center;