fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by 梁志锋
Commit 18076d1fb8919a7814ca4cf32a39767c1a79e560 2 parents d9afbe2d 9ea40298

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

Inline Side-by-side
Showing 7 changed files with 17 additions and 9 deletions
1 { 1 {
2 "name": "yohobuy", 2 "name": "yohobuy",
3 - "version": "1.3.8", 3 + "version": "1.3.9",
4 "description": "yohobuy statics", 4 "description": "yohobuy statics",
5 "keywords": [], 5 "keywords": [],
6 "homepage": "", 6 "homepage": "",
@@ -22,8 +22,8 @@ @@ -22,8 +22,8 @@
22 22
23 li { 23 li {
24 position: relative; 24 position: relative;
25 - height: 76rem / $pxConvertRem;  
26 - line-height: 76rem / $pxConvertRem; 25 + height: 74rem / $pxConvertRem;
  26 + line-height: 74rem / $pxConvertRem;
27 background: #fff; 27 background: #fff;
28 28
29 &:after { 29 &:after {
@@ -98,8 +98,8 @@ @@ -98,8 +98,8 @@
98 .first { 98 .first {
99 99
100 li { 100 li {
101 - height: 88rem / $pxConvertRem;  
102 - line-height: 88rem / $pxConvertRem; 101 + height: 86rem / $pxConvertRem;
  102 + line-height: 86rem / $pxConvertRem;
103 border-bottom: 1px solid #e0e0e0; 103 border-bottom: 1px solid #e0e0e0;
104 104
105 &:last-child { 105 &:last-child {
@@ -64,6 +64,10 @@ class ClassModel @@ -64,6 +64,10 @@ class ClassModel
64 'gender' => $genderArr[$k]), 'list') 64 'gender' => $genderArr[$k]), 'list')
65 ); 65 );
66 66
  67 + if(!isset($val['sub'])) {
  68 + continue;
  69 + }
  70 +
67 $subitem = array(); 71 $subitem = array();
68 foreach ($val['sub'] as $value) { 72 foreach ($val['sub'] as $value) {
69 $subitem = array(); 73 $subitem = array();
@@ -126,6 +130,10 @@ class ClassModel @@ -126,6 +130,10 @@ class ClassModel
126 foreach ($data as $item) { 130 foreach ($data as $item) {
127 $id = $item['category_id']; 131 $id = $item['category_id'];
128 $result['first'][$id] = $item['category_name']; 132 $result['first'][$id] = $item['category_name'];
  133 + if (!isset($item['sub'])) {
  134 + continue;
  135 + }
  136 +
129 foreach ($item['sub'] as $sub) { 137 foreach ($item['sub'] as $sub) {
130 $id = $sub['category_id']; 138 $id = $sub['category_id'];
131 $result['second'][$id] = $sub['category_name']; 139 $result['second'][$id] = $sub['category_name'];
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.8" 53 +application.version = "1.3.9"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.8" 53 +application.version = "1.3.9"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.8" 53 +application.version = "1.3.9"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.8" 53 +application.version = "1.3.9"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"