tijaio

pages/doctors/index.vue

@@ -6,13 +6,13 @@
       fontColor="#fff"
       :backState="2000"
     >
-    <template v-slot:right v-if="activeTab === 1">
-        <view class="top_right" @tap="createFolder" style="margin-right: 20rpx;">
+      <template v-slot:right v-if="activeTab === 1">
+        <view class="top_right" @tap="createFolder" style="margin-right: 20rpx">
           <uni-icons type="folder-add" size="17" color="#fff"></uni-icons>
           <text>发布文章</text>
         </view>
       </template>
-  </z-nav-bar>
+    </z-nav-bar>
     <view
       class="doctors_module"
       :style="`top: ${42 + statusBarHeight}px;`"
@@ -198,8 +198,8 @@
           v-for="(item, index) in list"
           :key="item.id"
           :imgList="item.fileList1"
-          :avatar="item.taihuTalent.icon"
-          :name="item.taihuTalent.name"
+          :avatar="item.taihuTalent&&item.taihuTalent.icon?item.taihuTalent.icon:''"
+          :name="item.taihuTalent&&item.taihuTalent.name?item.taihuTalent.name:''"
           :createTime="item.createTime"
           :title="item.title"
           :content="item.content"
@@ -211,7 +211,7 @@
           :giveRewardNumber="item.giveRewardNumber"
           :commentCount="item.commentCount"
           @clickDynamic="clickDynamic(index)"
-          @clickUser="clickUser(item.id)"
+          @clickUser="clickUser(item)"
           @clickFocus="clickFocus(index)"
           @clickThumbsup="(type) => clickThumbsup(item.id, type)"
           @clickGiveReward="clickGiveReward(item.id)"
@@ -227,8 +227,8 @@
     <text class="null_text" v-else>{{ null_text }}</text>
 
     <z-navigation></z-navigation>
-    <common-pinglun ref="pinglun" @close="close"></common-pinglun>
-    <common-likeList ref="commonLikeList" @close="close"></common-likeList>
+    <common-pinglun ref="pinglun" @close="close" @show="(e)=>pinglunShow=e"></common-pinglun>
+    <common-likeList ref="commonLikeList" @close="close"  @show="(e)=>likeShow=e"></common-likeList>
     <uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
       <uni-popup-share @select="haveSelected"></uni-popup-share>
     </uni-popup>
@@ -252,7 +252,8 @@ export default {
       list: [],
 
       null_text: "",
-
+      pinglunShow:false,
+      likeShow:false,
       current: 1,
       limit: 10,
       courseName: "",
@@ -275,6 +276,14 @@ export default {
   },
 
   onPullDownRefresh() {
+    if(this.pinglunShow){
+      uni.stopPullDownRefresh();
+      return false
+    }
+    if(this.likeShow){
+      uni.stopPullDownRefresh();
+      return false
+    }
     this.isRefreshing = true;
     console.log("下拉刷新");
 
@@ -288,7 +297,6 @@ export default {
         this.getArticleListData();
       }
 
-      
       uni.stopPullDownRefresh();
       this.isRefreshing = false;
       console.log("下拉刷新已停止");
@@ -300,6 +308,19 @@ export default {
   },
   onShow() {},
   methods: {
+    refreshData(reset) {
+      if (reset) {
+        this.currentCateIndex = 0;
+
+        //重置
+        this.list = [];
+        this.noMore = false;
+        this.show = false;
+        this.count = 0;
+        this.current = 1;
+        this.getArticleListData();
+      }
+    },
     createFolder() {
       uni.navigateTo({
         url: `/pages/articleList/article?navTitle=文章&title=文章&type=add`,
@@ -359,6 +380,9 @@ export default {
     clickUser(e) {
       console.log(e);
       console.log("childUser");
+      uni.navigateTo({
+        url: "/pages/talents/detail?id=" + e.taihuTalent.id,
+      });
     },
     // 点击关注
     clickFocus(e) {