fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 579a7c089c02547b4ee71f75a4f8d92bc46992bf 1 parent ff6e22bb

do merge develop code to fixes some bugs

Inline Side-by-side
Showing 1 changed file with 1 additions and 6 deletions
@@ -183,13 +183,8 @@ class NewsaleModel @@ -183,13 +183,8 @@ class NewsaleModel
183 $newsale = NewsaleData::getNewsaleFocus($codeKey); 183 $newsale = NewsaleData::getNewsaleFocus($codeKey);
184 184
185 // 调用接口获取数据并封装 185 // 调用接口获取数据并封装
186 -<<<<<<< HEAD  
187 - if (isset($newsale['code']) && isset($newsale['data']['list'])) {  
188 - if (count($newsale['data']['list']) === 1) {  
189 -=======  
190 - if (isset($newsale['code']) && isset($newsale['data']['list']) && !empty($newsale['data']['list'])) { 186 + if (isset($newsale['code']) && !empty($newsale['data']['list'])) {
191 if(count($newsale['data']['list'][0]['data']) === 1) { 187 if(count($newsale['data']['list'][0]['data']) === 1) {
192 ->>>>>>> 7ec3ab0fd7a1cecfedcedf1a5a67be76eff64a65  
193 $result = Helpers::formatBanner($newsale['data']['list'][0]['data'][0], 640, 240); 188 $result = Helpers::formatBanner($newsale['data']['list'][0]['data'][0], 640, 240);
194 } else { 189 } else {
195 foreach ($newsale['data']['list'][0]['data'] as $one) { 190 foreach ($newsale['data']['list'][0]['data'] as $one) {