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
... ... @@ -261,7 +261,7 @@ exports.index = (req, res, next) => {
}
}
// console.log(options);
console.log(options);
res.render('student', options);
});
... ...
... ... @@ -16,7 +16,7 @@
<section class='s-section clearfix'>
<div class='s-verify-img s-verify-fail'></div>
<p class='s-verify-title'>太遗憾了,{{./prompt}}</p>
<p class='s-verify-txt'>可以<a class='red' href='//m.yohobuy.com/activity/student/register'>重新验证 ></a></p>
<p class='s-verify-txt'>可以<a class='red' href='//m.yohobuy.com/activity/student/register'>重新验证 ></a></p>
</section>
{{/if}}
<section class='s-section clearfix'>
... ...