1

app/api/controller/Appointment.php

@@ -64,19 +64,21 @@ class Appointment extends Base
 
         foreach ($tickets as $k => $item) {
             $appoint = $item->appointment;
-            //专家信息
-            $item->specialist;
-            $item->specialist->head_pic = geturl($item->specialist->head_pic, '', true);
-            //拆分预约时段
-            $ticketPeriods = (new AppointmentApplication())->where('appointment_ticket_id', $item->id)->column('appointment_time');
-            $item['morning_time_period'] = $this->setPeriodStatus(DateHelper::splitTimePeriod($appoint->morning_start_time, $appoint->morning_end_time, $appoint->morning_num), $ticketPeriods);
-            $item['afternoon_time_period'] = $this->setPeriodStatus(DateHelper::splitTimePeriod($appoint->afternoon_start_time, $appoint->afternoon_end_time, $appoint->afternoon_num), $ticketPeriods);
-            $item['night_time_period'] = $this->setPeriodStatus(DateHelper::splitTimePeriod($appoint->night_start_time, $appoint->night_end_time, $appoint->night_num), $ticketPeriods);
-            //剩余预约号码
-            $item['morning_remaining'] = count($item['morning_time_period']);
-            $item['afternoon_remaining'] = count($item['afternoon_time_period']);
-            $item['night_remaining'] = count($item['night_time_period']);
-            $tickets[$k] = $item;
+            if (!empty($appoint)) {
+                //专家信息
+                $item->specialist;
+                $item->specialist->head_pic = geturl($item->specialist->head_pic, '', true);
+                //拆分预约时段
+                $ticketPeriods = (new AppointmentApplication())->where('appointment_ticket_id', $item->id)->column('appointment_time');
+                $item['morning_time_period'] = $this->setPeriodStatus(DateHelper::splitTimePeriod($appoint->morning_start_time, $appoint->morning_end_time, $appoint->morning_num), $ticketPeriods);
+                $item['afternoon_time_period'] = $this->setPeriodStatus(DateHelper::splitTimePeriod($appoint->afternoon_start_time, $appoint->afternoon_end_time, $appoint->afternoon_num), $ticketPeriods);
+                $item['night_time_period'] = $this->setPeriodStatus(DateHelper::splitTimePeriod($appoint->night_start_time, $appoint->night_end_time, $appoint->night_num), $ticketPeriods);
+                //剩余预约号码
+                $item['morning_remaining'] = count($item['morning_time_period']);
+                $item['afternoon_remaining'] = count($item['afternoon_time_period']);
+                $item['night_remaining'] = count($item['night_time_period']);
+                $tickets[$k] = $item;
+            }
         }
 
         $this->json_success("查询成功", $tickets);

app/api/controller/Common.php

@@ -34,8 +34,8 @@ class Common extends Base
     {
         $user = User::get(9);
         //登入成功 ,返回 前端
+        return (Permissions::createJwt($user->id, $user->login_time, 3600 * 24));
         $return_url = 'https://localhost:8080/';
-//        halt(Permissions::createJwt($user->id, $user->login_time, 3600 * 24));
         $this->redirect($return_url . '?jwt=' . Permissions::createJwt($user->id, $user->login_time, 3600 * 24));
     }