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

@@ -219,9 +219,9 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
     $(this).removeClass('highlight');
     $(this).removeClass('highlight');
 });
 });
 
 
-// $('.nav-home').on('touchstart', function() {
-//     $('.homebuttom').toggleClass('none');
-// });
+$('.nav-home').on('touchstart', function() {
+    $('.homebuttom').toggleClass('none');
+});
 
 
 (function() {
 (function() {
     var lastTime = 0,
     var lastTime = 0,

@@ -63,7 +63,7 @@ $sideNav.on('touchstart', 'li', function(e) {
 });
 });
 
 
 $sideNav.on('touchmove', function(e) {
 $sideNav.on('touchmove', function(e) {
-    e.stopPropagation();
+    return false;
 });
 });
 
 
 //返回一级导航，收起二级导航
 //返回一级导航，收起二级导航

@@ -126,7 +126,7 @@
     width: 100%;
     width: 100%;
     height: 90rem / $pxConvertRem;
     height: 90rem / $pxConvertRem;
     overflow: hidden;
     overflow: hidden;
-    border-top: 1px solid #fff;
+    border-top: 1px solid rgba(255,255,255,0.5);
     color: #fff;
     color: #fff;
 
 
     &.boys {
     &.boys {

@@ -97,7 +97,7 @@
             float: left;
             float: left;
             color: #fff;
             color: #fff;
             font-size: pxToRem(28px);
             font-size: pxToRem(28px);
-            width: pxToRem(320px);
+            width: pxToRem(212px);
             // width: pxToRem(213px); 三栏宽度
             // width: pxToRem(213px); 三栏宽度
 
 
             &.highlight {
             &.highlight {

@@ -62,8 +62,6 @@ $border_color_light: #eee;
     background-color: #fff;
     background-color: #fff;
     padding-left: 40rem / $pxConvertRem;
     padding-left: 40rem / $pxConvertRem;
     font-size: 40rem / $pxConvertRem;
     font-size: 40rem / $pxConvertRem;
-    color: #4f4f4f;
-
   }
   }
 
 
   .detail {
   .detail {

@@ -28,14 +28,10 @@
                 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
                 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
                 <p>收藏的品牌</p>
                 <p>收藏的品牌</p>
             </a>
             </a>
-            {{!
             <a class="link-item tap-hightlight" href="/home/record">
             <a class="link-item tap-hightlight" href="/home/record">
-                <!-- product_browse -->
-
+                {{#isLogin}}{{product_browse}}{{/isLogin}}
                 <p>浏览记录</p>
                 <p>浏览记录</p>
             </a>
             </a>
-            }}
-
         </div>
         </div>
         <div class="my-order">
         <div class="my-order">
             <a class="order-title"  href="/home/orders">
             <a class="order-title"  href="/home/orders">