Merge branch 'master' of http://git.huoxingkandiqiu.com:3000/scms/wonderful

main/src/Journal.php

@@ -11,7 +11,7 @@ class Journal extends Core
     public function home()
     {
         # 精选推荐
-        $this->jingxuan(false, 5);
+        $this->jingxuan(-1, 5);
 
         # 小刊列表
         $where = array();
@@ -59,6 +59,9 @@ class Journal extends Core
         if (!$page) {
             $page = true;
         }
+        if ($page === -1) {
+            $page = false;
+        }
         if (!$num) {
             $num = 4;
         }
@@ -66,17 +69,23 @@ class Journal extends Core
 
         $count = count($this->data['push_jingxuan']);
 
-        if ($count < 4 || !$this->data['push_jingxuan']) {
-            $this->data['push_jingxuan'] = array();
-        }
-
+        
         if ($num == 5) {
+            if ($count < 4 || !$this->data['push_jingxuan']) {
+                $this->data['push_jingxuan'] = array();
+            }
+
             $this->data['push_jingxuan_more'] = 2;
             # 是否有更多按钮
             if ($count > 4 && isset($this->data['push_jingxuan'][4])) {
                 unset($this->data['push_jingxuan'][4]);
                 $this->data['push_jingxuan_more'] = 1;
             }
+        } else {
+            $page = Dever::pageInfo();
+            if ($page['status'] != 1) {
+                Dever::$global['page']['current']['next_page'] = 1;
+            }
         }
 
         return $this->data;

main/src/User.php

@@ -118,6 +118,9 @@ class User extends Core
         $send['path'] = $path; 
         //$logo = Dever::load('wechat_applet/code.get', $send);
 
+        if (!$info['share_pic']) {
+            return array('img' => '');
+        }
         $user = Dever::db('passport/user')->one($this->data['uid']);
         $model = array
         (

push/database/data.php

@@ -277,7 +277,7 @@ return array
             ),
             'type' => 'all',
             'order' => array('reorder' => 'desc', 'id' => 'desc'),
-            'limit' => 10,
+            'limit' => '0,10',
             'col' => 'name,pic,olink as link,type,article_id,vod_id,live_id,journal_id,cdate',
         ),
 

push/lib/Data.php

@@ -30,7 +30,7 @@ class Data
             if ($page) {
                 $data = Dever::db('push/data')->getAllPage(array('info_id' => $info['id'], 'page' => array($info['num'], 'list')));
             } else {
-                $data = Dever::db('push/data')->getAll(array('info_id' => $info['id'], 'limit' => $info['num']));
+                $data = Dever::db('push/data')->getAll(array('info_id' => $info['id'], 'limit' => '0,' . $info['num']));
             }
 
             if ($data) {
@@ -87,6 +87,16 @@ class Data
                     if (isset($data['pdate']) && $data['pdate']) {
                         $info['cdate'] = $data['pdate'];
                     }
+
+                    if (isset($data['cate_id']) && $data['cate_id']) {
+                        $cate = Dever::db('content/cate')->one($data['cate_id']);
+                        $info['cate_name'] = $cate['name'];
+                    }
+
+                    if (isset($data['author_id']) && $data['author_id']) {
+                        $author = Dever::db('content/author')->one($data['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',