Authored by weiqingting

Merge branch 'feature_student' into release/4.9.1.0

# Conflicts:
#	apps/product/models/detail.js
#	config/common.js
#	public/scss/common/_good.css
@@ -91,7 +91,7 @@ const getPlatForm = (req) => { @@ -91,7 +91,7 @@ const getPlatForm = (req) => {
91 let userAgent = req.get('User-Agent'); 91 let userAgent = req.get('User-Agent');
92 let yoho = {}; 92 let yoho = {};
93 let uids = req.get('User-Agent').match(/uid=([^;]+)/i); 93 let uids = req.get('User-Agent').match(/uid=([^;]+)/i);
94 - let versions=req.get('app_version').match(/uid=([^;]+)/i); 94 + // let versions = req.get('app_version').match(/uid=([^;]+)/i);
95 let arrs = []; 95 let arrs = [];
96 let isNewVersion = false; 96 let isNewVersion = false;
97 const isProduction = process.env.NODE_ENV === 'production'; 97 const isProduction = process.env.NODE_ENV === 'production';
@@ -99,8 +99,8 @@ const getPlatForm = (req) => { @@ -99,8 +99,8 @@ const getPlatForm = (req) => {
99 yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent); 99 yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent);
100 yoho.isAndroid = /Android/i.test(userAgent); 100 yoho.isAndroid = /Android/i.test(userAgent);
101 yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type); 101 yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type);
102 - yoho.app_version = versions && versions.length === 2 ? versions[1] : '';  
103 - yoho.app_version = yoho.app_version ||req.query.app_version || ''; 102 + // yoho.app_version = versions && versions.length === 2 ? versions[1] : '';
  103 + yoho.app_version = req.query.app_version || '';
104 if (yoho.app_version) { 104 if (yoho.app_version) {
105 arrs = yoho.app_version.split('.'); 105 arrs = yoho.app_version.split('.');
106 if (arrs.length > 2) { 106 if (arrs.length > 2) {