Authored by 2586703@qq.com

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

@@ -12,17 +12,17 @@ @@ -12,17 +12,17 @@
12 --> 12 -->
13 {{> layout/header}} 13 {{> layout/header}}
14 14
15 - 15 +{{# writerInfo}}
16 <div class="editor-content"> 16 <div class="editor-content">
17 <span class="photo-span"> 17 <span class="photo-span">
18 - <img class="photo" src="http://img02.yohoboys.com/contentimg/2015/01/22/16/021a05773e08fdb9dcbe920c96cd01bc3d.png"> 18 + <img class="photo" src="{{photo}}">
19 </span> 19 </span>
20 - <span class="username">Mh</span> 20 + <span class="username">{{username}}</span>
21 <span class="usermark"> 21 <span class="usermark">
22 - 测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡测试文字就很好苦咖啡 </span>  
23 - <span class="comment_button comment-num edit-comment">10</span> 22 + {{usermark}}</span>
  23 + <span class="comment_button comment-num edit-comment">{{commentCount}}</span>
24 </div> 24 </div>
25 - 25 +{{/ writerInfo}}
26 26
27 <div class="editor-comment-content clearfix" style="" cid="38"> 27 <div class="editor-comment-content clearfix" style="" cid="38">
28 <div class="usermsg"> 28 <div class="usermsg">
1 -{{#hasComment}}  
2 -<div class="has-comment">  
3 - <span class="has-user">  
4 - <img src="{{img}}">  
5 - </span>  
6 -  
7 - <div class="has-comment-info">  
8 - <h2>{{author}}</h2>  
9 -  
10 - <div class="edit-intrduce">  
11 - <p _title="{{introduce}}">{{introduce}}</p>  
12 - <span class="line-btn"></span>  
13 - </div>  
14 - <span class="comment_button"><b class="comment-num edit-comment">{{num}}</b></span>  
15 - </div>  
16 -  
17 -</div>  
18 -{{/hasComment}}  
19 -<div class="comment">  
20 - <div class="comment-area">  
21 - <ul class="comments-list">  
22 - {{#comment.list}}  
23 - <li class="clearfix">  
24 - <div class="userimg">  
25 - <img src="{{img}}" alt="">  
26 - <i class="qq"></i>  
27 - </div>  
28 - <div class="userinfo">  
29 - <h6>{{author}}</h6>  
30 -  
31 - <p class="comment-text">{{commentText}}</p>  
32 - </div>  
33 - </li>  
34 - {{/comment.list}}  
35 - </ul>  
36 - <div style="display:none" class="pager-content comment-pager-content">  
37 - <div class="channel-index-pager"></div>  
38 - </div>  
39 - <div class="view-more">  
40 - <a href="javascript:;">View&nbsp;<span>{{comment.num}}</span>&nbsp;more</a>  
41 - </div>  
42 - <div class="comment-textarea">  
43 - <textarea placeholder="说点什么..."></textarea>  
44 -  
45 - <div class="login-status clearfix">  
46 - <div class="userimg">  
47 - <img src="{{user}}" alt="">  
48 - <i></i>  
49 - </div>  
50 - <div class="userinfo">  
51 - <span></span>  
52 - <a class="exit-btn" href="javascript:;">退出</a>  
53 - </div>  
54 - <div class="publish">  
55 - <a class="publish-btn" href="javascript:;">Publish</a>  
56 - </div>  
57 - </div>  
58 - </div>  
59 - </div>  
60 -</div>  
61 -<!--content-->  
62 -<div class="home-content">  
63 - <ul>  
64 - {{#indexContent}}  
65 - <li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">  
66 - <a class="img-link" href="{{href}}">  
67 - <img src="{{img}}" alt=""/>  
68 - </a>  
69 - <h2>{{title}}</h2>  
70 - <h3>{{subTitle}}</h3>  
71 - <time>{{channel}} | {{time}}</time>  
72 - <p>{{content}}</p>  
73 - </li>  
74 - {{/indexContent}}  
75 - </ul>  
76 -</div> 1 +{{#hasComment}}
  2 +<div class="has-comment">
  3 + <span class="has-user">
  4 + <img src="{{img}}">
  5 + </span>
  6 +
  7 + <div class="has-comment-info">
  8 + <h2>{{author}}</h2>
  9 +
  10 + <div class="edit-intrduce">
  11 + <p _title="{{introduce}}">{{introduce}}</p>
  12 + <span class="line-btn"></span>
  13 + </div>
  14 + <span class="comment_button"><b class="comment-num edit-comment">{{num}}</b></span>
  15 + </div>
  16 +
  17 +</div>
  18 +{{/hasComment}}
  19 +<div class="comment">
  20 + <div class="comment-area">
  21 + <ul class="comments-list">
  22 + {{#comment.list}}
  23 + <li class="clearfix">
  24 + <div class="userimg">
  25 + <img src="{{img}}" alt="">
  26 + <i class="qq"></i>
  27 + </div>
  28 + <div class="userinfo">
  29 + <h6>{{author}}</h6>
  30 +
  31 + <p class="comment-text">{{commentText}}</p>
  32 + </div>
  33 + </li>
  34 + {{/comment.list}}
  35 + </ul>
  36 + <div style="display:none" class="pager-content comment-pager-content">
  37 + <div class="channel-index-pager"></div>
  38 + </div>
  39 + <div class="view-more">
  40 + <a href="javascript:;">View&nbsp;<span>{{comment.num}}</span>&nbsp;more</a>
  41 + </div>
  42 + <div class="comment-textarea">
  43 + <textarea placeholder="说点什么..."></textarea>
  44 +
  45 + <div class="login-status clearfix">
  46 + <div class="userimg">
  47 + <img src="{{user}}" alt="">
  48 + <i></i>
  49 + </div>
  50 + <div class="userinfo">
  51 + <span></span>
  52 + <a class="exit-btn" href="javascript:;">退出</a>
  53 + </div>
  54 + <div class="publish">
  55 + <a class="publish-btn" href="javascript:;">Publish</a>
  56 + </div>
  57 + </div>
  58 + </div>
  59 + </div>
  60 +</div>
  61 +<!--content-->
  62 +<div class="home-content">
  63 + <ul>
  64 + {{#indexContent}}
  65 + <li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">
  66 + <a class="img-link" href="{{href}}">
  67 + <img src="{{img}}" alt=""/>
  68 + </a>
  69 + <h2>{{title}}</h2>
  70 + <h3>{{subTitle}}</h3>
  71 + <time>{{channel}} | {{time}}</time>
  72 + <p>{{content}}</p>
  73 + </li>
  74 + {{/indexContent}}
  75 + </ul>
  76 +</div>
77 {{> default/download320}} 77 {{> default/download320}}