Authored by xuqi

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

@@ -206,7 +206,7 @@ class NewsaleModel @@ -206,7 +206,7 @@ class NewsaleModel
206 */ 206 */
207 public static function selectData($data) 207 public static function selectData($data)
208 { 208 {
209 - $result = array('goods' => array()); 209 + $result = array();
210 210
211 if (isset($data['code']) && $data['code'] === 200) { 211 if (isset($data['code']) && $data['code'] === 200) {
212 foreach ($data['data']['product_list'] as $val) { 212 foreach ($data['data']['product_list'] as $val) {
@@ -141,7 +141,14 @@ class NewsaleController extends AbstractAction @@ -141,7 +141,14 @@ class NewsaleController extends AbstractAction
141 ); 141 );
142 $result = \Product\NewsaleModel::selectData($data); 142 $result = \Product\NewsaleModel::selectData($data);
143 143
  144 + if(empty($result))
  145 + {
  146 + echo ' ';
  147 + }
  148 + else
  149 + {
144 $this->_view->display('product', $result); 150 $this->_view->display('product', $result);
  151 + }
145 } else { 152 } else {
146 echo ' '; 153 echo ' ';
147 } 154 }