fe / yohobuywap-node · Commits

Go to a project

Authored by weiqingting
Commit 9cf36ab716078f82cdd868a34a6369fe545f82c2 1 parent 8ed5a24b

Merge branch 'feature_student' into release/4.9.1.0 

# Conflicts:
#	apps/product/models/detail.js
#	config/common.js
#	public/scss/common/_good.css
Inline Side-by-side
Showing 1 changed file with 0 additions and 1 deletions
@@ -99,7 +99,6 @@ const getPlatForm = (req) => { @@ -99,7 +99,6 @@ const getPlatForm = (req) => {
99 yoho.isAndroid = /Android/i.test(userAgent); 99 yoho.isAndroid = /Android/i.test(userAgent);
100 yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type); 100 yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type);
101 yoho.app_version = req.query.app_version || ''; 101 yoho.app_version = req.query.app_version || '';
102 - req.query.app_version="4.9.0";  
103 if (req.query.app_version) { 102 if (req.query.app_version) {
104 arrs = req.query.app_version.split('.'); 103 arrs = req.query.app_version.split('.');
105 if (arrs.length > 2) { 104 if (arrs.length > 2) {