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

@@ -1248,7 +1248,7 @@ class HelperSearch
                         $result[$key]['isVedio'] = true;
                         $result[$key]['isVedio'] = true;
                         $result[$key]['src'] = $vo;
                         $result[$key]['src'] = $vo;
                     }else{
                     }else{
-                        $result[$key]['href'] = $href[1][$key];
+                        $result[$key]['href'] = isset($href[1][$key]) ? $href[1][$key] : '';
                         $result[$key]['src'] = $vo;
                         $result[$key]['src'] = $vo;
                     }
                     }
                 }
                 }

@@ -95,17 +95,16 @@ class ListController extends WebAction
      */
      */
     public function getProductPicAction()
     public function getProductPicAction()
     {
     {
-        $res = array(
-            'code' => 400
-        );
+        $res = array();
+        $callback = $this->post('callback');
         if (!$this->isAjax()) {
         if (!$this->isAjax()) {
-            $this ->echoJson($res);
+           $this->helpJsonCallbackResult($callback, 400, 'Not a Ajax request');
             return;
             return;
         }
         }
         $productSkn = $this->post('skn');
         $productSkn = $this->post('skn');
         $uid = $this->getUid();
         $uid = $this->getUid();
         if (!$productSkn) {
         if (!$productSkn) {
-            $this ->echoJson($res);
+            $this->helpJsonCallbackResult($callback, 412, '商品skn为空');
             return ;
             return ;
         }
         }
         $rowNum = $this->post('rowNum');
         $rowNum = $this->post('rowNum');
@@ -131,7 +130,7 @@ class ListController extends WebAction
         }
         }
         $options['isFavorite'] = $isFavorite;
         $options['isFavorite'] = $isFavorite;
         $res = SearchModel::getProductPic($productSkn, $options);
         $res = SearchModel::getProductPic($productSkn, $options);
-        $this ->echoJson($res);
+        $this->helpJsonCallbackResult($callback, 200, 'success', $res);
     }
     }
     
     
     /**
     /**