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

@@ -1316,15 +1316,13 @@ class HelperSearch
      */
     public static function getBannerFormat($banner, $brand) 
     {
-        
         // 根据品牌Id获取品牌banner图
         if (isset($banner['banner'])) { 
             $bannerImg = Helpers::getImageUrl($banner['banner'], '', 150);
         }
         
         $is_favorite = false;
-        $shopName = false;
-        if(isset($brand)){
+        if(isset($brand['is_favorite'])){
             // 获取是否收藏
             if ($brand['is_favorite'] == 'Y') {
                 $is_favorite = true;

@@ -32,9 +32,9 @@ var _hmt = _hmt || [];
         })();
     }
     if (window.addEventListener) {
-        window.addEventListener(type, async_load, false);
+        window.addEventListener('load', async_load, false);
     } else if (window.attachEvent) {
-       window.attachEvent("on" + type, async_load);
+       window.attachEvent('onload', async_load);
     }
 })();
 </script>

@@ -71,7 +71,7 @@ class Bootstrap extends Bootstrap_Abstract
         $controller = 'Index';
         $action = 'Index';
         // 二级域名
-        if (2 === $level) {
+        if (3 === $level) {
             $subDomain = strval($hostParts[0]);
             switch (strtolower($subDomain)) {
                 case 'www':  // 主站

+<?php
+
+namespace Product;
+
+use Plugin\HelperSearch;
+use Product\SearchModel;
+use Api\Yohobuy;
+
+/**
+ * list Index页模板数据模型
+ *
+ */
+class IndexModel 
+{
+    const URI_INDEX_TBANNER = '/shops/service/v1/searchbanner';
+    
+    public static function getIndexData($customCondition, $customOptions) 
+    {
+        $urlList = array();
+        $searchCondition = SearchModel::searchCondition($customCondition, $customOptions);
+        
+        // 组合搜索商品url
+        $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
+        
+        // 组合搜索分类url
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        
+        //用户浏览记录
+        //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
+        
+        //批量调接口获取数据
+        $result = Yohobuy::getMulti($urlList, array(), true);
+        
+        //调用接口获取list-index banner数据
+        $msort = isset($searchCondition['condition']['msort']) ? $searchCondition['condition']['msort'] : false;
+        $misort = isset($searchCondition['condition']['misort']) ? $searchCondition['condition']['misort'] : false;
+        $gender = $searchCondition['condition']['gender'] == '2,3' ? 2 : 1;
+        if ($msort && $misort) {
+            $bannerData = Yohobuy::yarClient(Yohobuy::SERVICE_URL . self::URI_INDEX_TBANNER, 'get', array(10,$msort,$misort,$gender,0,0,0,0,0));
+        }
+        
+        // 组织模板数据
+        $data = HelperSearch::getList($result, $searchCondition['options']);
+            
+        return $data;
+    }
+    
+}

@@ -43,7 +43,6 @@ class SaleModel
             }
              $special = $specialInfo['data'];
         }
-        
         //Sale首页 banner数据
         $data['saleBanner']['bannerHeight'] = $special['banner'][0]['height'];
         $data['saleBanner']['img'] = $special['banner'][0]['img'];
@@ -51,8 +50,10 @@ class SaleModel
         $data['saleTitle']['count'] = $data['totalCount'];
         
          //获取广告位数据
-        $nodeContent = HelperSearch::formatNodeContent($special['left_ad_code']);
-        $data['leftContent'][]['picLink']['list'] = $nodeContent;
+        if (isset($special['left_ad_code'])) {
+            $nodeContent = HelperSearch::formatNodeContent($special['left_ad_code']);
+            $data['leftContent'][]['picLink']['list'] = $nodeContent;
+        }
         
         return $data;
     }

@@ -5,7 +5,17 @@ class ListController extends WebAction
 {
     public function indexAction()
     {
+        $condition = array();
+        $options = array();
+        $indexData = Product\IndexModel::getIndexData($condition, $options);
         
+        $data = array(
+            //初始化js
+            'productListPage' => true,
+            'list' => $indexData
+        );
+        $this->setWebNavHeader();
+        $this->_view->display('list', $data);
     }
 
     /**