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 { @@ -116,6 +116,8 @@ module.exports = class extends global.yoho.BaseModel {
116 color: color || '', 116 color: color || '',
117 size: size || '', 117 size: size || '',
118 content: item.content, 118 content: item.content,
  119 + reply: item.reply,
  120 + replyTitle: item.replyTitle,
119 time: helpers.dateFormat('YYYY-MM-DD HH:mm:ss', new Date(item.createTime * 1000)) 121 time: helpers.dateFormat('YYYY-MM-DD HH:mm:ss', new Date(item.createTime * 1000))
120 }); 122 });
121 }); 123 });
@@ -10,6 +10,11 @@ @@ -10,6 +10,11 @@
10 <span class="goods-size">/{{size}}</span> 10 <span class="goods-size">/{{size}}</span>
11 </div> 11 </div>
12 <p class="detail-content">{{content}}</p> 12 <p class="detail-content">{{content}}</p>
  13 + {{# reply}}
  14 + <p class="comment-reply">
  15 + <b>{{../replyTitle}}</b>{{.}}
  16 + </p>
  17 + {{/ reply}}
13 <span class="comment-time">{{time}}</span> 18 <span class="comment-time">{{time}}</span>
14 </div> 19 </div>
15 {{/ comments}} 20 {{/ comments}}
@@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
20 <p class="detail-content"> 20 <p class="detail-content">
21 {{content}} 21 {{content}}
22 </p> 22 </p>
23 - <span class="comment-time">  
24 - {{time}}  
25 - </span> 23 + <span class="comment-time">
  24 + {{time}}
  25 + </span>
26 {{/ comments}} 26 {{/ comments}}
27 </div> 27 </div>
28 <a class="comment-content-footer tap-hightlight" href="{{commentsUrl}}" rel="nofollow"> 28 <a class="comment-content-footer tap-hightlight" href="{{commentsUrl}}" rel="nofollow">
@@ -15,17 +15,17 @@ @@ -15,17 +15,17 @@
15 <span class="user-name {{#if userName}}pd-right{{/if}}"> 15 <span class="user-name {{#if userName}}pd-right{{/if}}">
16 {{{userName}}} 16 {{{userName}}}
17 </span> 17 </span>
18 - <span class="goods-spec">  
19 - 购买了<b>{{color}}</b>  
20 - </span>  
21 - <span class="goods-size">/{{size}}</span>  
22 - </div>  
23 - <p class="detail-content">  
24 - {{content}}  
25 - </p>  
26 - <span class="comment-time">  
27 - {{time}}  
28 - </span> 18 + <span class="goods-spec">
  19 + 购买了<b>{{color}}</b>
  20 + </span>
  21 + <span class="goods-size">/{{size}}</span>
  22 + </div>
  23 + <p class="detail-content">
  24 + {{content}}
  25 + </p>
  26 + <span class="comment-time">
  27 + {{time}}
  28 + </span>
29 {{/ comments}} 29 {{/ comments}}
30 </div> 30 </div>
31 <a class="comment-content-footer tap-hightlight" href="{{commentsUrl}}" rel="nofollow"> 31 <a class="comment-content-footer tap-hightlight" href="{{commentsUrl}}" rel="nofollow">
@@ -135,6 +135,16 @@ @@ -135,6 +135,16 @@
135 line-height: 62px; 135 line-height: 62px;
136 } 136 }
137 137
  138 + .comment-reply {
  139 + margin-top: 15px;
  140 + padding: 28px;
  141 + background: #f0f0f0;
  142 + box-sizing: border-box;
  143 + line-height: 32px;
  144 + color: #999;
  145 + font-size: 26px;
  146 + }
  147 +
138 .goods-spec, 148 .goods-spec,
139 .comment-time { 149 .comment-time {
140 font-size: 24px; 150 font-size: 24px;
@@ -890,6 +890,16 @@ $basicBtnC: #eb0313; @@ -890,6 +890,16 @@ $basicBtnC: #eb0313;
890 line-height: 62px; 890 line-height: 62px;
891 } 891 }
892 892
  893 + .comment-reply {
  894 + margin: 15px 28px 0 28px;
  895 + padding: 28px;
  896 + background: #f0f0f0;
  897 + box-sizing: border-box;
  898 + line-height: 32px;
  899 + color: #999;
  900 + font-size: 26px;
  901 + }
  902 +
893 .detail-content { 903 .detail-content {
894 color: $mainFontC; 904 color: $mainFontC;
895 font-size: 28px; 905 font-size: 28px;