Authored by Rock Zhang

Merge branch 'develop' into test

... ... @@ -85,6 +85,7 @@ class NewSaleProcess
foreach ($products['product_list'] as $key => $single) {
$one = Helpers::formatProduct($single, true, false, false, 75, 114);
$one['rank'] = $limit * ($page -1) + $key + 1;
!empty($single['sales_phrase']) && $one['sales_phrase'] = $single['sales_phrase'];
$result['goods'][] = $one;
}
... ...
... ... @@ -25,7 +25,8 @@
{{# active}}
<p>{{.}}</p>
{{/ active}}
<p>{{salePrice}}<b>{{price}}</b></p>
<p>{{sales_phrase}}</p>
<p>¥{{salePrice}}<b>¥{{price}}</b></p>
</div>
</a>
</li>
... ...