|
|
@@ -74,7 +74,7 @@ class MerchantService extends BaseService
|
|
|
'pageSize'=>$pageSize
|
|
|
];
|
|
|
}
|
|
|
- $field = $field ? $field : 'lev_a.id,lev_a.user_id,lev_a.name,lev_a.logo,lev_a.type,lev_a.country,lev_a.city,lev_a.category_id,lev_a.description,lev_a.service_time,lev_a.receive_num,lev_a.status';
|
|
|
+ $field = $field ? $field : 'lev_a.id,lev_a.user_id,lev_a.name,lev_a.logo,lev_a.type,lev_a.country,lev_a.city,lev_a.category_id,lev_c.name as category_name,lev_a.description,lev_a.service_time,lev_a.receive_num,lev_a.status';
|
|
|
$order = 'lev_a.id desc';
|
|
|
$sortType = isset($params['sort_type'])? $params['sort_type'] : 0;
|
|
|
if($sortType == 1){
|
|
|
@@ -83,6 +83,7 @@ class MerchantService extends BaseService
|
|
|
|
|
|
$datas = $this->model->from('merchant as a')
|
|
|
->leftJoin('member as b','b.id','=','a.user_id')
|
|
|
+ ->leftJoin('merchant_category as c','c.id','=','a.category_id')
|
|
|
->where(['a.mark' => 1,'b.mark'=>1])
|
|
|
->where(function ($query) use ($params) {
|
|
|
$kw = isset($params['kw']) ? trim($params['kw']) : '';
|
