dever 3 роки тому
батько
коміт
65ce49cb68
2 змінених файлів з 12 додано та 6 видалено
  1. 3 1
      main/database/news.php
  2. 9 5
      main/src/Api.php

+ 3 - 1
main/database/news.php

@@ -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,
 		),

+ 9 - 5
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($id);
+        $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,7 +188,9 @@ class Api
     # 获取上一篇文章
     public function news_next()
     {
-        $id = Dever::input('id');
+        $where['id'] = Dever::input('id');
+        $data = Dever::db('main/news')->one($id);
+        $where['cate_id'] = $data['cate_id'];
         $data = Dever::db('main/news')->findNext($id);
         if ($data) {
             $data['link'] = Dever::url('article?id=' . $data['id'], 'main');