Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into kezi_order-m

app/api/logic/ServiceOrderLogic.php

@@ -531,12 +531,12 @@ class ServiceOrderLogic extends BaseLogic
             $order_info['spare_total'] = $order_info['service_work']['spare_total']??0;
             $order_info['spare_parts'] = [];
             $order_info['self_spare_parts'] = [];
-            $result['spare_parts_audit_status'] = 0;//自选配件审核状态
+            $order_info['spare_parts_audit_status'] = 0;//自选配件审核状态
             if($order_info['service_work']['spare_total']){
                 $order_info['spare_parts'] = ServiceWorkSpare::getLists($order_info['work_id'], 1);
                 $order_info['self_spare_parts'] = ServiceWorkSpare::getLists($order_info['work_id'], 2);
-                if ($result['self_spare_parts']) {
-                    $result['spare_parts_audit_status'] = (int)ServiceWorkSpareAudit::where(['service_work_id' => $result['id']])->value('status');
+                if ($order_info['self_spare_parts']) {
+                    $order_info['spare_parts_audit_status'] = (int)ServiceWorkSpareAudit::where(['service_work_id' => $order_info['work_id']])->value('status');
                 }
             }