@@ -38,6 +38,9 @@ class ServiceOrderLists extends BaseApiDataLists
}
})->column('id');
$where['work_id'] = ['in', !empty($work_ids)?implode(',',$work_ids):9999999];
+ if($service_status != 'all'){
+ $where['pay_status'] = 1;
+ }
return $where;
@@ -131,6 +131,9 @@ class ServiceWork extends BaseModel
public function getServiceStatusTextAttr($value,$data)
{
$status = [0=>'已下单',1=>'服务中',2=>'部分完成',3=>'已完成',4=>'已取消'];
+ if($data['work_pay_status']==0){
+ return '待付款';
return $status[$data['service_status']];