1

application/api/controller/Article.php

@@ -30,6 +30,7 @@ class Article extends Api
                 ['is_hot',-1],
                 ['is_rec',-1],
                 ['cid',$this->cid],
+                ['order','']
             ],$request,true
         );
         return $this->success('获取成功',ArticleModel::lst(compact('ifyid','key','page','limit','is_hot','is_rec','cid')));

application/api/controller/Index.php

@@ -4,6 +4,7 @@ namespace app\api\controller;
 
 use app\admin\model\Company;
 use app\common\model\Ads;
+use app\common\model\Config;
 use app\common\model\Menu;
 use app\common\controller\Api;
 use app\common\model\User;
@@ -40,8 +41,11 @@ class Index extends Api
     {
 
         $rs = Company::where('id',$this->cid)->field('company_name,company_tel,sys_appid,wechat_appid,wechat_share_image,wechat_qrcode_image,routine_appid,share_title,share_info,wx_open_appid')->find();
+
         if($rs) {
-            $this->success('获取成功', $rs->toArray());
+            $rs = $rs->toArray();
+            $rs['all_ash'] = Config::where('name','all_ash')->value('value');
+            $this->success('获取成功', $rs);
         }
     }
     public function wxconfig()

application/api/controller/Lave.php

@@ -19,6 +19,7 @@ class Lave extends Api
                 ['cid',$this->cid],
                 ['paid',1],
                 ['category_id',0],
+                ['order',''],
             ],$request
         );
         $this->success('获取成功',LaveModel::lst($where));

application/common/model/Article.php

@@ -90,6 +90,7 @@ class Article extends Model
         $xwhere = null;
         $xwhere['hidedata'] = 0;
         $xwhere['status'] = 1;
+        $order = "sort desc,id desc";
         if(isset($where['cid']) && $where['cid']>0)  $xwhere['cid'] = $where['cid'];
         if(isset($where['is_hot']) && $where['is_hot']==1)  $xwhere['is_hotdata'] = $where['is_hot'];
         if(isset($where['is_rec']) && $where['is_rec']==1)   $xwhere['is_recdata'] = $where['is_rec'];
@@ -99,7 +100,8 @@ class Article extends Model
             $xwhere['article_category_id'] =['in',$ids];
         }
         if(isset($where['key']) && $where['key']!='') $xwhere['title|synopsis']  = ['like',"%{$where['key']}%"];
-        $list = $model->where($xwhere)->order('sort desc,id desc')->page($where['page'],$where['limit'])->select();
+        if(isset($where['order']) && $where['order']!='') $order = $where['order'];
+        $list = $model->where($xwhere)->order($order)->page($where['page'],$where['limit'])->select();
         $count =  $model->where($xwhere)->count();
         return compact('count','list');
     }

application/common/model/Lave.php

@@ -113,12 +113,14 @@ class Lave extends BaseModel
     {
         $model = new self;
         $xwhere = null;
+        $order = "id desc";
         if(isset($where['cid']) && $where['cid']>0)  $xwhere['cid'] = $where['cid'];
         if(isset($where['user_id']) && $where['user_id']>0)  $xwhere['user_id'] = $where['user_id'];
         if(isset($where['category_id']) && $where['category_id']>0) $xwhere['category_id'] = $where['category_id'];
         if(isset($where['paid']) && $where['paid']>-1) $xwhere['paid'] = $where['paid'];
         if(isset($where['help_id']) && $where['help_id']>-1) $xwhere['help_id'] = $where['help_id'];
-        $data = $model->where($xwhere)->order('id desc')->page($where['page'],$where['limit'])->select();
+        if(isset($where['order']) && $where['order']!='') $order = $where['order'];
+        $data = $model->where($xwhere)->order($order)->page($where['page'],$where['limit'])->select();
         $count = $model->where($xwhere)->count();
         return compact('count','data');
     }