完成new页面

@@ -2,11 +2,10 @@
 
 
 namespace Product;
 namespace Product;
 
 
-use LibModels\Wap\Product\SearchData;
-use LibModels\Web\Product\SearchData as WebProduct;
 use Plugin\HelperSearch;
 use Plugin\HelperSearch;
-use \LibModels\Web\Product\SearchData as Search;
-use Plugin\Images;
+use Product\SearchModel;
+use Api\Yohobuy;
+
 /**
 /**
  * sale首页模板数据模型
  * sale首页模板数据模型
  *
  *
@@ -14,31 +13,22 @@ use Plugin\Images;
 class NewModel 
 class NewModel 
 {
 {
 
 
-    public static function getNewSearchData($params, $options) 
+    public static function getNewSearchData($customCondition, $customOptions) 
     {
     {
-        $data = array();
-        // 调用接口查询商品数据
-        $result = SearchData::searchElasticByCondition($params);
-        if (isset($result['code']) && $result['code'] === 200) {
-            // 调用分类信息
-            $category = Search::getClassesData();
-            if (isset($category['code']) && $category['code'] === 200) {
-                $result['data']['filter']['group_sort'] = $category['data']['sort'];
-            }
-            // 调用折扣区间
-            $discount = Search::getDiscount();
-            if (isset($discount['code']) && $discount['code'] === 200) {
-                $result['data']['filter']['discount'] = $discount['data']['discount'];
-            }
-            // 调用最新上架
-            $recent = Search::recentShelve();
-            if (isset($discount['code']) && $discount['code'] === 200) {
-                $result['data']['filter']['recent'] = $recent['data']['recent'];
-            }
+        $urlList = array();
+        $searchCondition = SearchModel::searchCondition($customCondition, $customOptions);
+        // 组合搜索商品url
+        $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
+        // 组合搜索分类url
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        // 组合搜索最新上架url
+        $urlList['recent'] = HelperSearch::getRecentShelveUrl($searchCondition['condition']);
         //用户浏览记录
         //用户浏览记录
-            $result['data']['filter']['review'] = Search::getRecentReview();
+        //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
+
+        $result = Yohobuy::getMulti($urlList, array(), true);
         // 组织模板数据
         // 组织模板数据
-            $data = HelperSearch::getList($result, $options);
+        $data = HelperSearch::getList($result, $searchCondition['options']);
         
         
         //new页面模拟数据
         //new页面模拟数据
             $data['newMain'] = array(
             $data['newMain'] = array(
@@ -72,12 +62,8 @@ class NewModel
                         )
                         )
                     )
                     )
             );
             );
-        }
             
             
-        return array(
-            'productListPage' => true,
-            'newSale' => $data
-        );
+        return $data;
     }
     }
     
     
 }
 }

+<?php
+
+use Action\WebAction;
+
+/**
+ * new页
+ *
+ */
+class NewController extends WebAction 
+{
+
+    public function indexAction() 
+    {
+        $condition = array(
+            'order' => 's_t_desc'
+        );
+        $options = array(
+            'specialsale_id' => 'Y',
+            'needDay' => 'Y'
+        );
+        
+        $newData = Product\NewModel::getNewSearchData($condition, $options);
+        $data = array(
+            'productListPage' => true,
+            'newSale' => $newData
+        );
+        $this->setWebNavHeader();
+        //渲染模板
+        $this->_view->display('new-sale', $data);
+    }
+
+}

-<?php
-
-use Action\WebAction;
-use LibModels\Web\Product\SaleData;
-
-/**
- * new页
- *
- */
-class NewController extends WebAction 
-{
-
-    public function indexAction() 
-    {
-        /* 过滤请求参数 */
-        $condition = array();
-        $condition = filter_input_array(INPUT_GET, array(
-            //'query' => FILTER_SANITIZE_STRING,
-            'sort' => FILTER_VALIDATE_INT,
-            'msort' => FILTER_VALIDATE_INT,
-            'misort' => FILTER_VALIDATE_INT,
-            'color' => FILTER_VALIDATE_INT,
-            'size' => FILTER_VALIDATE_INT,
-            'style' => FILTER_DEFAULT,
-            'price' => FILTER_DEFAULT,
-            'gender' => FILTER_DEFAULT,
-            'p_d' => FILTER_DEFAULT,
-            'shelve_time' => FILTER_DEFAULT,
-            'isNew' => FILTER_DEFAULT,
-            'specialoffer' => FILTER_DEFAULT,
-            'limited' => FILTER_DEFAULT,
-            'order' => FILTER_DEFAULT,
-            'viewNum' => FILTER_VALIDATE_INT,
-            'rowNum' => FILTER_VALIDATE_INT,
-            'page' => FILTER_VALIDATE_INT,), false);
-        
-        //字符转码
-        if (!empty($condition)) {
-            foreach ($condition as &$value) {
-                $value = rawurldecode($value);
-            }
-        }
-        
-        //获取性别数据
-        $gender = $this->get('gender') ? ($this->get('gender') == '2,3' ? 2 : 1) : (!isset($_COOKIE['_Gender']) ? '3' : ($_COOKIE['_Gender'] == '2,3' ? 2 : 1));
-        $condition['gender'] = $gender;
-        
-        //每页显示商品数
-        if (!isset($condition['viewNum']) || empty($condition['viewNum'])) {
-            $condition['viewNum'] = 60;
-        }   
-        $view_num_arr = array(60, 100, 200);
-        if (!in_array($condition['viewNum'], $view_num_arr)) {
-            $condition['viewNum'] = 60;
-        }
-        //每行显示的商品数量
-        if (!isset($condition['rowNum']) || empty($condition['rowNum'])) {
-            $condition['rowNum'] = 5;
-        }
-        if ($condition['rowNum'] == 6) {
-            $imgSize = array(195, 260);
-            $minImgSize = array(50, 67);
-        } else {
-            $condition['rowNum'] = 5;
-            $imgSize = array(235, 314);
-            $minImgSize = array(60, 80);
-        }
-        //搜索词
-        //$query = $this->get('query');
-        $condition['needFilter'] = 1;
-        $options = array(
-            'imgSize' => $imgSize,
-            'minImgSize' => $minImgSize,
-            'gender' => $gender,
-            'needPd' => 'Y',
-            'rowNum' => $condition['rowNum'],
-            'viewNum' => $condition['viewNum'],
-            'specialsale_id' => 'Y'
-        );
-        
-        $params = $condition + $_GET;
-        $params['attribute_not'] = 2;
-        $params = array_filter($params);
-        //每页记录数减1，下一页占位
-        $params['viewNum'] = $params['viewNum'] - 1;
-        
-        $data = Product\NewModel::getNewSearchData($params, $options);
-        $cate = array('boys', 'girls', 'kids', 'lifestyle');
-        $this->setWebNavHeader($cate[$gender - 1]);
-        //渲染模板
-        $this->_view->display('new-sale', $data);
-    }
-
-}