fe / YOHOBUYPC · Commits

Go to a project

Authored by whb
Commit 922cfc0b65de5bb11e337227bb476405ba3319a2 2 parents 1fb732db 14a99a31

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

Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
@@ -23,7 +23,7 @@ class Yohobuy @@ -23,7 +23,7 @@ class Yohobuy
23 // const SERVICE_URL = 'http://service.api.yohobuy.com/'; 23 // const SERVICE_URL = 'http://service.api.yohobuy.com/';
24 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 24 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
25 25
26 - // const API_URL = 'http://apih5.yoho.cn/'; 26 +// const API_URL = 'http://apih5.yoho.cn/';
27 // const API_URL2 = 'http://apih5.yoho.cn/'; 27 // const API_URL2 = 'http://apih5.yoho.cn/';
28 // const SERVICE_URL = 'http://serviceh5.yoho.cn/'; 28 // const SERVICE_URL = 'http://serviceh5.yoho.cn/';
29 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 29 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
@@ -9,12 +9,12 @@ var $ = require('jquery'), @@ -9,12 +9,12 @@ var $ = require('jquery'),
9 9
10 var commentsNum,consultsNum; 10 var commentsNum,consultsNum;
11 11
12 -var consultFooterEle = $('.consult-content-footer')[0],  
13 - consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),  
14 -  
15 - navtabEle = document.getElementById('nav-tab'), 12 +var navtabEle = document.getElementById('nav-tab'),
16 navtabHammer = navtabEle && new Hammer(navtabEle), 13 navtabHammer = navtabEle && new Hammer(navtabEle),
17 14
  15 + // consultFooterEle = $('.consult-content-footer')[0],
  16 + // consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),
  17 +
18 gotoConsultEle = document.getElementById('goto-consult'), 18 gotoConsultEle = document.getElementById('goto-consult'),
19 gotoConsultHammer = gotoConsultEle && new Hammer(gotoConsultEle), 19 gotoConsultHammer = gotoConsultEle && new Hammer(gotoConsultEle),
20 20
@@ -70,11 +70,11 @@ if (navtabHammer) { @@ -70,11 +70,11 @@ if (navtabHammer) {
70 }); 70 });
71 } 71 }
72 72
73 -if (consultFooterHammer) {  
74 - consultFooterHammer.on('tap', function() {  
75 - location.href = $(consultFooterEle).data('href');  
76 - });  
77 -} 73 +// if (consultFooterHammer) {
  74 +// consultFooterHammer.on('tap', function() {
  75 +// location.href = $(consultFooterEle).data('href');
  76 +// });
  77 +// }
78 78
79 if (gotoConsultHammer) { 79 if (gotoConsultHammer) {
80 gotoConsultHammer.on('tap', function() { 80 gotoConsultHammer.on('tap', function() {