修正基佬提得BUG

rzjc · Apr 10, 2019 · 69f755b · 69f755b
1 parent fc70e0d
commit 69f755b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/Http/Models/Order.php b/app/Http/Models/Order.php
@@ -30,12 +30,12 @@ function user()
 
     function goods()
     {
-        return $this->hasOne(Goods::class, 'id', 'goods_id');
+        return $this->hasOne(Goods::class, 'id', 'goods_id')->withTrashed();
     }
 
     function coupon()
     {
-        return $this->hasOne(Coupon::class, 'id', 'coupon_id');
+        return $this->hasOne(Coupon::class, 'id', 'coupon_id')->withTrashed();
     }
 
     function payment()

diff --git a/resources/views/admin/orderList.blade.php b/resources/views/admin/orderList.blade.php
@@ -105,7 +105,7 @@
                                                     @if(empty($order->user) )
                                                         【账号不存在】
                                                     @else
-                                                        <a href="{{url('admin/userList?id=') . $order->user->id}}" target="_blank"> <span class="label label-info">{{$order->user->username}}</span> </a>
+                                                        <a href="{{url('admin/userList?id=') . $order->user->id}}" target="_blank"> {{$order->user->username}} </a>
                                                     @endif
                                                 </td>
                                                 <td> {{$order->order_sn}} </td>