取消订单

app/common/model/works/ServiceWork.php

@@ -65,7 +65,7 @@ class ServiceWork extends BaseModel
     public function getWorkStatusTextAttr($value,$data)
     {
          $status = [0=>'待派单',1=>'待领单',2=>'待联系',3=>'待上门',4=>'已上门',5=>'服务中',6=>'待结算',7=>'已完结',8=>'已评价'];
-        return $status[$data['work_status']];
+        return $data['service_status']===4?'已取消':$status[$data['work_status']];
     }
 
     public function getUserConfirmStatusTextAttr($value,$data)
@@ -139,7 +139,7 @@ class ServiceWork extends BaseModel
     public function getServiceStatusTextAttr($value,$data)
     {
         $status = [0=>'已下单',1=>'服务中',2=>'部分完成',3=>'已完成',4=>'已取消'];
-        if($data['work_pay_status']==0){
+        if($data['work_pay_status']==0 and $data['service_status']!==4){
             return '待付款';
         }
         return $status[$data['service_status']];