|
|
@@ -765,11 +765,13 @@ class Article extends Base
|
|
|
* @param name:page_num type:int default:20 desc:每页数
|
|
|
* @return name:title type:string default:-- desc:标题
|
|
|
* @return name:desc type:string default:-- desc:简介
|
|
|
- * @return name:images type:string default:-- desc:图文【多张|隔开】
|
|
|
+ * @return name:images type:string default:-- desc:图片【多张|隔开】
|
|
|
+ * @return name:images_arr type:array default:-- desc:图片数组
|
|
|
* @return name:status type:int default:-- desc:0待审核1审核通过2审核未通过
|
|
|
* @return name:remark type:string default:-- desc:审核备注
|
|
|
* @return name:create_at type:string default:-- desc:时间
|
|
|
* @return name:label_name type:array default:-- desc:标签
|
|
|
+ * @return name:cover type:string default:-- desc:封面
|
|
|
*/
|
|
|
public function getMyArticleList()
|
|
|
{
|
|
|
@@ -785,6 +787,7 @@ class Article extends Base
|
|
|
->select()->toArray();
|
|
|
array_map(function (&$v){
|
|
|
$v['label_name'] =$v['label'] ? explode(',',trim($v['label'],',')) :null;
|
|
|
+ $v['images_arr'] = $v['images'] ? explode('|',$v['images']):null;
|
|
|
},$list);
|
|
|
$total_num = UserArticle::where($sel_where)->count();
|
|
|
$this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
|
|
|
@@ -855,6 +858,8 @@ class Article extends Base
|
|
|
* @return name:time type:string default:-- desc:时间
|
|
|
* @return name:read_num type:int default:-- desc:阅读量
|
|
|
* @return name:is_normal type:int default:-- desc:是否是正常记录（0已删除或是已禁用1可以正常跳转详情）
|
|
|
+ * @return name:app_name type:string default:-- desc:发布者
|
|
|
+ * @return name:app_logo type:string default:-- desc:发布者头像
|
|
|
*/
|
|
|
public function getLearnHistory()
|
|
|
{
|
|
|
@@ -865,7 +870,7 @@ class Article extends Base
|
|
|
if($title) $sel_where[] = ['i.title|i.label','like','%'.$title.'%'];
|
|
|
$list = UserTrack::where($sel_where)
|
|
|
->alias('t')
|
|
|
- ->field('t.id,t.update_int,t.first_id article_id,t.second_id item_id,i.title,i.cover,i.read_num')
|
|
|
+ ->field('t.id,t.update_int,t.first_id article_id,t.second_id item_id,i.title,i.cover,i.read_num,i.user_id')
|
|
|
->leftJoin('ArticleItem i','t.second_id = i.id')
|
|
|
->order('update_int desc')
|
|
|
->limit($this->off_set,$this->page_num)
|
|
|
@@ -874,6 +879,9 @@ class Article extends Base
|
|
|
$v['read_num'] = numTransform($v['read_num']);
|
|
|
$v['time'] = date("Y-m-d H:i:s",$v['update_int']);
|
|
|
$v['is_normal'] = CheckPower::checkModulesPower($v['article_id'],$v['item_id'],$this->request->controller());
|
|
|
+ $article_auth = ArticleItem::getArticleAuth($v['user_id'],APPNAME,APPLOGO);
|
|
|
+ $v['app_name'] = $article_auth['app_name'];
|
|
|
+ $v['app_logo'] = $article_auth['app_logo'];
|
|
|
}
|
|
|
$total_num = UserTrack::where($sel_where)->alias('t') ->leftJoin('ArticleItem i','t.second_id = i.id')->count();
|
|
|
$this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
|
|
|
@@ -1309,7 +1317,7 @@ class Article extends Base
|
|
|
if($title) $sel_where[] = ['title|label','like','%'.$title.'%'];
|
|
|
$list = ArticleItem::where($sel_where)
|
|
|
->alias('t')
|
|
|
- ->field('id,title,cover,read_num,label,is_vip,article_id')
|
|
|
+ ->field('id,title,cover,read_num,label,is_vip,article_id,create_at')
|
|
|
->order('id desc')
|
|
|
->limit($this->off_set,$this->page_num)
|
|
|
->select()->toArray();
|
