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

@@ -24,14 +24,14 @@ class Yohobuy
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
    
    
     //java API
     //java API
-    /**const API_URL = 'http://apih5.yoho.cn/';
-    const API_URL2 = 'http://apih5.yoho.cn/';
-    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
-    const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    const API_OLD = 'http://api2.open.yohobuy.com/';**/
+//    const API_URL = 'http://apih5.yoho.cn/';
+//    const API_URL2 = 'http://apih5.yoho.cn/';
+//    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
+//    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//    const API_OLD = 'http://api2.open.yohobuy.com/';
     
     
     /* 测试环境 */
     /* 测试环境 */
-     const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
+    const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
      const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
      const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
      const YOHOBUY_URL = 'http://www.yohobuy.com/';
      const YOHOBUY_URL = 'http://www.yohobuy.com/';
      const API_OLD = 'http://test2.open.yohobuy.com/';
      const API_OLD = 'http://test2.open.yohobuy.com/';

@@ -1708,6 +1708,7 @@ var start = 0,
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 
 $('.nav-btn').on('touchstart', function(event) {
 $('.nav-btn').on('touchstart', function(event) {
+    $sideNav.css('pointer-events', 'none');
     $mobileWrap.addClass('menu-open');
     $mobileWrap.addClass('menu-open');
     $overlay.show().css('opacity', 0.3);
     $overlay.show().css('opacity', 0.3);
     $sideNav.addClass('on');
     $sideNav.addClass('on');
@@ -1720,6 +1721,11 @@ $('.nav-btn').on('touchstart', function(event) {
         height: $(window).height(),
         height: $(window).height(),
         overflow: 'hidden'
         overflow: 'hidden'
     });
     });
+
+    setTimeout(function() {
+        $sideNav.css('pointer-events', 'auto');
+    }, 400);
+
     return false;
     return false;
 });
 });
 
 
@@ -6917,8 +6923,8 @@ function loadData($parent, url, page) {
             page: page
             page: page
         },
         },
         success: function(data) {
         success: function(data) {
-            var $loadingMask = $parent.closest('.fav-type').find('.fav-content-loading');
-
+            var $loadingMask = $parent.closest('.fav-type').find('.fav-content-loading');
+
             if (url === 'favBrand') {
             if (url === 'favBrand') {
                 $brandLoadMore.addClass('hide');
                 $brandLoadMore.addClass('hide');
             } else {
             } else {
@@ -6929,23 +6935,23 @@ function loadData($parent, url, page) {
                 $loadingMask.addClass('hide');
                 $loadingMask.addClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
             } else if (data === 'end') {
             } else if (data === 'end') {
-
-                //处理data等于end时如果loadingMask存在且没有hide样式的情况
-                if ($loadingMask && !$loadingMask.hasClass('hide')) {
+
+                //处理data等于end时如果loadingMask存在且没有hide样式的情况
+                if ($loadingMask && !$loadingMask.hasClass('hide')) {
                     $loadingMask.addClass('hide');
                     $loadingMask.addClass('hide');
-                    $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
-                }
-
+                    //$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
+                }
+
                 $parent.closest('.fav-type').find('.fav-load-background')
                 $parent.closest('.fav-type').find('.fav-load-background')
-                    .removeClass('fav-load-background').html('没有更多了');
-
+                    .removeClass('fav-load-background').html('没有更多了');
+
                 // hf: fixes bug to 修改没有数据还调接口,加载错误页面问题
                 // hf: fixes bug to 修改没有数据还调接口,加载错误页面问题
                 brandLockId = true;
                 brandLockId = true;
                 lockId = true;
                 lockId = true;
             } else if (data.length > 10) {
             } else if (data.length > 10) {
                 $parent.append(data);
                 $parent.append(data);
-
-                //如果有数据loadingMask会被remove掉
+
+                //如果有数据loadingMask会被remove掉
                 $loadingMask.remove();
                 $loadingMask.remove();
                 if (url === 'favBrand') {
                 if (url === 'favBrand') {
                     initSwiper(data);//如果是收藏品牌需要初始化swiper
                     initSwiper(data);//如果是收藏品牌需要初始化swiper

@@ -66,7 +66,7 @@ $('.overlay').on('touchstart', function(e) {
 });
 });
 
 
 //点击一级导航，弹出二级导航
 //点击一级导航，弹出二级导航
-$sideNav.on('touchstart', 'li', function(e) {
+$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');