Authored by Rock Zhang

Merge branch 'develop' into test

... ... @@ -43,7 +43,7 @@ class NewSaleProcess
// 处理商品
if (isset($products['product_list'])) {
foreach ($products['product_list'] as $single) {
$result['goods'][] = Helpers::formatProduct($single, true, false, false, 290, 388);
$result['goods'][] = Helpers::formatProduct($single, true, false, false, 235, 314);
}
}
... ...
... ... @@ -36,7 +36,7 @@
<span class="icon iconfont icon-tel">&#xe63e;</span>
电话客服
<p>
400-889-9649 &nbsp;&nbsp; 09:00 - 22:30 &nbsp; (周一至周日)
400-889-9646 &nbsp;&nbsp; 09:00 - 22:30 &nbsp; (周一至周日)
</p>
</a>
... ...
... ... @@ -219,7 +219,7 @@ class NewsaleModel
if (isset($data['code']) && $data['code'] === 200 && isset($data['data']['product_list'])) {
foreach ($data['data']['product_list'] as $val) {
$result['goods'][] = Helpers::formatProduct($val, true, false, false, 299, 388);
$result['goods'][] = Helpers::formatProduct($val, true, false, false, 235, 314);
}
}
... ...