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

@@ -249,7 +249,7 @@ class SearchData extends \LibModels\Wap\Product\SearchData
         if (!isset($condition['order'])) {
         if (!isset($condition['order'])) {
             $param['order'] = $orderMaps['s_t_desc'];
             $param['order'] = $orderMaps['s_t_desc'];
         } else {
         } else {
-            $param['order'] = $orderMaps[$condition['order']];
+            $param['order'] = isset($orderMaps[$condition['order']]) ? $orderMaps[$condition['order']] : '';
         }
         }
         if (!isset($condition['page'])) {
         if (!isset($condition['page'])) {
             $param['page'] = 1;
             $param['page'] = 1;

@@ -79,7 +79,7 @@ class HelperSearch
         //总页数
         //总页数
         $result['page_total'] = isset($data['product']['page_total']) ? $data['product']['page_total'] : '';
         $result['page_total'] = isset($data['product']['page_total']) ? $data['product']['page_total'] : '';
         self::$pageTotal = $result['page_total'];
         self::$pageTotal = $result['page_total'];
-        self::$total = $data['product']['total'];
+        self::$total = isset($data['product']['total']) ? $data['product']['total'] : 0;
         //当前页
         //当前页
         self::$page = $result['page'] = isset($data['product']['page']) ? $data['product']['page'] : '';
         self::$page = $result['page'] = isset($data['product']['page']) ? $data['product']['page'] : '';
         //筛选条件
         //筛选条件

@@ -36,14 +36,15 @@ class IndexModel
         $misort = isset($searchCondition['condition']['misort']) ? $searchCondition['condition']['misort'] : false;
         $misort = isset($searchCondition['condition']['misort']) ? $searchCondition['condition']['misort'] : false;
         $positionId = isset($searchCondition['options']['positionId']) ? $searchCondition['options']['positionId'] : '';
         $positionId = isset($searchCondition['options']['positionId']) ? $searchCondition['options']['positionId'] : '';
         $gender = $searchCondition['condition']['gender'] == '2,3' ? 2 : 1;
         $gender = $searchCondition['condition']['gender'] == '2,3' ? 2 : 1;
-        if ($msort && $misort) {//TODO
+        $banner = array();
+        if ($msort && $misort) {
             $bannerData = Yohobuy::yarClient(Yohobuy::SERVICE_URL . self::URI_INDEX_TBANNER, 'get', array($positionId,$msort,$misort,$gender,0,0,0,0,0));
             $bannerData = Yohobuy::yarClient(Yohobuy::SERVICE_URL . self::URI_INDEX_TBANNER, 'get', array($positionId,$msort,$misort,$gender,0,0,0,0,0));
             if (isset($bannerData['code']) && $bannerData['code'] == '200') {
             if (isset($bannerData['code']) && $bannerData['code'] == '200') {
                 $banner = self::formatBanner($bannerData['data']);
                 $banner = self::formatBanner($bannerData['data']);
             }
             }
         }
         }
         //插入banner数据
         //插入banner数据
-        if (!empty($banner)) {
+        if (isset($banner)) {
             $data['sortIntro'] = $banner;
             $data['sortIntro'] = $banner;
         }
         }
         
         

@@ -16,6 +16,9 @@ class SearchController extends WebAction
             'searchListPage' => true,
             'searchListPage' => true,
             'search' => $searchData
             'search' => $searchData
         );
         );
+        $this->setTitle('潮流商品搜索 | YOHO!有货');
+        $this->setKeywords('Yoho! 有货,潮流,时尚,流行,购物,B2C,正品,购物网站,网上购物,货到付款,品牌服饰,男士护肤,黑框眼镜,匡威,板鞋,i.t,izzue,5cm,eastpak,vans,lylescott,g-shock,new balance,lacoste,melissa,casio,卡西欧手表,舒雅,jasonwood,odm,AAAA,香港购物,日本潮流');
+        $this->setDescription('潮流商品搜索,上衣,衬衫，TEE，卫衣，冲锋衣，风衣，羽绒服，裤子,休闲鞋,板鞋,配饰，复古眼镜');
         $this->setWebNavHeader();
         $this->setWebNavHeader();
         $this->_view->display('search', $data);
         $this->_view->display('search', $data);
     }
     }