合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !147

@@ -136,6 +136,8 @@ class Hot extends Api
             $list = $inform->items();
             $list = $inform->items();
             $view_model = new StoreInformView();
             $view_model = new StoreInformView();
             foreach ($list as &$v) {
             foreach ($list as &$v) {
+                // 发布时间调整
+                $v['createtime'] = tranTime(strtotime($v['createtime']));
                 // 获取点赞数及是否点赞
                 // 获取点赞数及是否点赞
                 $where_g = [
                 $where_g = [
                     'object_id' => $v['id']
                     'object_id' => $v['id']

@@ -398,4 +398,34 @@ if(!function_exists('array_sort')) {
         }
         }
         return $array;
         return $array;
     }
     }
+}
+
+if(!function_exists('tranTime')) {
+    function tranTime($time)
+    {
+        $rtime = date("m-d H:i", $time);
+        $htime = date("H:i", $time);
+        $time = time() - $time;
+        if ($time < 60) {
+            $str = '刚刚';
+        } elseif ($time < 60 * 60) {
+            $min = floor($time / 60);
+            $str = $min . '分钟前';
+        } elseif ($time < 60 * 60 * 24) {
+            $h = floor($time / (60 * 60));
+            $str = $h . '小时前 ' . $htime;
+        } else {
+            $str = floor($time / 86400) . '天前';
+        }
+//        elseif ($time < 60 * 60 * 24 * 3) {
+//            $d = floor($time / (60 * 60 * 24));
+//            if ($d == 1)
+//                $str = '昨天 ' . $rtime;
+//            else
+//                $str = '前天 ' . $rtime;
+//        } else {
+//            $str = $rtime;
+//        }
+        return $str;
+    }
 }
 }