合并分支 'master-server' 到 'master'

gx排序



查看合并请求 !1341

@@ -50,7 +50,7 @@ class ProductController extends BaseController
     {
         $filed = ['id', 'project_id', 'title', 'sort' ,'thumb' ,'product_type' , 'route' ,
             'category_id', 'keyword_id', 'status', 'created_uid', 'is_upgrade' ,'created_at', 'updated_at','six_read'];
-        $this->order = $this->order ?? 'sort';
+        $this->order = $this->param['order'] ?? 'sort';
         $query = $product->orderBy($this->order ,$this->order_type)->orderBy('id','desc');
         $query = $this->searchParam($query);
         $lists = $query->select($filed)->paginate($this->row, ['*'], 'page', $this->page);