Merge branch 'feature/comment-reply' into 'release/6.8.4'

Feature/comment reply



See merge request !1640

@@ -116,6 +116,8 @@ module.exports = class extends global.yoho.BaseModel {
                     color: color || '',
                     color: color || '',
                     size: size || '',
                     size: size || '',
                     content: item.content,
                     content: item.content,
+                    reply: item.reply,
+                    replyTitle: item.replyTitle,
                     time: helpers.dateFormat('YYYY-MM-DD HH:mm:ss', new Date(item.createTime * 1000))
                     time: helpers.dateFormat('YYYY-MM-DD HH:mm:ss', new Date(item.createTime * 1000))
                 });
                 });
             });
             });

@@ -10,6 +10,11 @@
                     <span class="goods-size">/{{size}}</span>
                     <span class="goods-size">/{{size}}</span>
                 </div>
                 </div>
                 <p class="detail-content">{{content}}</p>
                 <p class="detail-content">{{content}}</p>
+                {{# reply}}
+                    <p class="comment-reply">
+                        <b>{{../replyTitle}}</b>{{.}}
+                    </p>
+                {{/ reply}}
                 <span class="comment-time">{{time}}</span>
                 <span class="comment-time">{{time}}</span>
             </div>
             </div>
         {{/ comments}}
         {{/ comments}}

@@ -135,6 +135,16 @@
                 line-height: 62px;
                 line-height: 62px;
             }
             }
 
 
+            .comment-reply {
+                margin-top: 15px;
+                padding: 28px;
+                background: #f0f0f0;
+                box-sizing: border-box;
+                line-height: 32px;
+                color: #999;
+                font-size: 26px;
+            }
+
             .goods-spec,
             .goods-spec,
             .comment-time {
             .comment-time {
                 font-size: 24px;
                 font-size: 24px;

@@ -890,6 +890,16 @@ $basicBtnC: #eb0313;
                 line-height: 62px;
                 line-height: 62px;
             }
             }
 
 
+            .comment-reply {
+                margin: 15px 28px 0 28px;
+                padding: 28px;
+                background: #f0f0f0;
+                box-sizing: border-box;
+                line-height: 32px;
+                color: #999;
+                font-size: 26px;
+            }
+
             .detail-content {
             .detail-content {
                 color: $mainFontC;
                 color: $mainFontC;
                 font-size: 28px;
                 font-size: 28px;