Authored by hf

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

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