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
@@ -126,7 +126,7 @@ const getPlatForm = (req) => { @@ -126,7 +126,7 @@ const getPlatForm = (req) => {
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 - 129 + console.log(yoho);
130 return yoho; 130 return yoho;
131 })(); 131 })();
132 132
@@ -262,7 +262,7 @@ exports.index = (req, res, next) => { @@ -262,7 +262,7 @@ exports.index = (req, res, next) => {
262 } 262 }
263 } 263 }
264 264
265 - console.log(options); 265 + // console.log(options);
266 res.render('student', options); 266 res.render('student', options);
267 }); 267 });
268 268