|
|
@@ -65,6 +65,7 @@ class ArticleService extends BaseService
|
|
|
|
|
|
$datas = $this->model->where(['type'=>$type,'status'=>1,'mark'=>1])
|
|
|
->select(['id','title','type','content','status'])
|
|
|
+ ->orderBy('sort','desc')
|
|
|
->orderBy('create_time','desc')
|
|
|
->first();
|
|
|
$datas = $datas? $datas->toArray() : [];
|
|
|
@@ -86,6 +87,7 @@ class ArticleService extends BaseService
|
|
|
{
|
|
|
$query = $this->getQuery($params);
|
|
|
$list = $query->select(['a.id','a.type','a.title','a.cover','a.author','a.view_num','a.cate_id','a.create_time','a.content','a.status'])
|
|
|
+ ->orderBy('a.sort','desc')
|
|
|
->orderBy('a.create_time','desc')
|
|
|
->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
|
$list = $list? $list->toArray() :[];
|
|
|
@@ -195,6 +197,8 @@ class ArticleService extends BaseService
|
|
|
$limit = ConfigService::make()->getConfigByCode('index_article_num',6);
|
|
|
$datas = ArticleCateModel::with(['articles'])->where(['type'=>$type,'status'=>1,'mark'=>1])
|
|
|
->select(['id','name','sort','type'])
|
|
|
+ ->orderBy('sort','desc')
|
|
|
+ ->orderBy('create_time','desc')
|
|
|
->get();
|
|
|
$datas = $datas? $datas->toArray() : [];
|
|
|
if($datas){
|
|
|
@@ -223,6 +227,7 @@ class ArticleService extends BaseService
|
|
|
|
|
|
$datas = ArticleCateModel::where(['type'=> $type,'status'=>1,'mark'=>1])
|
|
|
->select(['id','name','sort','type'])
|
|
|
+ ->orderBy('sort','desc')
|
|
|
->get();
|
|
|
$datas = $datas? $datas->toArray() : [];
|
|
|
if($datas){
|