Merge remote-tracking branch 'origin/master'

app/api/lists/recharge/ServiceOrderLists.php

@@ -16,6 +16,7 @@ namespace app\api\lists\recharge;
 
 use app\api\lists\BaseApiDataLists;
 use app\common\enum\PayEnum;
+use app\common\enum\WorkEnum;
 use app\common\model\recharge\RechargeOrder;
 use app\common\model\works\ServiceWork;
 
@@ -54,7 +55,7 @@ class ServiceOrderLists extends BaseApiDataLists
         $lists = RechargeOrder::with(['order_goods'=>function ($query) {
             $query->visible(['goods_name','goods_image','goods_number','good_unit']);
         },'service_work'=>function ($query) {
-            $query->visible(['service_status'])->append(['service_status_text']);
+            $query->visible(['service_status','work_status','user_confirm_status'])->append(['service_status_text','work_status_text','user_confirm_status_text']);
         }])
             ->where($this->queryWhere())
             ->visible(['id','sn','order_total','order_amount','pay_status','create_time'])
@@ -65,9 +66,14 @@ class ServiceOrderLists extends BaseApiDataLists
             ->limit($this->limitOffset, $this->limitLength)
             ->group('work_id')
             ->order('id', 'desc')
-            ->select()
+            ->select()->each(function ($item) {
+                //用户按钮状态显示
+
+            })
             ->toArray();
 
+
+
         $this->count = RechargeOrder::where([
             'order_type' => 0,
             'user_id' => $this->userId,

app/api/logic/ServiceOrderLogic.php

@@ -134,7 +134,7 @@ class ServiceOrderLogic extends BaseLogic
             $order_info =  \app\common\model\recharge\RechargeOrder::with(['order_goods'=>function ($query) {
                 $query->visible(['goods_name','goods_image','goods_number','good_unit']);
             },'service_work'=>function ($query) {
-                $query->visible(['service_status','appointment_time','address','master_worker_id']);
+                $query->visible(['real_name','mobile','address','service_status','appointment_time','master_worker_id'])->append(['service_status_text','work_status_text','user_confirm_status_text']);
             }])
                 ->visible(['id','sn','order_total','order_amount','pay_status','create_time','title','work_id'])
                 ->where([

app/common/model/works/ServiceWork.php

@@ -59,6 +59,12 @@ class ServiceWork extends BaseModel
         return $status[$data['work_status']];
     }
 
+    public function getUserConfirmStatusTextAttr($value,$data)
+    {
+        $status = [0=>'初始',1=>'待确认报价',2=>'已确认报价',3=>'待确认服务完成',4=>'待支付',5=>'已完结'];
+        return $status[$data['work_status']];
+    }
+
     public function getServiceStatusTextAttr($value,$data)
     {
         $status = [0=>'已下单',1=>'服务中',2=>'部分完成',3=>'已完成',4=>'已取消'];