|
@@ -79,19 +79,19 @@ class Journal extends Core
|
|
|
$where['time'] = $time - $day;
|
|
|
|
|
|
# 获取最新的小刊
|
|
|
- $this->data['push'] = Dever::db('journal/info')->getNew($where);
|
|
|
+ //$this->data['push'] = Dever::db('journal/info')->getNew($where);
|
|
|
|
|
|
} else {
|
|
|
if (isset($cate['journal_id'])) {
|
|
|
- $this->data['push'] = Dever::db('journal/info')->getOne($cate['journal_id']);
|
|
|
+ //$this->data['push'] = Dever::db('journal/info')->getOne($cate['journal_id']);
|
|
|
} else {
|
|
|
# 获取最新的小刊
|
|
|
- $this->data['push'] = Dever::db('journal/info')->getNew();
|
|
|
+ //$this->data['push'] = Dever::db('journal/info')->getNew();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
- $this->data['push'] = $this->ding($this->data['push']);
|
|
|
+ //$this->data['push'] = $this->ding($this->data['push']);
|
|
|
|
|
|
|
|
|
$data = Dever::db('journal/info')->getAllByPage($where);
|
|
@@ -186,7 +186,8 @@ class Journal extends Core
|
|
|
|
|
|
# 获取订阅列表
|
|
|
if ($subscribe) {
|
|
|
- $data['subscribe'] = Dever::load('act/lib/subscribe')->getList($data['id'], 4);
|
|
|
+ $data['subscribe'] = array();
|
|
|
+ //$data['subscribe'] = Dever::load('act/lib/subscribe')->getList($data['id'], 4);
|
|
|
|
|
|
if (!$data['subscribe']) {
|
|
|
$data['subscribe'] = array();
|
|
@@ -702,7 +703,7 @@ class Journal extends Core
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ $submit = false;
|
|
|
if ($vip > 0) {
|
|
|
$subscribe = 1;
|
|
|
} else {
|
|
@@ -713,12 +714,13 @@ class Journal extends Core
|
|
|
}
|
|
|
|
|
|
if ($this->data['info']['buy'] == 2) {
|
|
|
- Dever::load('act/lib/subscribe')->submit($this->data['uid'], $id, 4);
|
|
|
+ $submit = true;
|
|
|
+ //Dever::load('act/lib/subscribe')->submit($this->data['uid'], $id, 4);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if ($this->data['uid'] > 0) {
|
|
|
- Dever::score($this->data['uid'], 'read_journal', '阅读小刊');
|
|
|
+ //Dever::score($this->data['uid'], 'read_journal', '阅读小刊');
|
|
|
}
|
|
|
|
|
|
# 获取最新10条内容
|
|
@@ -735,7 +737,12 @@ class Journal extends Core
|
|
|
}
|
|
|
|
|
|
# 浏览量+1
|
|
|
- Dever::db('journal/info')->addView($id);
|
|
|
+ //Dever::db('journal/info')->addView($id);
|
|
|
+
|
|
|
+ # 传给下一步操作的参数
|
|
|
+ $this->data['end']['id'] = $id;
|
|
|
+ $this->data['end']['uid'] = $this->data['uid'];
|
|
|
+ $this->data['end']['submit'] = $submit;
|
|
|
|
|
|
return $this->data;
|
|
|
}
|