fe / yohobuywap-node · Commits

Go to a project

Authored by weiqingting
Commit b3752245846d065d2d6f6813ac05c7e387d89a0c 1 parent 9cf36ab7

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 2 additions and 2 deletions
@@ -99,8 +99,8 @@ const getPlatForm = (req) => { @@ -99,8 +99,8 @@ 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 - if (req.query.app_version) {  
103 - arrs = req.query.app_version.split('.'); 102 + if (yoho.app_version) {
  103 + arrs = yoho.app_version.split('.');
104 if (arrs.length > 2) { 104 if (arrs.length > 2) {
105 if (arrs[0] && +arrs[0] < 4) { 105 if (arrs[0] && +arrs[0] < 4) {
106 isNewVersion = false; 106 isNewVersion = false;