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
@@ -119,14 +119,14 @@ const getPlatForm = (req) => { | @@ -119,14 +119,14 @@ const getPlatForm = (req) => { | ||
119 | if (isProduction) { | 119 | if (isProduction) { |
120 | yoho.http = 'https:'; | 120 | yoho.http = 'https:'; |
121 | } | 121 | } |
122 | - yoho.uid = uids && uids.length === 2 ? uids[1] : 8041246; // 8041246 | 122 | + yoho.uid = uids && uids.length === 2 ? uids[1] : ''; // 8041246 |
123 | yoho.uid = req.user.uid || yoho.uid || req.query.uid || ''; | 123 | yoho.uid = req.user.uid || yoho.uid || req.query.uid || ''; |
124 | yoho.isLogin = yoho.uid ? true : false; | 124 | yoho.isLogin = yoho.uid ? true : false; |
125 | return co(function*() { | 125 | return co(function*() { |
126 | let data = yield getUser(yoho.uid); | 126 | let data = yield getUser(yoho.uid); |
127 | 127 | ||
128 | 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; | 129 | + // yoho.isStudent = false; |
130 | return yoho; | 130 | return yoho; |
131 | })(); | 131 | })(); |
132 | 132 |
-
Please register or login to post a comment