Merge branch 'feature_student' into release/4.9.1.0

# Conflicts:
#	apps/product/models/detail.js
#	config/common.js
#	public/scss/common/_good.css

@@ -98,7 +98,7 @@ const getPlatForm = (req) => {
     yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent);
     yoho.isAndroid = /Android/i.test(userAgent);
     yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type);
-    yoho.app_version = req.get('User-Agent').match(/app_version=([^;]+)/i)||req.query.app_version || '';
+    yoho.app_version =  req.query.app_version || '';
     if (yoho.app_version) {
         arrs = yoho.app_version.split('.');
         if (arrs.length > 2) {
@@ -342,7 +342,7 @@ exports.verifystudent = (req, res, next) => {
     Promise.all([verifiedStudentTotal(), vip(), verifyStudent(uid, params.college_name, params.education_degree, params.enrollment_year, params.token)])
         .then((datas) => {
             let isverify = false,
-                prompt = '你的学校信息未通审核';
+                prompt = '您的学校信息未通审核';
 
             if (datas[2].code === 200) {
                 if (datas[2].code === 200) {

@@ -40,10 +40,10 @@
                         <a href='{{image.url}}' class="main-left"></a>
                             {{#isEqual status 1}}
                             <div class="main-right-use" >
-                            <span class="on-receive on-lingqu no-bg">
-                                <p>点击</p>
-                                <p>领取</p>
-                            </span>
+                                <span class="on-receive on-lingqu no-bg">
+                                    <p>点击</p>
+                                    <p>领取</p>
+                                </span>
                             </div>
                             {{/isEqual}}
                             {{#isEqual status 2}}