Merge branch 'master' of ssh://118.31.104.155:4422/mnt/git/v2.tiantianxinye.365care

app/Models/OrderItems.php

@@ -44,7 +44,7 @@ class OrderItems extends SoftDeletesModel
 
     public function product()
     {
-        return $this->hasOneThrough(Product::class, ProductItems::class, "id", "id", "product_item_id", "product_id");
+        return $this->hasOneThrough(Product::class, ProductItems::class, "id", "id", "product_item_id", "product_id")->withTrashedParents();
     }
 
     public function productItem()

resources/views/admin/paramedic/index.blade.php

@@ -34,7 +34,7 @@
                                 </td>
                                 <td>{{ $row->project->name }}</td>
                                 <td>
-                                    {{ $row->level->name }}
+                                    {{ $row->level ? $row->level->name : "" }}
                                 </td>
                                 <td>
 {{--                                    <a target="_blank" href="{{url("{$urlPrefix}/get-qrcode/{$row['id']}")}}" class="btn btn-sm btn-secondary">专属二维码</a>--}}