Merge remote-tracking branch 'origin/master'

pages/tab/article.vue

@@ -2,7 +2,7 @@
 	<!-- 使用z-paging-swiper为根节点可以免计算高度 -->
 	<z-paging-swiper>
 <!--    发表动态按钮-->
-		<view class="add">
+		<view class="add" v-if="current != 0">
 			<image @click='publishArticle' :src="baseUrl+'/article/102.png'" mode=""/>
 		</view>
 		<!-- 需要固定在顶部不滚动的view放在slot="top"的view中 -->
@@ -120,6 +120,7 @@
 				if (name == '关注') {
 					this.current = 0
 				} else if (name == '最近') {
+          this.topicId = null
 					this.current = 1
 				} else if (name == '话题'){
           this.current = 2