fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit f91b7cd05b7f2b7f1e0eecf6448c5addc8bb5195 2 parents 9e36e7a0 7986f191

Merge branch 'hotfix/useruid' into release/6.5.3

Inline Side-by-side
Showing 2 changed files with 3 additions and 4 deletions
@@ -103,10 +103,9 @@ app.use((req, res, next) => { @@ -103,10 +103,9 @@ app.use((req, res, next) => {
103 req.yoho.isMarsApp = /yohomars/i.test(req.get('User-Agent') || ''); 103 req.yoho.isMarsApp = /yohomars/i.test(req.get('User-Agent') || '');
104 req.yoho.isYohoApp = /YohoBuy/i.test(req.get('User-Agent') || ''); 104 req.yoho.isYohoApp = /YohoBuy/i.test(req.get('User-Agent') || '');
105 req.yoho.isApp = req.yoho.isMiniApp || 105 req.yoho.isApp = req.yoho.isMiniApp ||
106 - req.yoho.isMarsApp ||  
107 - req.cookies.app_version ||  
108 req.yoho.isNowApp || 106 req.yoho.isNowApp ||
109 - /YohoBuy/i.test(req.get('User-Agent') || '') || 107 + req.yoho.isMarsApp ||
  108 + req.yoho.isYohoApp ||
110 (req.query.app_version && req.query.app_version !== 'false') || 109 (req.query.app_version && req.query.app_version !== 'false') ||
111 (req.query.appVersion && req.query.appVersion !== 'false'); 110 (req.query.appVersion && req.query.appVersion !== 'false');
112 111
@@ -43,7 +43,7 @@ yoho = { @@ -43,7 +43,7 @@ yoho = {
43 isApp: /YohoMars/i.test(navigator.userAgent || '') || 43 isApp: /YohoMars/i.test(navigator.userAgent || '') ||
44 /YohoBuy/i.test(navigator.userAgent || '') || 44 /YohoBuy/i.test(navigator.userAgent || '') ||
45 /yohonow/i.test(navigator.userAgent || '') || 45 /yohonow/i.test(navigator.userAgent || '') ||
46 - qs && qs.app_version || cookie.get('app_version'), 46 + qs && qs.app_version,
47 isiOS: /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(navigator.userAgent || ''), 47 isiOS: /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(navigator.userAgent || ''),
48 isAndroid: /Android/i.test(navigator.userAgent || ''), 48 isAndroid: /Android/i.test(navigator.userAgent || ''),
49 isWechat: /micromessenger/i.test(navigator.userAgent || ''), 49 isWechat: /micromessenger/i.test(navigator.userAgent || ''),