Merge branch 'developerB' of http://git.caimei365.com/caimei365/caimei365-www into developerB

src/main/java/com/caimei/www/controller/unlimited/ArticleController.java

@@ -58,10 +58,15 @@ public class ArticleController extends BaseController {
      * 文章列表【旧center】
      */
     @GetMapping("/info/center-{id}-{pageNum}.html")
-    public String toArticleList(@PathVariable("id") Integer id, @PathVariable("pageNum") Integer pageNum, final Model model) {
+    public String toArticleList(Integer source,@PathVariable("id") Integer id, @PathVariable("pageNum") Integer pageNum, final Model model) {
+        CmBrandLanding landing = new CmBrandLanding().setType("5");
+        if (null==source||source == 1) {
+            landing.setPcStatus(1);
+        }else{
+            landing.setAppStatus(1);
+        }
         List<BaseLink> typeList = articleService.getArticleTypes();
-        List<CmBrandLanding> cmBrandLandingList = cmBrandLandingService.getCmBrandLandingList(new CmBrandLanding()
-                .setType("5"));
+        List<CmBrandLanding> cmBrandLandingList = cmBrandLandingService.getCmBrandLandingList(landing);
         List<Article> infoSelected = articleService.getArticleSelected(0, 5);
         List<CmProductArchiveFile> archiveFiles = articleService.findArchiveFileAddTime(null,0, 3);
         List<ProductList> productSellNumbers = productService.getProductSellNumbers(null);