do merge develop code to fixes some bugs

@@ -183,13 +183,8 @@ class NewsaleModel
         $newsale = NewsaleData::getNewsaleFocus($codeKey);
 
         // 调用接口获取数据并封装
-<<<<<<< HEAD
-        if (isset($newsale['code']) && isset($newsale['data']['list'])) {
-            if (count($newsale['data']['list']) === 1) {
-=======
-        if (isset($newsale['code']) && isset($newsale['data']['list']) && !empty($newsale['data']['list'])) {
+        if (isset($newsale['code']) && !empty($newsale['data']['list'])) {
             if(count($newsale['data']['list'][0]['data']) === 1) {
->>>>>>> 7ec3ab0fd7a1cecfedcedf1a5a67be76eff64a65
                 $result = Helpers::formatBanner($newsale['data']['list'][0]['data'][0], 640, 240);
             } else {
                 foreach ($newsale['data']['list'][0]['data'] as $one) {