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

pages/topics/interactive/topicArticle/index.js

@@ -81,7 +81,13 @@ Page({
       })
     })
   },
-  fetchDetailComment(){
+  fetchDetailComment(flag=false){
+
+    if(flag){
+      this.setData({
+        currPage:1
+      })
+    }
     let topicId = this.data.topicId
     let page = this.data.currPage
     topicModel.getTopicDetailComment(topicId,page,res => {
@@ -254,7 +260,7 @@ Page({
             confirmTag:true,
             currentComment: ''
           })
-          this.fetchDetailComment()
+          this.fetchDetailComment(true)
         }
       })
     }

pages/user/myWhistle/index.wxss

@@ -6,7 +6,7 @@ page{
 }
 .column{
   width:100%;
-  height: 130px;
+  /* height: 130px; */
   background-color: white;
   margin-top:3px;
   display: flex;
@@ -28,7 +28,7 @@ page{
 }
 .top{
   width: 90%;
-  height: 70px;
+  min-height: 55px;
   display: flex;
   align-items: center;
   justify-content:center;

pages/user/myWhistle/whistle.wxs

@@ -9,10 +9,10 @@ var whistle = {
     var evaluate = '';
     switch(score) {
       case 1:
-        evaluate = '非常差';
+        evaluate = '非常不满意';
          break;
       case 2:
-        evaluate = '差';
+        evaluate = '不满意';
          break;
       case 3:
         evaluate = '一般';