Authored by Rock Zhang

Merge branch 'develop' into test

... ... @@ -25,8 +25,13 @@
{{# active}}
<p>{{.}}</p>
{{/ active}}
<p>{{sales_phrase}}</p>
<p>¥{{salePrice}}<b>¥{{price}}</b></p>
{{#sales_phrase}}
<p>{{.}}</p>
{{/sales_phrase}}
<p>
{{#salePrice}{{.}}{{/salePrice}}{{#price}}
<b>¥{{.}}</b>{{/price}}
</p>
</div>
</a>
</li>
... ...