Merge branch 'master' of http://git.sjzkeji.com/panghu/school_webUser

# Conflicts:
#	pages-my/my-publish.vue

pages-school/circle-info.vue

@@ -113,7 +113,7 @@
                     </view>
                   </view>
                 </view>
-                <view v-if="item.replyList.length < item.count  && item.count > 10"
+                <view v-if="item.replyList.length>0 && item.replyList.length < item.count  && item.count > 10"
                   class="fs-24 fc-6 text-align-center mb-12" @click="openReply(2,item)">展开更多评论</view>
               </view>
 
@@ -455,6 +455,7 @@
             setTimeout(() => {
               this.isAJAX = false;
               this.closeInput()
+              console.log(this.msgType)
               if (this.msgType == 0) {
                 this.list.unshift(res.data)
                 this.$forceUpdate()