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

@@ -24,11 +24,11 @@ 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/'

@@ -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;
 });
 });
 
 
@@ -6933,7 +6939,7 @@ function loadData($parent, url, page) {
                 //处理data等于end时如果loadingMask存在且没有hide样式的情况
                 //处理data等于end时如果loadingMask存在且没有hide样式的情况
                 if ($loadingMask && !$loadingMask.hasClass('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')

@@ -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');