zilong hace 4 años
padre
commit
faf3c330ba
Se han modificado 2 ficheros con 4 adiciones y 5 borrados
  1. 1 2
      app/Models/ImMessage.php
  2. 3 3
      resources/views/admin/message.blade.php

+ 1 - 2
app/Models/ImMessage.php

xqd
@@ -23,9 +23,8 @@ class ImMessage extends BaseModel
         if (!empty($start_time)) {
             $end_time = !empty($order['end_time']) ? $order['end_time'] : time();
             $end_time = $end_time*1000;
-            $data = ImMessage::whereIn('senderId', [$docterImId, $userImId])->whereIn('receiverId', [$docterImId, $userImId])->whereBetween('timestamp', [$start_time, $end_time])->orderBy('timestamp', 'asc')->get();
+            $data = ImMessage::whereIn('senderId', [$docterImId, $userImId])->whereIn('receiverId', [$docterImId, $userImId])->whereBetween('timestamp', [$start_time, $end_time])->orderBy('timestamp', 'asc')->get()->toArray();
             if (!empty($data)) {
-                $data = $data->toArray();
                 $user = User::select(['nickname', 'avatar'])->where('id', $order['user_id'])->first();
                 $docter = Docter::select(['name', 'avatar'])->where('id', $order['docter_id'])->first();
                 foreach ($data as $k => &$v) {

+ 3 - 3
resources/views/admin/message.blade.php

xqd xqd
@@ -75,8 +75,8 @@
 //]
         $docter = request('docter_id');
         $user = request('user');
-        $docter_info = \App\Models\Docter::where('id',$docter)->first(['name','avatar'])->toArray();
-        $user_info = \App\Models\User::where('id',$user)->first(['nickname','avatar'])->toArray();
+        $docter_info = \App\Models\Docter::where('id',$docter)->first(['name','avatar']);
+        $user_info = \App\Models\User::where('id',$user)->first(['nickname','avatar']);
     ?>
     <div class="title"><h3>订单号:{{$order_id}}</h3></div>
         @foreach($arr as $value)
@@ -178,4 +178,4 @@
 
 </div>
 </body>
-</html>
+</html>