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,6 @@ const getPlatForm = (req) => { @@ -126,7 +126,6 @@ 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 - console.log(yoho);  
130 return yoho; 129 return yoho;
131 })(); 130 })();
132 131