店铺装修 商品总数

@@ -200,6 +200,7 @@ class ShopModel
 
         $data['goods'] = $result['goods'];
         $data['opts'] = $result['opts'];
+        $data['totalCount'] = $result['totalCount'];//商品总数
         $data['leftContent'] = isset($result['leftContent']) ? $result['leftContent'] : '';
         $data['filters'] = $result['filters'];
         $data['pathNav'] = array_merge(
@@ -227,6 +228,7 @@ class ShopModel
         $urlList['product'] = SearchData::getProductUrl($searchCondition['condition']);
         // 组合搜索分类url
         $sortCondition = array();
+        $sortCondition['brand'] = self::getShopsBrandIds($condition['shop']);
         if (isset($searchCondition['condition']['misort']) && !empty($searchCondition['condition']['misort'])) {
             $sortCondition['needSmallSort'] = 1;
         }