fix bugs

@@ -40,7 +40,7 @@ const Query = {
                     name: query ? `"${query}" 共${data.total}个结果` : `共${data.total || 0}个结果`
                     name: query ? `"${query}" 共${data.total}个结果` : `共${data.total || 0}个结果`
                 });
                 });
 
 
-                if (data.filter) {
+                if (data.filter && data.total) {
                     data.filter.standard = data.standard;
                     data.filter.standard = data.standard;
 
 
                     retData.filter = DataHelper.filterHandle(data.filter, q);
                     retData.filter = DataHelper.filterHandle(data.filter, q);

@@ -246,7 +246,7 @@ const helpers = {
         let filters = [];
         let filters = [];
         let customPriceLow = '';
         let customPriceLow = '';
         let customPriceHigh = '';
         let customPriceHigh = '';
-        let showSize = (!!q.msort || !!q.misort) && sizeInfo;
+        let showSize = (!!q.msort || !!q.misort || !!q.sort) && sizeInfo;
 
 
         genders.forEach(g => {
         genders.forEach(g => {
             if (g.value === q.gender) {
             if (g.value === q.gender) {

@@ -208,7 +208,7 @@ const setPathNav = (data, name, channel) => {
             link: helpers.urlFormat(`/${link}`),
             link: helpers.urlFormat(`/${link}`),
             name: `${_.toUpper(channel)}首页`
             name: `${_.toUpper(channel)}首页`
         }];
         }];
-        let sort = data.sort[0];
+        let sort = data.sort[0] || {};
 
 
         navs.push({
         navs.push({
             link: helpers.urlFormat('/list', {
             link: helpers.urlFormat('/list', {

@@ -132,6 +132,7 @@ const ShopService = {
                 info.brandId = domainInfo.id;
                 info.brandId = domainInfo.id;
                 info.shopId = domainInfo.shopId;
                 info.shopId = domainInfo.shopId;
                 info.brandBanner = domainInfo.brandBanner;
                 info.brandBanner = domainInfo.brandBanner;
+                info.info = domainInfo.brandIntro;
             }
             }
 
 
             if (info.shopId) {
             if (info.shopId) {
@@ -160,7 +161,7 @@ const ShopService = {
                 let brandInfo = yield BrandService.getBrandInfo(info.brandId, uid);
                 let brandInfo = yield BrandService.getBrandInfo(info.brandId, uid);
 
 
                 info.name = brandInfo.brandName;
                 info.name = brandInfo.brandName;
-                info.info = brandInfo.brandIntro;
+                // info.info = brandInfo.brandIntro;
                 info.btnName = '品牌介绍';
                 info.btnName = '品牌介绍';
                 info.isFavorite = brandInfo.isFavorite === 'Y';
                 info.isFavorite = brandInfo.isFavorite === 'Y';
                 info.banner = info.brandBanner;
                 info.banner = info.brandBanner;

@@ -6,29 +6,30 @@
     </div>
     </div>
 
 
     <div class="center-content clearfix">
     <div class="center-content clearfix">
-        <div class="left">
-            {{!-- 筛选区域 --}}
-            {{#filter}}
+        {{#filter}}
+            <div class="left">
+                {{!-- 筛选区域 --}}
                 {{> list/filter}}
                 {{> list/filter}}
-            {{/filter}}
-        </div>
-        <div class="right">
-            {{!-- 已选中条件 --}}
-            {{#filter}}
-                {{> list/filter-area}}
-            {{/filter}}
-            {{#if paginationData.total}}
-            {{!-- 排序 --}}
+            </div>
+        {{/filter}}
+        {{#if paginationData.total}}
+            <div class="right">
+                {{!-- 已选中条件 --}}
+                {{#filter}}
+                    {{> list/filter-area}}
+                {{/filter}}
+
+                {{!-- 排序 --}}
                 {{> list/order-area}}
                 {{> list/order-area}}
                 {{!-- 商品列表 --}}
                 {{!-- 商品列表 --}}
                 {{> list/goods-box}}
                 {{> list/goods-box}}
                 {{!-- 分页 --}}
                 {{!-- 分页 --}}
                 {{{ pagination paginationData }}}
                 {{{ pagination paginationData }}}
-            {{^}}
-                {{!-- 空结果 --}}
-                {{> list/empty}}
-            {{/if}}
-        </div>
+            </div>
+        {{^}}
+        {{!-- 空结果 --}}
+            {{> list/empty}}
+        {{/if}}
     </div>
     </div>
 
 
 
 

@@ -13,7 +13,7 @@
             </a>
             </a>
 
 
             <span id="brand-fav" class="brand-fav{{#if isFavorite}} coled{{/if}}">
             <span id="brand-fav" class="brand-fav{{#if isFavorite}} coled{{/if}}">
-                {{> icon/collection}}
+                <i class="iconfont">&#xe627;</i>
             </span>
             </span>
         </p>
         </p>
     </div>
     </div>

@@ -203,3 +203,5 @@
     </div>
     </div>
 
 
 {{/if}}
 {{/if}}
+
+<div class="blank-div" style="margin-bottom: 10px;"></div>

@@ -31,6 +31,10 @@
             color: #999;
             color: #999;
         }
         }
 
 
+        .checkbox {
+            font-size: 14px;
+        }
+
         .checked {
         .checked {
             color: #1b1b1b;
             color: #1b1b1b;
         }
         }
@@ -315,7 +319,7 @@
 
 
             .goods-brand {
             .goods-brand {
                 font-weight: 700;
                 font-weight: 700;
-                padding: 10px;
+                padding: 10px 10px 4px;
                 overflow: hidden;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 white-space: nowrap;
@@ -344,7 +348,7 @@
             }
             }
 
 
             .goods-name {
             .goods-name {
-                padding: 4px 10px 10px;
+                padding: 10px;
                 width: 263px;
                 width: 263px;
                 overflow: hidden;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 text-overflow: ellipsis;