|
@@ -7,6 +7,7 @@ namespace app\api\controller;
|
|
|
|
|
|
use app\admin\model\ArticleReport;
|
|
|
use app\admin\model\Word;
|
|
|
+use app\api\model\ArticleClass;
|
|
|
use app\common\controller\Api;
|
|
|
|
|
|
use app\api\model\ArticleMember;
|
|
@@ -17,7 +18,7 @@ use app\api\model\Member;
|
|
|
class Article extends Api
|
|
|
{
|
|
|
//无需登录的接口
|
|
|
- protected $noNeedLogin = ['article_list','article_reply','article_info'];//都需要登录
|
|
|
+ protected $noNeedLogin = ['article_list','article_reply','article_info','class_list'];//都需要登录
|
|
|
/**
|
|
|
* 车友圈列表
|
|
|
*
|
|
@@ -34,6 +35,10 @@ class Article extends Api
|
|
|
$userId = $this->request->post('user_id');
|
|
|
$see_mid = $this->request->post('see_mid');
|
|
|
$page = $this->request->post('page');
|
|
|
+ $class_id=$this->request->post('class_id');
|
|
|
+ if (!empty($class_id)){
|
|
|
+ $where['article.class_id']=$class_id;
|
|
|
+ }
|
|
|
if (empty($page)){
|
|
|
$page=1;
|
|
|
}
|
|
@@ -58,12 +63,14 @@ class Article extends Api
|
|
|
}
|
|
|
}
|
|
|
$limit=($page-1)*10;
|
|
|
+
|
|
|
$list=ArticleModel::where($where)
|
|
|
->field("*,FROM_UNIXTIME(createtime,'%Y-%m-%d %H:%i:%s') as createdate")
|
|
|
->order('id desc')
|
|
|
- ->with('member')
|
|
|
+ ->with(['member','articleclass'])
|
|
|
->limit($limit,10)
|
|
|
->select();
|
|
|
+
|
|
|
foreach ($list as $k=>$v){
|
|
|
unset($v['createtime']);
|
|
|
unset($v['updatetime']);
|
|
@@ -144,7 +151,7 @@ class Article extends Api
|
|
|
|
|
|
$list=ArticleModel::where('id',$article_id)
|
|
|
->field("*,FROM_UNIXTIME(createtime,'%Y-%m-%d %H:%i:%s') as createdate")
|
|
|
- ->with('member')
|
|
|
+ ->with(['member','articleclass'])
|
|
|
->find();
|
|
|
|
|
|
unset($list['createtime']);
|
|
@@ -268,6 +275,7 @@ class Article extends Api
|
|
|
$insert['images']=$post['images'];
|
|
|
$insert['mp4']=$post['mp4'];
|
|
|
$insert['address']=$post['address'];
|
|
|
+ $insert['class_id']=$post['class_id'];
|
|
|
if (!empty($insert['content'])){
|
|
|
$word_model=new Word();
|
|
|
$list=$word_model->get_worde();
|
|
@@ -276,6 +284,10 @@ class Article extends Api
|
|
|
$this->result('您的发布包含敏感词,请重新整理');
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if (empty($insert['class_id'])){
|
|
|
+ $this->result('选择车友圈分类');
|
|
|
+ }
|
|
|
$insert['updatetime']=$insert['createtime']=time();
|
|
|
if(ArticleModel::insert($insert)){ //添加数据
|
|
|
$bid = ArticleModel::getLastInsID(); //成功后跳转界面
|
|
@@ -284,6 +296,11 @@ class Article extends Api
|
|
|
$this->result('发布失败,稍后重试');
|
|
|
}
|
|
|
}
|
|
|
+// 车友圈class
|
|
|
+ public function class_list(){
|
|
|
+ $get_list=ArticleClass::where('status','1')->order('weigh desc,id desc')->select();
|
|
|
+ $this->result('SUCCESS', $get_list, 1);
|
|
|
+ }
|
|
|
/**
|
|
|
* 车友圈删除
|
|
|
*
|