Merge branch 'hotfix/shopSide'

 {{#brandBrowse}}
 {{#brandBrowse}}
     <div class="brand-collect left-modular">
     <div class="brand-collect left-modular">
+        {{#if title}}
             <h2 class="title">{{title}}</h2>
             <h2 class="title">{{title}}</h2>
+        {{/if}}
         <ul class="left-list">
         <ul class="left-list">
             {{#each list}}
             {{#each list}}
                 <li class="{{#if cur}} on {{/if}}"><a href="{{url}}">{{brandName}}</a></li>
                 <li class="{{#if cur}} on {{/if}}"><a href="{{url}}">{{brandName}}</a></li>
@@ -11,7 +13,9 @@
 
 
 {{#recommend}}
 {{#recommend}}
     <div class="classic-recommend left-modular">
     <div class="classic-recommend left-modular">
+        {{#if title}}
             <h2 class="title">{{title}}</h2>
             <h2 class="title">{{title}}</h2>
+        {{/if}}
         <ul class="left-list">
         <ul class="left-list">
             {{#each list}}
             {{#each list}}
                 <li>
                 <li>
@@ -34,7 +38,9 @@
 
 
 {{#hotRecommend}}
 {{#hotRecommend}}
     <div class="sell-recommend left-modular">
     <div class="sell-recommend left-modular">
+        {{#if title}}
             <h2 class="title">{{title}}</h2>
             <h2 class="title">{{title}}</h2>
+        {{/if}}
         <ul class="left-list">
         <ul class="left-list">
             {{#each list}}
             {{#each list}}
                 <li>
                 <li>

@@ -302,11 +302,11 @@ class ShopModel
         $result = array(
         $result = array(
             'banner' => '',
             'banner' => '',
             'isShowShopName' => false,
             'isShowShopName' => false,
-            'bannerHeight' => 150
+            'bannerHeight' => 200
         );
         );
 
 
         if (!empty($data['resource_data'][0]['shopSrc'])) {
         if (!empty($data['resource_data'][0]['shopSrc'])) {
-            $result['banner'] = self::imageView2($data['resource_data'][0]['shopSrc'], 1150, 150);
+            $result['banner'] = self::imageView2($data['resource_data'][0]['shopSrc'], 1150, 200);
         }
         }
 
 
         if (!empty($data['resource_data'][0]['detailSrc'])) {
         if (!empty($data['resource_data'][0]['detailSrc'])) {
@@ -479,7 +479,7 @@ class ShopModel
         }
         }
 
 
         return array(
         return array(
-            'title' => isset($result[0]['title']) ? $result[0]['title'] : '经典推荐',
+            'title' => isset($result[0]['title']) ? $result[0]['title'] : '',
             'list' => $result
             'list' => $result
         );
         );
     }
     }
@@ -505,7 +505,7 @@ class ShopModel
         }
         }
 
 
         return array(
         return array(
-            'title' => isset($result[0]['title']) ? $result[0]['title'] : '热销推荐',
+            'title' => isset($result[0]['title']) ? $result[0]['title'] : '',
             'list' => $result
             'list' => $result
         );
         );
     }
     }
@@ -561,12 +561,16 @@ class ShopModel
                     ),
                     ),
                     ''
                     ''
                 ),
                 ),
+                'title' => $resource['title'],
                 'brandName' => $resource['brandName'],
                 'brandName' => $resource['brandName'],
                 'cur' => ($brand === strval($resource['id']))
                 'cur' => ($brand === strval($resource['id']))
             );
             );
         }
         }
 
 
-        return array('title' => '品牌集合', 'list' => $result);
+        return array(
+            'title' => isset($result[0]['title']) ? $result[0]['title'] : '',
+            'list' => $result
+        );
     }
     }
 
 
     /**
     /**