Merge branch 'feature/0330' into 'release/6.8.8'

fix



See merge request !32

@@ -38,15 +38,11 @@
           :user="reply.userName"
           :column-type="columnType"
           @on-comment="() => onReply({destId: parentComment.id})">
-					<span class="reply-user">
-						{{reply.userName}}
-					</span>
-					<span v-if="reply.parentUserName">
-						回复<em class="reply-to-user">@{{reply.parentUserName}}</em>
-					</span>:
-          <span>
-            {{reply.content}}
-          </span>
+					<span class="reply-user">{{reply.userName}}</span>
+					<template v-if="reply.parentUserName">
+						<span>回复</span><em class="reply-to-user">@{{reply.parentUserName}}</em>
+					</template>:
+          <span>{{reply.content}}</span>
 				</CommentPlaceholder>
 				<p class="reply-more" v-if="moreReplyNum > 0" @click="onShowMore">
           {{replyMoreText}}
@@ -211,6 +207,19 @@ export default {
         margin-bottom: 0;
       }
 
+      > * {
+        display: inline-block;
+        vertical-align: text-top;
+      }
+
+      .reply-user,
+      .reply-to-user {
+        max-width: 230px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
       .reply-to-user {
         color: #4a90e2;
         font-style: normal;

@@ -81,7 +81,7 @@ export default {
   &.theme-white {
     background-color: #fff;
     color: #222;
-    border-bottom: solid 1px #e0e0e0;
+    border-bottom: solid 1px #efefef;
   }
 
   &.theme-transparent {

@@ -340,10 +340,12 @@ export default {
       }
     }
 
-    .imgfont {
+    .iconfont {
       position: relative;
       z-index: 0;
+    }
 
+    .imgfont {
       &:before {
         opacity: 0;
       }
@@ -368,14 +370,13 @@ export default {
       background-image: url('~statics/image/components/img-icon-love-fill.png');
     }
 
-
     .praise-lottie {
       position: absolute;
       width: 90px;
       height: 60px;
       overflow: hidden;
-      left: calc(50% - 45px);
-      top: -60px;
+      left: calc(50% - 42px);
+      top: -54px;
 
 
       .praise-lottie-wrap {

@@ -101,16 +101,19 @@ export default {
     letter-spacing: 0.06PX;
     line-height: 36px;
     margin-bottom: 6px;
+
+    > * {
+      display: inline-block;
+      vertical-align: text-bottom;
+    }
   }
 
   .user-name {
     font-weight: bold;
     max-width: 300px;
-    display: inline-block;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    vertical-align: text-bottom;
   }
 
   .total-comment {