Merge branch 'feature_student' into release/4.9.1.0

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

@@ -72,6 +72,7 @@ function isValidate(rules, datas) {
         reg,
         reg,
         rule;
         rule;
 
 
+    datas = datas || {};
     for (name in rules) {
     for (name in rules) {
         if (datas.hasOwnProperty(name)) {
         if (datas.hasOwnProperty(name)) {
             data = datas[name];
             data = datas[name];
@@ -90,6 +91,9 @@ function isValidate(rules, datas) {
             if (rule.is !== void (0) && data !== rule.is) {
             if (rule.is !== void (0) && data !== rule.is) {
                 message = rule.msg;
                 message = rule.msg;
             }
             }
+        }else {
+            message = 'cookie 存储数据不全';
+            break;
         }
         }
     }
     }
     return message;
     return message;

@@ -239,7 +239,9 @@
     .s-title {
     .s-title {
       padding: 30px 0;
       padding: 30px 0;
     }
     }
-
+    .s-content{
+        border-top: 1px solid #e0e0e0;
+    }
     .s-section {
     .s-section {
       border-left: 1px solid #e0e0e0;
       border-left: 1px solid #e0e0e0;
       border-bottom: 1px solid #e0e0e0;
       border-bottom: 1px solid #e0e0e0;