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

@@ -22,8 +22,8 @@ class Yohobuy
 //     const API_URL2 = 'http://api.open.yohobuy.com/';
 //     const API_URL2 = 'http://api.open.yohobuy.com/';
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    
-   // const API_URL = 'http://apih5.yoho.cn/';
+
+//    const API_URL = 'http://apih5.yoho.cn/';
 //    const API_URL2 = 'http://apih5.yoho.cn/';
 //    const API_URL2 = 'http://apih5.yoho.cn/';
    // const SERVICE_URL = 'http://serviceh5.yoho.cn/';
    // const SERVICE_URL = 'http://serviceh5.yoho.cn/';
    // const YOHOBUY_URL = 'http://www.yohobuy.com/';
    // const YOHOBUY_URL = 'http://www.yohobuy.com/';
@@ -45,7 +45,7 @@ class Yohobuy
 
 
     /* PC重构地址 */
     /* PC重构地址 */
 //     const API_URL = 'http://test.open.yohobuy.com/';
 //     const API_URL = 'http://test.open.yohobuy.com/';
-//     const SERVICE_URL = 'http://test.service.api.yohobuy.com/';    
+//     const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //     const API_OLD = 'http://api2.open.yohobuy.com/';
 //     const API_OLD = 'http://api2.open.yohobuy.com/';
 
 
@@ -72,9 +72,9 @@ class Yohobuy
         }
         }
         // 苹果IPAD
         // 苹果IPAD
         elseif (strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
         elseif (strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
-      
+
             return 'ipad';
             return 'ipad';
-        } 
+        }
         elseif (stristr($_SERVER['HTTP_USER_AGENT'], 'android')) {
         elseif (stristr($_SERVER['HTTP_USER_AGENT'], 'android')) {
             return 'android';
             return 'android';
         }
         }
@@ -179,7 +179,7 @@ class Yohobuy
         if (!$returnJson && !empty($result)) {
         if (!$returnJson && !empty($result)) {
             $result = json_decode($result, true);
             $result = json_decode($result, true);
         }
         }
-        
+
         curl_close($ch);
         curl_close($ch);
         $data = array();
         $data = array();
 
 

@@ -9,12 +9,12 @@ var $ = require('jquery'),
 
 
 var commentsNum,consultsNum;
 var commentsNum,consultsNum;
 
 
-var consultFooterEle = $('.consult-content-footer')[0],
-    consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),
-
-    navtabEle = document.getElementById('nav-tab'),
+var navtabEle = document.getElementById('nav-tab'),
     navtabHammer = navtabEle && new Hammer(navtabEle),
     navtabHammer = navtabEle && new Hammer(navtabEle),
 
 
+    // consultFooterEle = $('.consult-content-footer')[0],
+    // consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),
+
     gotoConsultEle = document.getElementById('goto-consult'),
     gotoConsultEle = document.getElementById('goto-consult'),
     gotoConsultHammer = gotoConsultEle && new Hammer(gotoConsultEle),
     gotoConsultHammer = gotoConsultEle && new Hammer(gotoConsultEle),
 
 
@@ -70,11 +70,11 @@ if (navtabHammer) {
     });
     });
 }
 }
 
 
-if (consultFooterHammer) {
-    consultFooterHammer.on('tap', function() {
-        location.href = $(consultFooterEle).data('href');
-    });
-}
+// if (consultFooterHammer) {
+//     consultFooterHammer.on('tap', function() {
+//         location.href = $(consultFooterEle).data('href');
+//     });
+// }
 
 
 if (gotoConsultHammer) {
 if (gotoConsultHammer) {
     gotoConsultHammer.on('tap', function() {
     gotoConsultHammer.on('tap', function() {