fe / yohobuywap-node · Commits

Go to a project

Authored by weiqingting
Commit fcf5f378a3b93eb038c6441b3d2dc5ff2d41561c 1 parent d132aaef

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 3 additions and 3 deletions
... ... @@ -91,7 +91,7 @@ const getPlatForm = (req) => {
let userAgent = req.get('User-Agent');
let yoho = {};
let uids = req.get('User-Agent').match(/uid=([^;]+)/i);
let versions=req.get('app_version').match(/uid=([^;]+)/i);
// let versions = req.get('app_version').match(/uid=([^;]+)/i);
let arrs = [];
let isNewVersion = false;
const isProduction = process.env.NODE_ENV === 'production';
... ... @@ -99,8 +99,8 @@ const getPlatForm = (req) => {
yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent);
yoho.isAndroid = /Android/i.test(userAgent);
yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type);
yoho.app_version = versions && versions.length === 2 ? versions[1] : '';
yoho.app_version = yoho.app_version ||req.query.app_version || '';
// yoho.app_version = versions && versions.length === 2 ? versions[1] : '';
yoho.app_version = req.query.app_version || '';
if (yoho.app_version) {
arrs = yoho.app_version.split('.');
if (arrs.length > 2) {
... ...