fe / yohobuywap-node · Commits

Go to a project

Authored by 王水玲
Commit 22a62e7f972664340031aa7ce46f3d21773a5c0a 2 parents e7ebe4c5 d257d460

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

Feature/comment reply



See merge request !1640
Inline Side-by-side
Showing 6 changed files with 41 additions and 14 deletions
... ... @@ -116,6 +116,8 @@ module.exports = class extends global.yoho.BaseModel {
color: color || '',
size: size || '',
content: item.content,
reply: item.reply,
replyTitle: item.replyTitle,
time: helpers.dateFormat('YYYY-MM-DD HH:mm:ss', new Date(item.createTime * 1000))
});
});
... ...
... ... @@ -10,6 +10,11 @@
<span class="goods-size">/{{size}}</span>
</div>
<p class="detail-content">{{content}}</p>
{{# reply}}
<p class="comment-reply">
<b>{{../replyTitle}}</b>{{.}}
</p>
{{/ reply}}
<span class="comment-time">{{time}}</span>
</div>
{{/ comments}}
... ...
... ... @@ -20,9 +20,9 @@
<p class="detail-content">
{{content}}
</p>
<span class="comment-time">
{{time}}
</span>
<span class="comment-time">
{{time}}
</span>
{{/ comments}}
</div>
<a class="comment-content-footer tap-hightlight" href="{{commentsUrl}}" rel="nofollow">
... ...
... ... @@ -15,17 +15,17 @@
<span class="user-name {{#if userName}}pd-right{{/if}}">
{{{userName}}}
</span>
<span class="goods-spec">
购买了<b>{{color}}</b>
</span>
<span class="goods-size">/{{size}}</span>
</div>
<p class="detail-content">
{{content}}
</p>
<span class="comment-time">
{{time}}
</span>
<span class="goods-spec">
购买了<b>{{color}}</b>
</span>
<span class="goods-size">/{{size}}</span>
</div>
<p class="detail-content">
{{content}}
</p>
<span class="comment-time">
{{time}}
</span>
{{/ comments}}
</div>
<a class="comment-content-footer tap-hightlight" href="{{commentsUrl}}" rel="nofollow">
... ...
... ... @@ -135,6 +135,16 @@
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,
.comment-time {
font-size: 24px;
... ...
... ... @@ -890,6 +890,16 @@ $basicBtnC: #eb0313;
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 {
color: $mainFontC;
font-size: 28px;
... ...