Merge branch 'develop' into test

@@ -146,7 +146,10 @@ function rePosFooter() {
     var uid = getUid();
     var uid = getUid();
 
 
     uid = uid === 0 ? '' : uid;
     uid = uid === 0 ? '' : uid;
-    window._yas(1 * new Date(), '1.0.8', 'yohobuy_m', uid, '');
+
+    if (window._yas) {
+        window._yas(1 * new Date(), '1.0.8', 'yohobuy_m', uid, '');
+    }
 }());
 }());
 
 
 
 

@@ -86,9 +86,7 @@ likeHammer.on('tap', function(e) {
             if (data.code === 200) {
             if (data.code === 200) {
                 $this.toggleClass('like');
                 $this.toggleClass('like');
             } else if (data.code === 400 || data.code === 412) {
             } else if (data.code === 400 || data.code === 412) {
-
-                //code:412 用户ID不正确，即未登录
-                tip.show('未登录');
+                location.href = data.data; //未登录跳转登录页面
             } else {
             } else {
                 tip.show(data.message);
                 tip.show(data.message);
             }
             }

@@ -104,6 +104,8 @@ function initFilter(opt) {
         var $this = $(e.target),
         var $this = $(e.target),
             $cur;
             $cur;
 
 
+        e.preventDefault();//防止透点
+
         if ($this.closest('.filter-body').length > 0) {
         if ($this.closest('.filter-body').length > 0) {
             $cur = $this.closest('.sub-item');
             $cur = $this.closest('.sub-item');
             if ($cur.length > 0) {
             if ($cur.length > 0) {

@@ -401,7 +401,7 @@ if ($brandHeader.length > 0) {
                 if (data.code === 200) {
                 if (data.code === 200) {
                     $this.toggleClass('coled');
                     $this.toggleClass('coled');
                 } else if (data.code === 400 || data.code === 412) {
                 } else if (data.code === 400 || data.code === 412) {
-                    tip.show('未登录');
+                    location.href = data.data;//未登录跳转登录页
                 } else {
                 } else {
                     tip.show(data.message);
                     tip.show(data.message);
                 }
                 }

@@ -184,10 +184,19 @@
             color: #999;
             color: #999;
         }
         }
 
 
+        .nav-txt {
+            display: inline-block;
+            height: 100%;
+            box-sizing: border-box;
+        }
+
         .active > a {
         .active > a {
-            border-bottom: 2px solid #000;
             color: #000;
             color: #000;
 
 
+            .nav-txt {
+                border-bottom: 2px solid #000;
+            }
+
             .iconfont {
             .iconfont {
                 color: #999;
                 color: #999;
 
 

@@ -52,13 +52,13 @@
     <ul id="list-nav" class="list-nav clearfix">
     <ul id="list-nav" class="list-nav clearfix">
         <li class="new active">
         <li class="new active">
             <a href="javascript:void(0);">
             <a href="javascript:void(0);">
-                最新
+                <span class="nav-txt">最新</span>
                 <span class="iconfont cur">&#xe616;</span>
                 <span class="iconfont cur">&#xe616;</span>
             </a>
             </a>
         </li>
         </li>
         <li class="price">
         <li class="price">
             <a href="javascript:void(0);">
             <a href="javascript:void(0);">
-                价格
+                <span class="nav-txt">价格</span>
                 <span class="icon">
                 <span class="icon">
                     <i class="iconfont up">&#xe615;</i>
                     <i class="iconfont up">&#xe615;</i>
                     <i class="iconfont down cur">&#xe616;</i>
                     <i class="iconfont down cur">&#xe616;</i>
@@ -67,7 +67,7 @@
         </li>
         </li>
         <li class="discount">
         <li class="discount">
             <a href="javascript:void(0);">
             <a href="javascript:void(0);">
-                折扣
+                <span class="nav-txt">折扣</span>
                 <span class="icon">
                 <span class="icon">
                     <i class="iconfont up">&#xe615;</i>
                     <i class="iconfont up">&#xe615;</i>
                     <i class="iconfont down cur">&#xe616;</i>
                     <i class="iconfont down cur">&#xe616;</i>
@@ -76,7 +76,7 @@
         </li>
         </li>
         <li class="filter">
         <li class="filter">
             <a href="javascript:void(0);">
             <a href="javascript:void(0);">
-                筛选
+                <span class="nav-txt">筛选</span>
                 <span class="iconfont">&#xe613;</span>
                 <span class="iconfont">&#xe613;</span>
             </a>
             </a>
         </li>
         </li>