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

@@ -5,10 +5,12 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
+    Hammer = require('hammer'),
     tip = require('../plugin/tip'),
     tip = require('../plugin/tip'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 
-var winH = $(window).height(),
+var navHammer,
+    winH = $(window).height(),
     loadMoreH = $('#load-more').height(),
     loadMoreH = $('#load-more').height(),
     $goodList = $('#goods-list'),
     $goodList = $('#goods-list'),
     loading = false,
     loading = false,
@@ -35,12 +37,13 @@ if (kidsType) {
 
 
 $curNav = $navList.children('.focus');
 $curNav = $navList.children('.focus');
 
 
-$('#maybe-like-nav').delegate('li', 'tap', function() {
-    var $this = $(this),
+if (lifestyleType) {
+    navHammer = new Hammer($navList[0]);
+    navHammer.on('tap', function(e) {
+        var $this = $(e.target).closest('li'),
             $goods = $('.goods-list'),
             $goods = $('.goods-list'),
             $content;
             $content;
 
 
-
         if ($this.hasClass('focus')) {
         if ($this.hasClass('focus')) {
             return;
             return;
         }
         }
@@ -57,11 +60,11 @@ $('#maybe-like-nav').delegate('li', 'tap', function() {
         $curNav = $this;
         $curNav = $this;
 
 
         $(document).trigger('scroll'); //Trigger lazyLoad
         $(document).trigger('scroll'); //Trigger lazyLoad
-});
+    });
+}
 
 
-//srcoll to load more
-$(window).scroll(function () {
-    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
+
+function search() {
     if (loading) {
     if (loading) {
         return;
         return;
     }
     }
@@ -120,6 +123,15 @@ $(window).scroll(function () {
             loading = false;
             loading = false;
         }
         }
     });
     });
-    }
+}
+
+$('.maybe-like p').on('touchstart', function (e) {
+    search();
+});
 
 
+//srcoll to load more
+$(window).scroll(function () {
+    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
+        search();
+    }
 });
 });

@@ -39,16 +39,6 @@ $searchBox.find('.clear-text').click(function () {
     $searchBox.find('input').val('').trigger('focus');
     $searchBox.find('input').val('').trigger('focus');
 });
 });
 
 
-// clearTextHammer = new Hammer($searchBox.find('.clear-text')[0]);
-// clearTextHammer.on('tap', function(e) {
-//     $searchBox.find('input').val('').trigger('focus');
-// });
-
 $searchBox.find('.search-icon').click(function () {
 $searchBox.find('.search-icon').click(function () {
     $indexSearch.submit();
     $indexSearch.submit();
 });
 });
-
-// searchIconHammer = new Hammer($searchBox.find('.search-icon')[0]);
-// searchIconHammer.on('tap', function(e) {
-//     $indexSearch.submit();
-// });

@@ -31,6 +31,8 @@
 
 
                 img {
                 img {
                     vertical-align: middle;
                     vertical-align: middle;
+                    width: 100%;
+                    height: 100%;
                     max-width: 100%;
                     max-width: 100%;
                     max-height: 100%;
                     max-height: 100%;
                 }
                 }

 <div class="maybe-like">
 <div class="maybe-like">
-    <p class="title">
-        <i class="icon"></i>
-        <span>你可能喜欢</span>
-    </p>
-
     <ul id="maybe-like-nav" class="maybe-like-nav clearfix">
     <ul id="maybe-like-nav" class="maybe-like-nav clearfix">
         <li class="maybe-like-nav-item focus">新品到着</li>
         <li class="maybe-like-nav-item focus">新品到着</li>
         <li class="maybe-like-nav-item">人气单品</li>
         <li class="maybe-like-nav-item">人气单品</li>

 {{> layout/page_footer}}
 {{> layout/page_footer}}
 {{> layout/download_app}}
 {{> layout/download_app}}
+{{#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}}
 {{#if rlsEnv}}
 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>

@@ -24,7 +24,6 @@
 </script>
 </script>
 {{/if}}
 {{/if}}
 {{#if guangDetail}}
 {{#if guangDetail}}
-<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script>
 <script>
     seajs.use('js/guang/detail');
     seajs.use('js/guang/detail');
 </script>
 </script>