xxx

application/index/controller/Cabinet.php

@@ -245,7 +245,7 @@ class Cabinet extends Base
             if($vo['enter_time'] == null){
                 $selectResult[$key]['enter_time'] = $selectResult[$key]['use_time'] = '';
             }else{
-                $selectResult[$key]['use_time'] = $this->eliTime((time() - strtotime($vo['enter_time'])));
+                $selectResult[$key]['use_time'] = $this->elapse_time((time() - strtotime($vo['enter_time'])));
                 $selectResult[$key]['enter_time'] = date("m-d H:i",strtotime($vo['enter_time']));
             }
         }
@@ -370,23 +370,36 @@ class Cabinet extends Base
         return $args;
     }
 
-    private function eliTime($seconds){
-        $msg = "";
-        if($seconds >= 86400){
-            $day = floor($seconds / 86400);
-            $remain = $seconds % 86400;
-            $msg = "{$day}天";
+    private function elapse_time($seconds)
+    {
+        $minutes = intval($seconds / 60);
+
+        if($minutes >= 60) {
+            $minute = $minutes % 60;
+            $hours = intval($minutes / 60);
+            $result = "{$minute}分钟";
         }
-        if($remain >= 3600){
-            $hour = floor($remain / 3600);
-            $remain = $remain % 3600;
-            $msg .= "{$hour}小时";
+        else {
+            $result = "{$minutes}分钟";
         }
-        if($remain >= 60){
-            $minute = floor($remain / 60);
-            $msg .= "{$minute}分钟";
+
+        if(isset($hours))
+        {
+            if($hours >= 24) {
+                $hour = $hours % 24;
+                $day = intval($hours / 24);
+                $result = "{$hour}小时" . $result;
+            }
+            else {
+                $result = "{$hours}小时" . $result;
+            }
+        }
+
+        if(isset($day) && $day > 0) {
+            $result = "{$day}天" . $result;
         }
-        return $msg;
+
+        return $result;
     }
 
     private function getid(){