|
@@ -144,7 +144,7 @@ class Api
|
|
if ($data) {
|
|
if ($data) {
|
|
foreach ($data as $k => $v) {
|
|
foreach ($data as $k => $v) {
|
|
$data[$k]['link'] = Dever::url('article?id=' . $v['id'], 'main');
|
|
$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;
|
|
return $data;
|
|
@@ -156,7 +156,7 @@ class Api
|
|
$id = Dever::input('id');
|
|
$id = Dever::input('id');
|
|
$data = Dever::db('main/news')->one($id);
|
|
$data = Dever::db('main/news')->one($id);
|
|
if ($data) {
|
|
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']);
|
|
$cate = Dever::db('main/cate')->one($data['cate_id']);
|
|
$data['cate_name'] = '文章类型: ' . $cate['name'];
|
|
$data['cate_name'] = '文章类型: ' . $cate['name'];
|
|
$source = Dever::db('main/source')->one($data['source_id']);
|
|
$source = Dever::db('main/source')->one($data['source_id']);
|
|
@@ -169,8 +169,10 @@ class Api
|
|
# 获取上一篇文章
|
|
# 获取上一篇文章
|
|
public function news_prev()
|
|
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) {
|
|
if ($data) {
|
|
$data['link'] = Dever::url('article?id=' . $data['id'], 'main');
|
|
$data['link'] = Dever::url('article?id=' . $data['id'], 'main');
|
|
$data['state'] = 'display:block';
|
|
$data['state'] = 'display:block';
|
|
@@ -186,7 +188,9 @@ class Api
|
|
# 获取上一篇文章
|
|
# 获取上一篇文章
|
|
public function news_next()
|
|
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);
|
|
$data = Dever::db('main/news')->findNext($id);
|
|
if ($data) {
|
|
if ($data) {
|
|
$data['link'] = Dever::url('article?id=' . $data['id'], 'main');
|
|
$data['link'] = Dever::url('article?id=' . $data['id'], 'main');
|