Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

main/database/news.php

@@ -38,7 +38,7 @@ $share = array
 );
 
 # 常用的col
-$col = 'id,cate_id,name,pic_cover,num_add_view+num_view as num_view,content,source_id,`desc`,cdate';
+$col = 'id,cate_id,name,pic_cover,num_add_view+num_view as num_view,content,source_id,`desc`,cdate,pdate';
 
 return array
 (
@@ -362,6 +362,7 @@ return array
 			# 匹配的正则或函数 选填项
 			'where' => array
 			(
+				'cate_id' => 'yes',
 				'id' => array('yes', '<'),
 				'state' => 1,
 				'status' => 1,
@@ -376,11 +377,12 @@ return array
 			# 匹配的正则或函数 选填项
 			'where' => array
 			(
+				'cate_id' => 'yes',
 				'id' => array('yes', '>'),
 				'state' => 1,
 				'status' => 1,
 			),
-			'order' => array('reorder' => 'desc','pdate' => 'desc'),
+			'order' => array('reorder' => 'asc','pdate' => 'asc'),
 			'type' => 'one',
 			'col' => $col,
 		),

main/src/Api.php

@@ -144,7 +144,7 @@ class Api
         if ($data) {
             foreach ($data as $k => $v) {
                 $data[$k]['link'] = Dever::url('article?id=' . $v['id'], 'main');
-                $data[$k]['cdate'] = date('Y-m-d H:i', $v['cdate']);
+                $data[$k]['cdate'] = date('Y-m-d H:i', $v['pdate']);
             }
         }
         return $data;
@@ -156,7 +156,7 @@ class Api
         $id = Dever::input('id');
         $data = Dever::db('main/news')->one($id);
         if ($data) {
-            $data['cdate'] = '发布：' . date('Y-m-d H:i', $data['cdate']);
+            $data['cdate'] = '发布：' . date('Y-m-d H:i', $data['pdate']);
             $cate = Dever::db('main/cate')->one($data['cate_id']);
             $data['cate_name'] = '文章类型： ' . $cate['name'];
             $source = Dever::db('main/source')->one($data['source_id']);
@@ -169,8 +169,10 @@ class Api
     # 获取上一篇文章
     public function news_prev()
     {
-        $id = Dever::input('id');
-        $data = Dever::db('main/news')->findPrev($id);
+        $where['id'] = Dever::input('id');
+        $data = Dever::db('main/news')->one($where);
+        $where['cate_id'] = $data['cate_id'];
+        $data = Dever::db('main/news')->findPrev($where);
         if ($data) {
             $data['link'] = Dever::url('article?id=' . $data['id'], 'main');
             $data['state'] = 'display:block';
@@ -186,8 +188,10 @@ class Api
     # 获取上一篇文章
     public function news_next()
     {
-        $id = Dever::input('id');
-        $data = Dever::db('main/news')->findNext($id);
+        $where['id'] = Dever::input('id');
+        $data = Dever::db('main/news')->one($where);
+        $where['cate_id'] = $data['cate_id'];
+        $data = Dever::db('main/news')->findNext($where);
         if ($data) {
             $data['link'] = Dever::url('article?id=' . $data['id'], 'main');
             $data['state'] = 'display:block';

main/template/pc/article.php

@@ -21,17 +21,17 @@ $view
 
 ->fetch('.article-content', 'main/api.news_view#content') 
 
-->fetch(array('.float-shares img@src', 0), 'main/api.config#wechat') 
+//->fetch(array('.float-shares img@src', 0), 'main/api.config#wechat') 
 
-->fetch(array('.float-shares dl@style', 1), 'main/api.news_next#state')
+->fetch(array('.float-shares dl@style', 0), 'main/api.news_next#state')
 
 ->fetch(array('.float-shares a@href', 0), 'main/api.news_next#link') 
-->fetch(array('.float-shares dd', 1), 'main/api.news_next#name') 
+->fetch(array('.float-shares dd', 0), 'main/api.news_next#name') 
 
-->fetch(array('.float-shares dl@style', 2), 'main/api.news_prev#state')
+->fetch(array('.float-shares dl@style', 1), 'main/api.news_prev#state')
 
 ->fetch(array('.float-shares a@href', 1), 'main/api.news_prev#link')
-->fetch(array('.float-shares dd', 2), 'main/api.news_prev#name')
+->fetch(array('.float-shares dd', 1), 'main/api.news_prev#name')
 
 ->import('inc/foot')