Merge branch 'ch/need_pool398' of eta_mini/eta_mini_h5 into master_ht

src/views/report/Detail.vue

@@ -268,6 +268,7 @@ function goPrimary(){
 
 // 跳转研究员详情页
 function goDetails(item){
+  if (item.following === 'forbidden') return
   wx.miniProgram.navigateTo({
     url:'/pages-user/authordetail/index?id='+item.id
   })
@@ -352,7 +353,7 @@ function openContactPerson() {
           <div
             @click="changeFollowState"
             :class="['opt-btn', isFollowed ? 'followed' : '']"
-            v-if="isLogin && authorInfoList?.[0].name"
+            v-if="isLogin && authorInfoList?.[0].name && authorInfoList[0].following !== 'forbidden'"
           >
             {{ isFollowed ? "取消关注" : "关注" }}
           </div>
@@ -525,7 +526,7 @@ function openContactPerson() {
         <div
           @click="changeFollowStateList(item)"
           :class="['opt-btn', item.following === 'following' ? 'following' : '']"
-          v-if="isLogin"
+          v-if="isLogin && item.following !== 'forbidden'"
         >
           {{ item.following === 'following' ? "取消关注" : "关注" }}
         </div>
@@ -839,7 +840,7 @@ function openContactPerson() {
   .authorList-box {
     margin: 20px 0;
     display: flex;
-    justify-content: space-between;
+    gap: 0 20px;
     align-items: center;
     .img-list-box {
       width: 78px;
@@ -852,11 +853,10 @@ function openContactPerson() {
       }
     }
     .name-list-box {
-      display: -webkit-box;
+      width: 100px;
       -webkit-box-orient: vertical;
       overflow: hidden;
       text-overflow: ellipsis;
-      -webkit-line-clamp: 2; /* 限制为2行 */
     }
     .opt-btn {
       margin-left: 30%;

src/views/report/PDF.vue

@@ -180,6 +180,7 @@ function goPrimary(){
 
 // 跳转研究员详情页
 function goDetails(item){
+  if (item.following === 'forbidden') return
   wx.miniProgram.navigateTo({
     url:'/pages-user/authordetail/index?id='+item.id
   })
@@ -224,7 +225,7 @@ function goDetails(item){
               </template>
             </span>
           </div>
-          <div @click="changeFollowState" :class="['opt-btn', isFollowed ? 'followed' : '']" v-if="reportInfo.login">
+          <div @click="changeFollowState" :class="['opt-btn', isFollowed ? 'followed' : '']" v-if="reportInfo.login && authorInfoList[0].following !== 'forbidden'">
             {{ isFollowed ? "取消关注" : "关注" }}
           </div>
         </template>
@@ -338,7 +339,7 @@ function goDetails(item){
         <div
           @click="changeFollowStateList(item)"
           :class="['opt-btn', item.following === 'following' ? 'following' : '']"
-          v-if="isLogin"
+          v-if="isLogin && item.following !== 'forbidden'"
         >
           {{ item.following === 'following' ? "取消关注" : "关注" }}
         </div>
@@ -566,7 +567,7 @@ function goDetails(item){
   .authorList-box {
     margin: 20px 0;
     display: flex;
-    justify-content: space-between;
+    gap: 0 20px;
     align-items: center;
     .img-list-box {
       width: 78px;
@@ -579,11 +580,10 @@ function goDetails(item){
       }
     }
     .name-list-box {
-      display: -webkit-box;
+      width: 100px;
       -webkit-box-orient: vertical;
       overflow: hidden;
       text-overflow: ellipsis;
-      -webkit-line-clamp: 2; /* 限制为2行 */
     }
     .opt-btn {
       margin-left: 30%;