|
@@ -49,7 +49,7 @@ class Api extends Core
|
|
|
$collection = Dever::load('user/lib/collection')->getList($this->uid);
|
|
|
if ($collection) {
|
|
|
foreach ($collection as $k => $v) {
|
|
|
- $data['info'][] = $this->get($v['info_id']);
|
|
|
+ $data['info'][] = $this->getOne($v['info_id']);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -62,7 +62,7 @@ class Api extends Core
|
|
|
return $url;
|
|
|
}
|
|
|
|
|
|
- # 获取分享的内容
|
|
|
+ # 获取合集里分享的内容
|
|
|
public function getShare()
|
|
|
{
|
|
|
$url = Dever::input('url');
|
|
@@ -195,9 +195,32 @@ class Api extends Core
|
|
|
# 获取按钮样式
|
|
|
$data['button'] = $this->button($data['info']);
|
|
|
|
|
|
- # 获取code
|
|
|
+ # 获取阅读code
|
|
|
$data['code'] = $this->getInfoCode();
|
|
|
|
|
|
+ # 获取合集分享信息
|
|
|
+ $data['share'] = $this->getInfoShare($data['info']);
|
|
|
+
|
|
|
+ return $data;
|
|
|
+ }
|
|
|
+
|
|
|
+ private function getInfoShare($info)
|
|
|
+ {
|
|
|
+ $data['title'] = $info['share_title'] ? $info['share_title'] : '{username}邀请你看{name}';
|
|
|
+
|
|
|
+ $data['title'] = str_replace('{username}', $this->user['username'], $data['title']);
|
|
|
+ $data['title'] = str_replace('{name}', $info['name'], $data['title']);
|
|
|
+
|
|
|
+ $data['content'] = $info['share_content'] ? $info['share_content'] : $info['desc'];
|
|
|
+
|
|
|
+ $data['pic'] = $info['share_pic'] ? $info['share_pic'] : $info['pic_cover'];
|
|
|
+
|
|
|
+ $url = Dever::input('url');
|
|
|
+
|
|
|
+ $url = $this->getUrl($url);
|
|
|
+
|
|
|
+ $data['link'] = $url;
|
|
|
+
|
|
|
return $data;
|
|
|
}
|
|
|
|
|
@@ -244,14 +267,7 @@ class Api extends Core
|
|
|
|
|
|
$data['ticket'] = Dever::load('user/lib/ticket')->check($this->uid, $data['info']['id']);
|
|
|
|
|
|
- $data['info']['share_title'] = $data['info']['share_title'] ? $data['info']['share_title'] : '{username}邀请你看{name}';
|
|
|
-
|
|
|
- $data['info']['share_title'] = str_replace('{username}', $this->user['username'], $data['info']['share_title']);
|
|
|
- $data['info']['share_title'] = str_replace('{name}', $data['info']['name'], $data['info']['share_title']);
|
|
|
-
|
|
|
- $data['info']['share_content'] = $data['info']['share_content'] ? $data['info']['share_content'] : $data['info']['desc'];
|
|
|
-
|
|
|
- $data['info']['share_pic'] = $data['info']['share_pic'] ? $data['info']['share_pic'] : $data['info']['pic_cover'];
|
|
|
+ $data['share'] = $this->getInfoShare($data['info']);
|
|
|
|
|
|
return $data;
|
|
|
}
|