fe / yohobuywap-node · Commits

Go to a project

Authored by weiqingting
Commit 2a0c69eced95462ad911d578bb563d8dc5303ce1 1 parent 60b0b7e1

Merge branch 'feature_student' into release/4.9.1.0 

# Conflicts:
#	apps/product/models/detail.js
#	config/common.js
#	public/scss/common/_good.css
Inline Side-by-side
Showing 2 changed files with 2 additions and 1 deletions
... ... @@ -126,7 +126,7 @@ const getPlatForm = (req) => {
let data = yield getUser(yoho.uid);
yoho.isStudent = data.data && data.data.vip_info && data.data.vip_info.is_student ? true : false;
yoho.isStudent=false;
yoho.isStudent = false;
return yoho;
})();
... ...
... ... @@ -410,6 +410,7 @@
input {
border: 0 none;
line-height: 100%;
}
.s-red {
... ...