Merge branch 'feature/comment-0615-ch' into msb_test

src/views/goods/comment/detail/index.vue

@@ -54,21 +54,18 @@
                     <p class="comment--ctx">{{ detailData.followComment.commentContent }}</p>
                 </template>
             </div>
+            <template v-if="detailData.merchantComment">
+                <div class="title">
+                    <b>商家（{{ detailData.merchantComment.userName }}） 回复：</b>
+                    <span>{{ detailData.merchantComment.createTime }}</span>
+                </div>
 
-            <div class="title">
-                <b>商家回复</b>
-            </div>
-
-            <ul class="reply" v-if="detailData.merchantComment">
-                <li class="reply--item">
-                    <div class="reply--title">
-                        {{ detailData.merchantComment.userName }}
-                        <span>({{ detailData.merchantComment.createTime }}) 回复 ：</span>
-                    </div>
-                    <p class="reply--ctx">{{ detailData.merchantComment.commentContent }}</p>
-                </li>
-            </ul>
-            <div class="reply__emtpy" v-else>暂无内容</div>
+                <ul class="reply">
+                    <li class="reply--item">
+                        <p class="reply--ctx">{{ detailData.merchantComment.commentContent }}</p>
+                    </li>
+                </ul>
+            </template>
 
             <div class="title">
                 <b>全部回复（{{ detailData.answerCommentList?.length || 0 }}条）</b>
@@ -102,7 +99,7 @@
                 </li>
             </ul>
             <div class="reply__emtpy" v-else>暂无内容</div>
-            <div class="footer">
+            <div class="footer" v-if="!detailData.merchantComment">
                 <textarea
                     class="footer--textarea"
                     ref="$textarea"
@@ -257,7 +254,7 @@
     .main {
         flex: 1;
         // position: relative;
-        padding: 20px 30px;
+        padding: 20px 30px 130px;
         height: 100%;
         overflow: auto;
         .title {
@@ -266,6 +263,9 @@
             display: flex;
             align-items: center;
             justify-content: space-between;
+            span {
+                color: #999;
+            }
         }
         .comment {
             margin: 30px 0;
@@ -289,7 +289,6 @@
         }
         .reply {
             border-bottom: 1px solid #eee;
-            padding-bottom: 130px;
             color: #666;
             &__emtpy {
                 color: #999;