Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -323,7 +323,7 @@
 ### 编辑页
 
     {
-        author: {
+        authorInfo: {
             avatar: '',
             name: '',
             info: ''
@@ -747,7 +747,8 @@
             brandHome: {
                 id: 0,
                 banner: ''
-                intro: '...'
+                intro: '...',
+                collected: true //是否已收藏
             },
             new: [
                 {

- Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
+ Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05

@@ -73,18 +73,20 @@ navHammer.on('tap', function(e) {
     $this.addClass('focus');
     $curNav.removeClass('focus');
 
-    $infos.not('.hide').addClass('hide');
-
     $content = $infos.eq(index);
-    $content.removeClass('hide');
 
     $curNav = $this;
     curType = $this.data('type');
 
     //当未加载数据时去请求数据
     if (state[curType].page === 1) {
+
+        //无数据时隐藏正在加载和没有更多字样
+        $loading.addClass('hide');
+        $noMore.addClass('hide');
+
         loadMore($content, state[curType]);
-    }
+    } else {
 
         //重置当前Tab的load-more
         if (state[curType].end) {
@@ -94,6 +96,14 @@ navHammer.on('tap', function(e) {
             $loading.removeClass('hide');
             $noMore.addClass('hide');
         }
+    }
+
+    $infos.not('.hide').addClass('hide');
+    $content.removeClass('hide');
+
+    if (state[curType].page === 1) {
+        window.rePosFooter();//进入空内容时重新定位footer位置
+    }
 });
 
 $(document).scroll(function() {

@@ -128,6 +128,7 @@ function loadMore($container, opt) {
 
                 return;
             }
+
             $container.append(data);
 
             if (num > 0) {
@@ -140,6 +141,10 @@ function loadMore($container, opt) {
 
             if (opt.page === 1) {
                 loading.hideLoadingMask();
+
+                $loading.removeClass('hide');//显示空屏加载时hide的隐藏
+
+                window.rePosFooter();//插入内容后重新计算底部位置
             }
 
             opt.page++;

@@ -2,7 +2,7 @@
     float: left;
     width: 276rem / $pxConvertRem;
     height: 486rem / $pxConvertRem;
-    margin: 0 (15rem / $pxConvertRem) (28rem / $pxConvertRem);
+    margin: 0 (15rem / $pxConvertRem) (15rem / $pxConvertRem);
 
     .tag-container {
         height: 28rem / $pxConvertRem;

 .loading-mask {
-    position: absolute;
+    position: fixed;
     background: rgba(0,0,0,.1);
     top: 0;
     bottom: 0;

@@ -112,11 +112,8 @@
     .goods-container {
         position: relative;
         min-height: 440px;
-
-        .container {
-            padding-left: 10px;
-            margin-top: 9px;
-        }
+        padding-left: 0.375rem;
+        padding-top: 0.2rem;
     }
 
 }

@@ -73,6 +73,7 @@
         > img {
             display: block;
             height: 100%;
+            width: 100%;
         }
     }
 
@@ -100,6 +101,18 @@
         .iconfont {
             font-size: 12px;
         }
+
+        &.coled {
+            opacity: 0.5;
+        }
+
+        .txt:after {
+            content: '收藏'
+        }
+
+        &.coled .txt:after {
+            content: '已收藏'
+        }
     }
 
     .brand-intro-box {
@@ -228,5 +241,7 @@
     .goods-container {
         position: relative;
         min-height: 440px;
+        padding-left: 0.375rem;
+        padding-top: 0.2rem;
     }
 }
\ No newline at end of file

@@ -84,6 +84,8 @@
     .goods-container {
         position: relative;
         min-height: 440px;
+        padding-left: 0.375rem;
+        padding-top: 0.2rem;
     }
  
 }

@@ -83,4 +83,3 @@
     </div>
 </div>
 {{> layout/footer}}
-{{> layout/download_app}}

@@ -19,4 +19,3 @@
     {{{brandList}}}
 </script>
 {{> layout/footer}}
-{{> layout/download_app}}

@@ -41,4 +41,3 @@
     {{/ category}}
 </div>
 {{> layout/footer}}
\ No newline at end of file
-{{> layout/download_app}}
\ No newline at end of file

@@ -15,7 +15,7 @@
             <div class="swiper-pagination"></div>
         </div>
 
-        {{# author}}
+        {{# authorInfo}}
             <div id="author-infos" class="editor-header clearfix" data-id={{id}}>
                 <div class="avatar">
                     <img src="{{avatar}}">
@@ -25,7 +25,7 @@
                     <p class="info">{{info}}</p>
                 </div>
             </div>
-        {{/ author}}
+        {{/ authorInfo}}
 
         <ul id="guang-nav" class="guang-nav clearfix">
             {{# navs}}
@@ -37,7 +37,7 @@
         
         <div id="info-list" class="info-list-container">
             {{# infos}}
-                <div class="info-list {{^show}}hide{{/show}}">
+                <div class="info-list{{^show}} hide{{/show}}">
                     {{# info}}
                         {{> guang/info}}
                     {{/ info}}

@@ -25,4 +25,3 @@
     </div>
 </div>
 {{> layout/footer}}
\ No newline at end of file
-{{> layout/download_app}}
\ No newline at end of file

@@ -3,4 +3,3 @@
     {{> product/list}}
 </div>
 {{> layout/footer}}
\ No newline at end of file
-{{> layout/download_app}}
\ No newline at end of file

@@ -85,4 +85,3 @@
     {{> product/suspend-cart}}
 </div>
 {{> layout/footer}}
\ No newline at end of file
-{{> layout/download_app}}
\ No newline at end of file

@@ -96,4 +96,3 @@
     {{> product/suspend-cart}}
 </div>
 {{> layout/footer}}
\ No newline at end of file
-{{> layout/download_app}}
\ No newline at end of file

@@ -29,9 +29,9 @@
             <a class="btn-intro" href="javascript:void(0);">
                 品牌介绍
             </a>
-            <a class="btn-col" href="javascript:void(0);">
+            <a class="btn-col{{#if collected}} coled{{/if}}" href="javascript:void(0);">
                 <span class="iconfont">&#xe622;</span>
-                收藏
+                <span class="txt"></span>
             </a>
         </div>
         <div id="intro-box" class="brand-intro-box hide">