Merge remote-tracking branch 'remotes/origin/develop/wap' into beta/wap

 {
   "name": "yohobuy",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "yohobuy statics",
   "keywords": [],
   "homepage": "",

@@ -22,8 +22,8 @@
 
     li {
         position: relative;
-        height: 76rem / $pxConvertRem;
-        line-height: 76rem / $pxConvertRem;
+        height: 74rem / $pxConvertRem;
+        line-height: 74rem / $pxConvertRem;
         background: #fff;
 
         &:after {
@@ -98,8 +98,8 @@
     .first {
 
         li {
-            height: 88rem / $pxConvertRem;
-            line-height: 88rem / $pxConvertRem;
+            height: 86rem / $pxConvertRem;
+            line-height: 86rem / $pxConvertRem;
             border-bottom: 1px solid #e0e0e0;
 
             &:last-child {

@@ -64,6 +64,10 @@ class ClassModel
                             'gender' => $genderArr[$k]), 'list')
                     );
 
+                    if(!isset($val['sub'])) {
+                        continue;
+                    }
+                    
                     $subitem = array();
                     foreach ($val['sub'] as $value) {
                         $subitem = array();
@@ -126,6 +130,10 @@ class ClassModel
                 foreach ($data as $item) {
                     $id = $item['category_id'];
                     $result['first'][$id] = $item['category_name'];
+                    if (!isset($item['sub'])) {
+                        continue;
+                    }
+
                     foreach ($item['sub'] as $sub) {
                         $id = $sub['category_id'];
                         $result['second'][$id] = $sub['category_name'];

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.3.8"
+application.version = "1.3.9"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.3.8"
+application.version = "1.3.9"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.3.8"
+application.version = "1.3.9"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.3.8"
+application.version = "1.3.9"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"