Merge branch 'feature_student' into release/4.9.1.0
# Conflicts: # apps/product/models/detail.js # config/common.js # public/scss/common/_good.css
Showing
1 changed file
with
2 additions
and
2 deletions
@@ -98,7 +98,6 @@ const getPlatForm = (req) => { | @@ -98,7 +98,6 @@ const getPlatForm = (req) => { | ||
98 | yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent); | 98 | yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent); |
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 | - console.log(req.query.app_version); | ||
102 | yoho.app_version = req.query.app_version || ''; | 101 | yoho.app_version = req.query.app_version || ''; |
103 | if (yoho.app_version) { | 102 | if (yoho.app_version) { |
104 | arrs = yoho.app_version.split('.'); | 103 | arrs = yoho.app_version.split('.'); |
@@ -120,13 +119,14 @@ const getPlatForm = (req) => { | @@ -120,13 +119,14 @@ const getPlatForm = (req) => { | ||
120 | if (isProduction) { | 119 | if (isProduction) { |
121 | yoho.http = 'https:'; | 120 | yoho.http = 'https:'; |
122 | } | 121 | } |
123 | - yoho.uid = uids && uids.length === 2 ? uids[1] : ''; // 8041246 | 122 | + yoho.uid = uids && uids.length === 2 ? uids[1] : 8041246; // 8041246 |
124 | yoho.uid = req.user.uid || yoho.uid || req.query.uid || ''; | 123 | yoho.uid = req.user.uid || yoho.uid || req.query.uid || ''; |
125 | yoho.isLogin = yoho.uid ? true : false; | 124 | yoho.isLogin = yoho.uid ? true : false; |
126 | return co(function*() { | 125 | return co(function*() { |
127 | let data = yield getUser(yoho.uid); | 126 | let data = yield getUser(yoho.uid); |
128 | 127 | ||
129 | yoho.isStudent = data.data && data.data.vip_info && data.data.vip_info.is_student ? true : false; | 128 | yoho.isStudent = data.data && data.data.vip_info && data.data.vip_info.is_student ? true : false; |
129 | + yoho.isStudent=false; | ||
130 | return yoho; | 130 | return yoho; |
131 | })(); | 131 | })(); |
132 | 132 |
-
Please register or login to post a comment