edit

main/src/Journal.php

@@ -78,6 +78,8 @@ class Journal extends Core
                 unset($this->data['push_jingxuan'][4]);
                 $this->data['push_jingxuan_more'] = 1;
             }
+        } else {
+            
         }
 
         return $this->data;

push/lib/Data.php

@@ -87,6 +87,16 @@ class Data
                     if (isset($data['pdate']) && $data['pdate']) {
                         $info['cdate'] = $data['pdate'];
                     }
+
+                    if (isset($info['cate_id']) && $info['cate_id']) {
+                        $cate = Dever::db('content/cate')->one($info['cate_id']);
+                        $info['cate_name'] = $cate['name'];
+                    }
+
+                    if (isset($info['author_id']) && $info['author_id']) {
+                        $author = Dever::db('content/author')->one($info['author_id']);
+                        $info['author_name'] = $author['name'];
+                    }
                 }
             }
         } else {

video/database/live.php

@@ -16,6 +16,17 @@ $share = function()
 	return $array;
 };
 
+$author = function()
+{
+	$array = array();
+	$info = Dever::db('content/author')->state();
+	if($info)
+	{
+		$array += $info;
+	}
+	return $array;
+};
+
 $cate = function()
 {
 	$array = array();
@@ -44,7 +55,7 @@ $share = array
 	2 => '不显示',
 );
 
-$col = 'id,name,pic_cover,pdate,num_add_user+num_user as num_user,num_add_view+num_view as num_view,num_up+num_add_up as num_up,num_comment,share_yes,share_title,share_pic,share_content,function,content,url_m3u8,url_mp4,cate_id,stream_id,sdate,edate';
+$col = 'id,name,pic_cover,pdate,num_add_user+num_user as num_user,num_add_view+num_view as num_view,num_up+num_add_up as num_up,num_comment,share_yes,share_title,share_pic,share_content,function,content,url_m3u8,url_mp4,cate_id,stream_id,sdate,edate,author_id';
 
 return array
 (
@@ -106,6 +117,18 @@ return array
 			'search'	=> 'select',
 		),
 
+		'author_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '作者',
+			'default' 	=> '1',
+			'desc' 		=> '作者',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'select',
+			'option'	=> $author,
+			'search'	=> 'select',
+		),
+
 		'tag'		=> array
 		(
 			'type' 		=> 'text-255',