fe / yohoblk-wap · Commits

Go to a project

Authored by 陈峰
Commit 233fcd31379dd89ec3fee0aa49923263f4d9d8e4 2 parents 33bde4f6 5bf05c76

Merge branch 'hotfix/yas' into 'gray' 

Hotfix/yas



See merge request !75
Inline Side-by-side
Showing 3 changed files with 3 additions and 29 deletions
@@ -50,24 +50,11 @@ @@ -50,24 +50,11 @@
50 } 50 }
51 51
52 var uid = getUid() || queryString().uid; 52 var uid = getUid() || queryString().uid;
53 - var isYohoBuy = /YohoBuy/i.test(navigator.userAgent || '');  
54 - var isIos = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(navigator.userAgent || '');  
55 - var isAndroid = /Android/i.test(navigator.userAgent || '');  
56 53
57 uid = uid === 0 ? '' : uid; 54 uid = uid === 0 ? '' : uid;
58 window._ozuid = uid; // 暴露ozuid 55 window._ozuid = uid; // 暴露ozuid
59 if (window._yas) { 56 if (window._yas) {
60 - var ak = 'yohoblk_m';  
61 -  
62 - if (isYohoBuy) {  
63 - if (isIos) {  
64 - ak = 'yohobuy_ios';  
65 - } else if (isAndroid) {  
66 - ak = 'yohobuy_android';  
67 - }  
68 - }  
69 -  
70 - window._yas(1 * new Date(), '2.4.14', ak, uid, '', ''); 57 + window._yas(1 * new Date(), '2.4.14', 'yohoblk_m', uid, '', '');
71 } 58 }
72 }()); 59 }());
73 var _hmt = _hmt || []; 60 var _hmt = _hmt || [];
1 { 1 {
2 "name": "yohoblk-wap", 2 "name": "yohoblk-wap",
3 - "version": "2.0.36", 3 + "version": "2.0.37",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -66,24 +66,11 @@ @@ -66,24 +66,11 @@
66 } 66 }
67 67
68 var uid = getUid() || queryString().uid; 68 var uid = getUid() || queryString().uid;
69 - var isYohoBuy = /YohoBuy/i.test(navigator.userAgent || '');  
70 - var isIos = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(navigator.userAgent || '');  
71 - var isAndroid = /Android/i.test(navigator.userAgent || '');  
72 69
73 uid = uid === 0 ? '' : uid; 70 uid = uid === 0 ? '' : uid;
74 window._ozuid = uid; // 暴露ozuid 71 window._ozuid = uid; // 暴露ozuid
75 if (window._yas) { 72 if (window._yas) {
76 - var ak = 'yohoblk_m';  
77 -  
78 - if (isYohoBuy) {  
79 - if (isIos) {  
80 - ak = 'yohobuy_ios';  
81 - } else if (isAndroid) {  
82 - ak = 'yohobuy_android';  
83 - }  
84 - }  
85 -  
86 - window._yas(1 * new Date(), '2.4.14', ak, uid, '', ''); 73 + window._yas(1 * new Date(), '2.4.14', 'yohoblk_m', uid, '', '');
87 } 74 }
88 }()); 75 }());
89 var _hmt = _hmt || []; 76 var _hmt = _hmt || [];