Merge branch 'develop' into test

@@ -10,6 +10,7 @@ var $ = require('jquery'),
     $mobileWrap = $('.mobile-wrap'),
     $mobileWrap = $('.mobile-wrap'),
     $overlay = $('.overlay'),
     $overlay = $('.overlay'),
     $sideNav = $('.side-nav'),
     $sideNav = $('.side-nav'),
+    $subNav = $('.sub-nav'),
     bannerSwiper,
     bannerSwiper,
     recommendSwiper,
     recommendSwiper,
     hotBrandsSwiper,
     hotBrandsSwiper,
@@ -48,8 +49,7 @@ navHammer.on('tap', function(event) {
     return false;
     return false;
 });
 });
 
 
-mobileWrapHammer = new Hammer($('.mobile-wrap')[0]);
-mobileWrapHammer.on('tap', function(e) {
+function hideSideBar() {
     if ($mobileWrap.hasClass('menu-open')) {
     if ($mobileWrap.hasClass('menu-open')) {
         $mobileWrap.removeClass('menu-open');
         $mobileWrap.removeClass('menu-open');
         $overlay.css('opacity', 0);
         $overlay.css('opacity', 0);
@@ -62,28 +62,40 @@ mobileWrapHammer.on('tap', function(e) {
         setTimeout(function() {
         setTimeout(function() {
             $('.overlay').hide();
             $('.overlay').hide();
         }, 300);
         }, 300);
-        e.srcEvent.stopPropagation();
-        return false;
     }
     }
+}
+
+mobileWrapHammer = new Hammer($('.mobile-wrap')[0]);
+mobileWrapHammer.on('tap', function(e) {
+    hideSideBar();
+    e.srcEvent.stopPropagation();
+    return false;
 });
 });
 
 
 //点击一级导航，弹出二级导航
 //点击一级导航，弹出二级导航
-$sideNav.on('touchend', 'li', function () {
+$sideNav.on('touchend', 'li', function (e) {
     if ($(this).find('.sub-nav').size() > 0) {
     if ($(this).find('.sub-nav').size() > 0) {
         $('.sub-nav').removeClass('show');
         $('.sub-nav').removeClass('show');
         $(this).find('.sub-nav').addClass('show');
         $(this).find('.sub-nav').addClass('show');
     }
     }
-    return false;
+    e.stopPropagation();
+    if (e.target.pathname === location.pathname) {
+        hideSideBar();
+        return false;
+    }
 });
 });
 
 
 //返回一级导航，收起二级导航
 //返回一级导航，收起二级导航
-$('.sub-nav').each(function () {
+$subNav.each(function () {
     $(this).find('li').eq(0).on('touchend', function (e) {
     $(this).find('li').eq(0).on('touchend', function (e) {
         $('.sub-nav').removeClass('show');
         $('.sub-nav').removeClass('show');
+        e.stopPropagation();
         return false;
         return false;
     });
     });
-}).on('touchend', function() {
-    $('.sub-nav').find('li').removeClass('current');
+}).on('touchend', function(e) {
+    if (e.currentTarget !== e.target) {
+        $subNav.find('li').removeClass('current');
+    }
 });
 });
 
 
 //头部banner轮播
 //头部banner轮播

@@ -72,9 +72,10 @@
                 height: 158rem / $pxConvertRem;
                 height: 158rem / $pxConvertRem;
             
             
                 .img-box {
                 .img-box {
+                    display: table-cell;
+                    vertical-align: middle;
                     width: 100%;
                     width: 100%;
-                    height: 100%;
-    
+                    height: 158rem / $pxConvertRem;
                 }
                 }
             }
             }
         }
         }

 .side-nav {
 .side-nav {
+    display: block;
     background: #fff;
     background: #fff;
     position: fixed;
     position: fixed;
     top: 0;
     top: 0;
-    right: 640rem / $pxConvertRem;
     bottom: 0;
     bottom: 0;
-    left: 0;
+    // left: 0;
+    right: 640rem / $pxConvertRem;
+    width: 540rem / $pxConvertRem;
     z-index: -1;
     z-index: -1;
     overflow: hidden;
     overflow: hidden;
     @include transition(right .3s);
     @include transition(right .3s);
@@ -115,8 +117,9 @@
     bottom: 0;
     bottom: 0;
     top: 0;
     top: 0;
     left: 0;
     left: 0;
-    width: 100%;
+    width: 540rem / $pxConvertRem;
     background: #fff !important;
     background: #fff !important;
+    overflow: hidden;
 
 
     @include transform(translateX(540rem / $pxConvertRem));
     @include transform(translateX(540rem / $pxConvertRem));
     @include transition(transform 0.3s);
     @include transition(transform 0.3s);

 .search-page {
 .search-page {
     .search-input {
     .search-input {
         position: relative;
         position: relative;
-        padding: 7px 46px 7px 15px;
+        padding: 7px 98px 7px 15px;
         background: #f8f8f8;
         background: #f8f8f8;
 
 
         .search-icon {
         .search-icon {
@@ -16,7 +16,7 @@
             height: 30px;
             height: 30px;
             width: 100%;
             width: 100%;
             border-radius: 15px;
             border-radius: 15px;
-            text-indent: 26px;
+            padding: 0 26px;
             background: #fff;
             background: #fff;
             border: none;
             border: none;
         }
         }

@@ -15,18 +15,6 @@
             <div class="swiper-pagination"></div>
             <div class="swiper-pagination"></div>
         </div>
         </div>
 
 
-        {{# authorInfo}}
-            <div id="author-infos" class="editor-header clearfix" data-id={{id}}>
-                <div class="avatar">
-                    <img src="{{avatar}}">
-                </div>
-                <div class="text">
-                    <p class="name">{{name}}</p>
-                    <p class="info">{{info}}</p>
-                </div>
-            </div>
-        {{/ authorInfo}}
-
         <ul id="guang-nav" class="guang-nav clearfix">
         <ul id="guang-nav" class="guang-nav clearfix">
             {{# navs}}
             {{# navs}}
                 <li class="guang-nav-item {{#focus}}focus{{/focus}}" data-type={{typeId}}>
                 <li class="guang-nav-item {{#focus}}focus{{/focus}}" data-type={{typeId}}>

 {{> layout/header}}
 {{> layout/header}}
 <div class="guang-list-page guang-page yoho-page">
 <div class="guang-list-page guang-page yoho-page">
 {{# guang}}
 {{# guang}}
-    {{# author}}
+    {{# authorInfo}}
     <div id="author-infos" class="editor-header clearfix" data-id={{id}}>
     <div id="author-infos" class="editor-header clearfix" data-id={{id}}>
         <div class="avatar">
         <div class="avatar">
             <img src="{{avatar}}">
             <img src="{{avatar}}">
@@ -11,7 +11,7 @@
             <p class="info">{{info}}</p>
             <p class="info">{{info}}</p>
         </div>
         </div>
     </div>
     </div>
-    {{/ author}}
+    {{/ authorInfo}}
 
 
     <div id="info-list" class="info-list">
     <div id="info-list" class="info-list">
       {{# infos}}
       {{# infos}}