Authored by Rock Zhang

Merge branch 'develop' into test

@@ -25,8 +25,13 @@ @@ -25,8 +25,13 @@
25 {{# active}} 25 {{# active}}
26 <p>{{.}}</p> 26 <p>{{.}}</p>
27 {{/ active}} 27 {{/ active}}
28 - <p>{{sales_phrase}}</p>  
29 - <p>¥{{salePrice}}<b>¥{{price}}</b></p> 28 + {{#sales_phrase}}
  29 + <p>{{.}}</p>
  30 + {{/sales_phrase}}
  31 + <p>
  32 + {{#salePrice}{{.}}{{/salePrice}}{{#price}}
  33 + <b>¥{{.}}</b>{{/price}}
  34 + </p>
30 </div> 35 </div>
31 </a> 36 </a>
32 </li> 37 </li>