搜索页添加是否搜索店铺信息判断

@@ -102,9 +102,6 @@ class SearchModel
         if (!isset($condition['order']) || empty($condition['order'])) {
         if (!isset($condition['order']) || empty($condition['order'])) {
             $condition['order'] = 's_n_desc';
             $condition['order'] = 's_n_desc';
         }
         }
-        if (!isset($condition['p_d']) || empty($condition['p_d'])) {
-            $condition['p_d'] = '0,0.9';
-        }
         $options = array(
         $options = array(
             'imgSize' => $imgSize,
             'imgSize' => $imgSize,
             'minImgSize' => $minImgSize,
             'minImgSize' => $minImgSize,
@@ -168,8 +165,10 @@ class SearchModel
         // 组合搜索分类url
         // 组合搜索分类url
         $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
         $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
         // 组合搜索店铺url
         // 组合搜索店铺url
-        $param['keyword'] = $searchCondition['condition']['query'];
-        $urlList['shop'] = HelperSearch::getShopUrl($param);
+        if (isset($param['keyword'])) {
+            $param['keyword'] = $searchCondition['condition']['query'];
+            $urlList['shop'] = HelperSearch::getShopUrl($param);
+        }
         //用户浏览记录
         //用户浏览记录
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
         $result = Yohobuy::getMulti($urlList, array(), true);
         $result = Yohobuy::getMulti($urlList, array(), true);

@@ -17,7 +17,11 @@ class ListController extends WebAction
      */
      */
     public function saleAction()
     public function saleAction()
     {
     {
-        $list = SearchModel::getListData();
+        //排序
+        $condition['order'] = 's_n_desc';
+        //打折
+        $condition['p_d'] = '0,0.9';
+        $list = SearchModel::getListData($condition);
         $data = array(
         $data = array(
             //初始化js
             //初始化js
             'productListPage' => true,
             'productListPage' => true,