Merge branch 'hotfix/plusstarFooter'

@@ -12,10 +12,6 @@
 	{{/if}}
 	{{/if}}
 	<!--/tab-nav-->
 	<!--/tab-nav-->
 
 
-	{{#if isApp}}
-		<div class='empty-height'></div>
-	{{/if}}
-
     <div class="plusstar-resources">
     <div class="plusstar-resources">
     	<!--资源位数据模板-->
     	<!--资源位数据模板-->
 	</div><!--/plusstar-resources-->
 	</div><!--/plusstar-resources-->

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "5.1.9",
+  "version": "5.1.10",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -4,8 +4,7 @@ var $ = require('yoho-jquery'),
     loading = require('../plugin/loading'),
     loading = require('../plugin/loading'),
     debounce = require('lodash/debounce');
     debounce = require('lodash/debounce');
 
 
-var plusstar = {},
-    $footer = $('#yoho-footer');
+var plusstar = {};
 
 
 var windowHeight = $(window).height();
 var windowHeight = $(window).height();
 var scrollFn,
 var scrollFn,
@@ -186,6 +185,9 @@ plusstar = {
                     return true;
                     return true;
                 }
                 }
 
 
+                // 固定底部去除
+                window.rePosFooter();
+
                 // 记录切换tab位置
                 // 记录切换tab位置
                 $(document).scrollTop(window.cookie(code) || 0);
                 $(document).scrollTop(window.cookie(code) || 0);
 
 
@@ -303,23 +305,17 @@ $(function() {
             apt: window.queryString.client_type || '',
             apt: window.queryString.client_type || '',
             sid: window.queryString.session_id || '',
             sid: window.queryString.session_id || '',
         };
         };
-    }
-
-    // 男:1，女:2，潮童:3，创意生活:4
-    speckParamApp.CID = window.queryString.yh_channel || window._ChannelVary[window.cookie('_Channel')] || 1;
 
 
-    if (!isApp) {
+        $('.plusstar-resources').css({'margin-top': $('.tab-nav').height()});
+    } else {
         $('.tab-nav').css({
         $('.tab-nav').css({
             position: 'relative'
             position: 'relative'
         });
         });
-
-        $footer.css({
-            'max-width': '650px'
-        }).before(
-            '<div style="height: ' + parseInt($footer.css('height'), 0) + 'px"></div>'
-        );
     }
     }
 
 
+    // 男:1，女:2，潮童:3，创意生活:4
+    speckParamApp.CID = window.queryString.yh_channel || window._ChannelVary[window.cookie('_Channel')] || 1;
+
     plusstar.init();
     plusstar.init();
 
 
     // 滚动翻页
     // 滚动翻页

@@ -18,12 +18,13 @@
         position: fixed;
         position: fixed;
         z-index: 10;
         z-index: 10;
         background-color: #fff;
         background-color: #fff;
+        top: 0;
 
 
         li {
         li {
             display: block;
             display: block;
             float: left;
             float: left;
             height: 100%;
             height: 100%;
-            width: 33.33%;
+            width: 50%;
             line-height: 60px;
             line-height: 60px;
             color: #999;
             color: #999;
             white-space: nowrap;
             white-space: nowrap;