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

 var $ = require('jquery'),
     Hammer = require('yoho.hammer'),
     Swiper = require('yoho.iswiper'),
-    lazyLoad = require('yoho.lazyload')
-
-loading = require('../../plugin/loading');;
+    lazyLoad = require('yoho.lazyload'),
+    loading = require('../../plugin/loading');
 
 var page = 1,
     winH,

@@ -17,4 +17,4 @@
 		<p>有效期:2014.07.28 - 2014.09.15</p>
 	</div>
 </div>
-{{> layout/not-footer}}
\ No newline at end of file
+{{> layout/footer}}
\ No newline at end of file

@@ -3,7 +3,7 @@
         <ul>
             <li><span>头像</span><span><i class="head-portrait"><img src="{{ head_ico }}"></i></span></li>
             <li><span>昵称</span><span>{{ username }}</span></li>
-            <li><span>性别</span><span></span></li>
+            <li><span>性别</span><span>{{ gender }}</span></li>
             <li><span>生日</span><span>{{ birthday }}</span></li>
             <li><span>会员等级</span>
                 <span>

@@ -2,10 +2,10 @@
  <div class="s-goods-nav goods-nav">
     <ul class="swiper-wrapper clearfix">
     {{# tabs}}
-            {{# title}}
-                <li class="swiper-slide nav-item">
-                    <span data-sort="{{ params}}" data-id="{{ id}}" >{{ name}}</span>
-                </li>
+        {{# title}}
+            <li class="swiper-slide nav-item {{#if @first}} active{{/if}}">
+                <span data-sort="{{ params}}" data-id="{{ id}}" >{{ name}}</span>
+            </li>
             {{/ title}}
     {{/ tabs}}
     </ul>

-
-{{#if hasWxShare}}
-    <script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
-{{/if}}
-{{#if rlsEnv}}
-<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
-<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
-{{/if}}
-{{#if preEnv}}
-<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
-<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
-{{/if}}
-{{#if testEnv}}
-<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/lib.js"></script>
-<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script>
-{{/if}}
-{{#if devEnv}}
-<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
-<script>seajs.config({base: 'http://localhost:8000/'});</script>
-{{/if}}
-
-<script type="text/javascript">
-    (function(w,d,s,j,f){
-        w['YohoAcquisitionObject']=f;
-        w[f]=function(){w[f].p=arguments;};
-        var a=d.createElement(s);
-        var m=d.getElementsByTagName(s)[0];
-        a.async=1;
-        a.src=j;
-        m.parentNode.insertBefore(a,m);
-    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13/yas.js','_yas');
-</script>
-
-{{> layout/use}}
-
-{{> layout/analysis}}
-</body>
-</html>
\ No newline at end of file

@@ -112,7 +112,6 @@ class NewsaleController extends AbstractAction
 			$gender = Helpers::getGenderByCookie();
 			$result = \Product\NewsaleModel::selectTopData($gender, $sort, $tab_id, $notab, $limit, $page);
 		}
-
 		if (empty($result)) {
 			echo ' ';
 		} else {