Authored by 毕凯

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 </div> 19 </div>
20 <div class="item-content"> 20 <div class="item-content">
21 <h2>{{title}}</h2> 21 <h2>{{title}}</h2>
22 - <p>¥{{# price}}<span>{{.}}</span>{{/ price}{{sPrice}}</p> 22 + <p>{{# price}}<span>¥{{.}}</span>{{/ price}{{sPrice}}</p>
23 </div> 23 </div>
24 </li> 24 </li>
25 {{/ list}} 25 {{/ list}}
@@ -202,10 +202,8 @@ @@ -202,10 +202,8 @@
202 float: left; 202 float: left;
203 display: block; 203 display: block;
204 width: 110px; 204 width: 110px;
205 - height: 14px;  
206 - line-height: 14px; 205 + line-height: 20px;
207 font-size: 12px; 206 font-size: 12px;
208 - margin-bottom: 5px;  
209 color: #069; 207 color: #069;
210 text-decoration: underline; 208 text-decoration: underline;
211 } 209 }