wesmiler

app/Services/LiveService.php

@@ -193,10 +193,11 @@ class LiveService extends BaseService
             if($info['status'] == 2){
                 $createTime = $info['create_time']? strtotime($info['create_time']) : time();
                 $time = $info['end_time']? intval($info['end_time'] - $createTime) : intval(time() - $createTime);
+                $info['end_time'] = $info['end_time']? $info['end_time'] : time();
                 $info['live_hour'] = $time > 3600 ? intval($time/3600) : 0;
                 $info['live_minute'] = $time%3600? intval($time%3600/60) : 0;
-                $info['time_text'] = date('H:i', $createTime);
-                $info['end_time_text'] = date('H:i', $info['end_time']? $info['end_time'] : time());
+                $info['time_text'] = $createTime<(time() - 86400)? date('m-d H:i', $createTime) : date('H:i', $createTime);
+                $info['end_time_text'] = $info['end_time']<(time() - 86400)? date('m-d H:i', $info['end_time']) : date('H:i', $info['end_time']);
                 $info['fans_num'] = MemberCollectService::make()->getViewFansCountByType($info['user_id'], $id, 2);
                 $info['new_fans'] = MemberCollectService::make()->getNewFansCount($info['user_id'], $id,2, $createTime);
 
@@ -452,10 +453,11 @@ class LiveService extends BaseService
                 $createTime = $info['create_time']? strtotime($info['create_time']) : time();
                 $time = $info['end_time']? intval($info['end_time'] - $createTime) : intval(time() - $createTime);
                 $info['status'] = $status;
+                $info['end_time'] = $info['end_time']? $info['end_time'] : time();
                 $info['live_hour'] = $time > 3600 ? intval($time/3600) : 0;
                 $info['live_minute'] = $time%3600? intval($time%3600/60) : 0;
-                $info['time_text'] = date('H:i', $createTime);
-                $info['end_time_text'] = date('H:i', $info['end_time']? $info['end_time'] : time());
+                $info['time_text'] = $createTime<(time() - 86400)? date('m-d H:i', $createTime) : date('H:i', $createTime);
+                $info['end_time_text'] = $info['end_time']<(time() - 86400)? date('m-d H:i', $info['end_time']) : date('H:i', $info['end_time']);
                 $info['fans_num'] = MemberCollectService::make()->getViewFansCountByType($info['user_id'], $id, 2);
                 $info['new_fans'] = MemberCollectService::make()->getNewFansCount($info['user_id'], $id,2, $createTime);
             }