显示问题

app/api/controller/Appointment.php

@@ -14,23 +14,23 @@ class Appointment extends Base
     //获取地址列表
     public function addressList()
     {
-        $post = $this->request->param();
+        $post     = $this->request->param();
         $validate = new \think\Validate([
             ['page', 'number'],
-            ['pagenum', 'number|<=:1000']
+            ['pagenum', 'number|<=:1000'],
         ]);
         if (!$validate->check($post)) {
             $this->json_error('提交失败：' . $validate->getError());
         }
 
-        $pagenum = $this->request->param('pagenum', 20, 'intval');
+        $pagenum  = $this->request->param('pagenum', 20, 'intval');
         $datalist = (new Address())->where('status', Address::STATUS_YES)->paginate($pagenum, true);
         if (empty($datalist)) {
             $this->json_error("没有数据");
         }
         foreach ($datalist as $key => $item) {
             $item['thumb_url'] = geturl($item->thumb, '', true);
-            $datalist[$key] = $item;
+            $datalist[$key]    = $item;
         }
         $this->json_success("查询成功", $datalist);
     }
@@ -40,11 +40,11 @@ class Appointment extends Base
     public function addressListByDayTime()
     {
         $ticketModel = new AppointmentTicket();
-        $post = $this->request->param();
-        $validate = new \think\Validate([
+        $post        = $this->request->param();
+        $validate    = new \think\Validate([
             ['daytime', 'date|dateFormat:Y-m-d'],
             ['page', 'number'],
-            ['pagenum', 'number|<=:1000']
+            ['pagenum', 'number|<=:1000'],
         ]);
         if (!$validate->check($post)) {
             $this->json_error('提交失败：' . $validate->getError());
@@ -61,16 +61,17 @@ class Appointment extends Base
 
         $addressIds = $ticketModel->where('appointment_daytime', strtotime($daytime))->distinct(true)->column('address_id');
 
-        $where = [];
-        $where['id'] = ['in', $addressIds];
-        $pagenum = $this->request->param('pagenum', 20, 'intval');
-        $datalist = (new Address())->where($where)->paginate($pagenum, true);
+        $where           = [];
+        $where['id']     = ['in', $addressIds];
+        $where['status'] = 1;
+        $pagenum         = $this->request->param('pagenum', 20, 'intval');
+        $datalist        = (new Address())->where($where)->paginate($pagenum, true);
         if (empty($datalist)) {
             $this->json_error("没有数据");
         }
         foreach ($datalist as $key => $item) {
             $item['thumb_url'] = geturl($item->thumb, '', true);
-            $datalist[$key] = $item;
+            $datalist[$key]    = $item;
         }
         $this->json_success("查询成功", $datalist);
     }
@@ -79,7 +80,7 @@ class Appointment extends Base
     //获取号源列表
     public function getTicketByAddressId()
     {
-        $post = $this->request->param();
+        $post     = $this->request->param();
         $validate = new \think\Validate([
             ['address_id', 'require|number'],
             ['daytime', 'dateFormat:Y-m-d'],
@@ -89,7 +90,7 @@ class Appointment extends Base
         }
 
         $address_id = $this->request->param('address_id');
-        $daytime = $this->request->param('daytime', date('Y-m-d'));
+        $daytime    = $this->request->param('daytime', date('Y-m-d'));
 
         try {
             //生成工作日号源
@@ -99,7 +100,7 @@ class Appointment extends Base
         }
 
         $ticketModel = new AppointmentTicket();
-        $tickets = $ticketModel->where('address_id', $address_id)->where('appointment_daytime', strtotime($daytime))->select();
+        $tickets     = $ticketModel->where('address_id', $address_id)->where('appointment_daytime', strtotime($daytime))->select();
 
         foreach ($tickets as $k => $item) {
             $appoint = $item->appointment;
@@ -113,12 +114,12 @@ class Appointment extends Base
             //已经预约的时间段
             $ticketPeriods = (new AppointmentApplication())->where('appointment_ticket_id', $item->id)->where('finish_time', 0)->column('appointment_time');
             //预约的时间段
-            $item['morning_time_period'] = $this->setPeriodStatus($appoint->morning_time_periods, $ticketPeriods);
+            $item['morning_time_period']   = $this->setPeriodStatus($appoint->morning_time_periods, $ticketPeriods);
             $item['afternoon_time_period'] = $this->setPeriodStatus($appoint->afternoon_time_periods, $ticketPeriods);
             //剩余预约号码个数
-            $item['morning_remaining'] = count($item['morning_time_period']);
+            $item['morning_remaining']   = count($item['morning_time_period']);
             $item['afternoon_remaining'] = count($item['afternoon_time_period']);
-            $tickets[$k] = $item;
+            $tickets[$k]                 = $item;
         }
 
         $this->json_success("查询成功", $tickets);
@@ -134,11 +135,11 @@ class Appointment extends Base
     private function setPeriodStatus($timePeriods, $ticketPeriods)
     {
         $daytime = $this->request->param('daytime', date('Y-m-d'));
-        $arr = [];
-        $now = time();
+        $arr     = [];
+        $now     = time();
         foreach ($timePeriods as $ticket => $period) {
             //排除过期时段
-            $timerang = explode(' - ', $period);
+            $timerang   = explode(' - ', $period);
             $period_end = $timerang[1];
             if ($now > strtotime($daytime . ' ' . $period_end)) {
                 continue;