动态点赞修改

assets/base.scss

@@ -317,6 +317,9 @@
             @extend %cursorPointer;
             @extend %animate-transition;
             @include fontStyle(14,34,500,#fff,center);
+            a{
+              color:#fff
+            }
             &:hover{
               filter:brightness(1.1);
             }

components/pc/socialContactCard.vue

@@ -106,15 +106,16 @@
 
     </div>
     <transition name="fade" >
-       <comment-con @listioncommentConNumber="dataGet2ComNum" style="margin-top: -16px" v-if="showCommentCon"  :id="postId" type="dynamic"></comment-con>
-     </transition>
-    <transition name="fade" >
       <div class="article__praise-member" v-if="showPraiseCon&&praiseNum>0">
-        <yun-icon style="margin-bottom: 8px" name="like2" size="12px" color="#FF7474"></yun-icon>
-        <p class="praise-member-name" @click="changeRoute2('/u/'+val.userId+'/blog')" :key="val.userId" v-for="(val,index) in praiseList">{{val.nickName}}<span v-if="praiseTotal!==index+1">,</span></p>
+        <yun-icon style="margin-bottom: 8px;margin-right:15px" name="like2" size="12px" color="#FF7474"></yun-icon>
+        <p class="praise-member-name" @click="changeRoute2('/u/'+val.userId+'/blog')" :key="val.userId" v-for="(val,index) in praiseList">{{val.nickName}}<span v-if="praiseTotal!==index+1">、</span></p>
         <p class="more-member" v-if="!showAllPraise" @click="dataGetAllPraiseList">...</p>
       </div>
     </transition>
+    <transition name="fade" >
+       <comment-con @listioncommentConNumber="dataGet2ComNum" style="margin-top: -11px" v-if="showCommentCon"  :id="postId" type="dynamic"></comment-con>
+     </transition>
+
   </div>
   </transition>
 </template>
@@ -873,8 +874,9 @@
     .article__praise-member{
       box-sizing: border-box;
       width:816*$length;
-      padding:40*$length;
+      padding:20*$length 40*$length;
       margin-top: 5*$length;
+      border-radius:4*$length;
       background-color: #Fff;
       @extend %flex-row-spb;
       justify-content: flex-start;
@@ -886,7 +888,7 @@
         @include fontStyle(12,22,500,#00AAE6,center);
         @extend %cursorPointer;
         @extend %animate-transition;
-        margin-left: 20*$length;
+        margin-left: 8*$length;
 
         span{
           color:#000;

pages/project/detail/_id.vue

@@ -50,19 +50,8 @@
         <div class="article__content" v-html="articleDetail.contentHtml">
         </div>
 
-        <div :class="returnArticleLikeClass" @click="clickToPraise">
-          <yun-icon name="like_egg" class="egg"></yun-icon>
-          <yun-icon name="like1" class="heart"></yun-icon>
-          <p class="num">{{articleDetail.praiseNum}}</p>
-        </div>
-        <div class="article__praise-member">
-          <yun-avatar :key="val.userId" class="more-member" :style="{marginRight:(index+1)%10===0?'0px':'28px'}" size="40px" borderR="20px" v-for="(val,index) in praiseList" :userId="val.userId" :src="val.userAvatar" :name="val.nickName"></yun-avatar>
-          <p class="more-member" v-if="!showAllPraise" @click="dataGetAllPraiseList">更多</p>
-        </div>
+
         <div class="article__footer">
-          <p class="link" v-if="!articleDetail.projectId">原文链接：<a target="_blank" :href="articleDetail.sourceLink"> <span>{{articleDetail.sourceLink}}</span></a></p>
-          <p></p>
-          <p class="report" @click="$router.push({path:'/web/report',query:{type:'project',id:articleDetail.projectId}})">举报</p>
           <div class="project" v-if="articleDetail.projectId">
             <p>
               <yun-icon name="home" size="12px" style="margin-right: 5px"></yun-icon>
@@ -75,7 +64,21 @@
               <yun-icon name="download" size="12px" style="margin-right: 5px"></yun-icon>项目下载
             </p>
           </div>
+        </div>
 
+        <div :class="returnArticleLikeClass" @click="clickToPraise">
+          <yun-icon name="like_egg" class="egg"></yun-icon>
+          <yun-icon name="like1" class="heart"></yun-icon>
+          <p class="num">{{articleDetail.praiseNum}}</p>
+        </div>
+        <div class="article__praise-member">
+          <yun-avatar :key="val.userId" class="more-member" :style="{marginRight:(index+1)%10===0?'0px':'28px'}" size="40px" borderR="20px" v-for="(val,index) in praiseList" :userId="val.userId" :src="val.userAvatar" :name="val.nickName"></yun-avatar>
+          <p class="more-member" v-if="!showAllPraise" @click="dataGetAllPraiseList">更多</p>
+        </div>
+
+        <div class="article__footer">
+          <p></p>
+          <p class="report" @click="$router.push({path:'/web/report',query:{type:'project',id:articleDetail.projectId}})">举报</p>
         </div>
       </div>
       <comment-con :id="articleDetail.projectId" type="project"></comment-con>