Merge remote-tracking branch 'origin/master'

app/home/controller/Article.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace app\home\controller;
+
 use think\facade\View;
 use think\facade\Lang;
 
@@ -21,8 +22,7 @@ class Article extends BaseMall
     public function initialize()
     {
         parent::initialize(); // TODO: Change the autogenerated stub
-        Lang::load(base_path().'home/lang/'.config('lang.default_lang').'/article.lang.php');
-
+        Lang::load(base_path() . 'home/lang/' . config('lang.default_lang') . '/article.lang.php');
     }
 
     /**
@@ -30,9 +30,9 @@ class Article extends BaseMall
      */
     public function index()
     {
-        $ac_id=intval(input('param.ac_id'));
+        $ac_id = intval(input('param.ac_id'));
         if (empty($ac_id)) {
-            $this->error(lang('param_error'));//'缺少参数:文章类别编号'
+            $this->error(lang('param_error')); //'缺少参数:文章类别编号'
         }
         /**
          * 得到导航ID
@@ -46,9 +46,9 @@ class Article extends BaseMall
         $article_class = $articleclass_model->getOneArticleclass($ac_id);
         View::assign('class_name', $article_class['ac_name']);
         if (empty($article_class) || !is_array($article_class)) {
-            $this->error(lang('article_article_class_not_exists'));//'该文章分类并不存在'
+            $this->error(lang('article_article_class_not_exists')); //'该文章分类并不存在'
         }
-        $default_count = 5;//定义最新文章列表显示文章的数量
+        $default_count = 5; //定义最新文章列表显示文章的数量
         /**
          * 分类导航
          */
@@ -81,9 +81,9 @@ class Article extends BaseMall
         $ac_ids = implode(',', $ac_ids);
         $article_model = model('article');
         $condition = array();
-        $condition[]=array('ac_id','in',$ac_ids);
-        $condition[]=array('article_show','=','1');
-        $article_list = $article_model->getArticleList($condition, 10);
+        $condition[] = array('ac_id', 'in', $ac_ids);
+        $condition[] = array('article_show', '=', '1');
+        $article_list = $article_model->getArticleList($condition, 12);
         View::assign('article', $article_list);
         View::assign('show_page', $article_model->page_info->render());
         /**
@@ -97,12 +97,12 @@ class Article extends BaseMall
             }
         }
         View::assign('new_article_list', $new_article_list);
-        
+
         //SEO 设置
         $seo = model('seo')->type('article')->param(array('article_class' => $article_class['ac_name']))->show();
         $this->_assign_seo($seo);
-        
-        return View::fetch($this->template_dir.'article_list');
+
+        return View::fetch($this->template_dir . 'article_list');
     }
 
     /**
@@ -110,19 +110,19 @@ class Article extends BaseMall
      */
     public function show()
     {
-        $article_id=intval(input('param.article_id'));
+        $article_id = intval(input('param.article_id'));
         if (empty($article_id)) {
-            $this->error(lang('param_error'));//'缺少参数:文章编号'
+            $this->error(lang('param_error')); //'缺少参数:文章编号'
         }
         /**
          * 根据文章编号获取文章信息
          */
         $article_model = model('article');
         $condition = array();
-        $condition[] = array('article_id','=',$article_id);
+        $condition[] = array('article_id', '=', $article_id);
         $article = $article_model->getOneArticle($condition);
         if (empty($article) || !is_array($article) || $article['article_show'] == '0') {
-            $this->error(lang('article_show_not_exists'));//'该文章并不存在'
+            $this->error(lang('article_show_not_exists')); //'该文章并不存在'
         }
         View::assign('article', $article);
 
@@ -132,9 +132,9 @@ class Article extends BaseMall
         $articleclass_model = model('articleclass');
         $article_class = $articleclass_model->getOneArticleclass($article['ac_id']);
         if (empty($article_class) || !is_array($article_class)) {
-            $this->error(lang('article_show_delete'));//'该文章已随所属类别被删除'
+            $this->error(lang('article_show_delete')); //'该文章已随所属类别被删除'
         }
-        $default_count = 5;//定义最新文章列表显示文章的数量
+        $default_count = 5; //定义最新文章列表显示文章的数量
         /**
          * 分类导航
          */
@@ -169,8 +169,8 @@ class Article extends BaseMall
         $ac_ids = implode(',', $ac_ids);
         $article_model = model('article');
         $condition = array();
-        $condition[]=array('ac_id','in',$ac_ids);
-        $condition[]=array('article_show','=','1');
+        $condition[] = array('ac_id', 'in', $ac_ids);
+        $condition[] = array('article_show', '=', '1');
         $article_list = $article_model->getArticleList($condition);
         /**
          * 寻找上一篇与下一篇
@@ -212,7 +212,7 @@ class Article extends BaseMall
         //SEO 设置
         $seo = model('seo')->type('article_content')->param($seo_param)->show();
         $this->_assign_seo($seo);
-        
-        return View::fetch($this->template_dir.'article_show');
+
+        return View::fetch($this->template_dir . 'article_show');
     }
-}
+}