Commit 03734d37 authored by 蔡闯's avatar 蔡闯

2020-2-5

parent f30d1b87
...@@ -28,7 +28,7 @@ class Index extends Base ...@@ -28,7 +28,7 @@ class Index extends Base
} }
//首页推荐新闻 //首页推荐新闻
$news= Db::name('news')->where(['village_id'=>$data['village_id'],'is_recommend'=>1])->order('recommend_sort_id','desc') $news= Db::name('news')->where(['village_id'=>$data['village_id'],'is_recommend'=>1])->order('recommend_sort_id','desc')
->field('title,pic,content') ->field('news_id,title,pic,content')
->page($page,config('app.limit')) ->page($page,config('app.limit'))
->select()->toArray(); ->select()->toArray();
foreach ($news as $k=>$v) { foreach ($news as $k=>$v) {
......
...@@ -21,7 +21,7 @@ class News extends Base{ ...@@ -21,7 +21,7 @@ class News extends Base{
$type_id = Request::param('type_id'); $type_id = Request::param('type_id');
$page = Request::param('page',1); $page = Request::param('page',1);
$where['news_type_id'] = $type_id; $where['news_type_id'] = $type_id;
$data = Db::name('news')->where($where)->page($page,config('app.limit'))->order(['sort_id'=>'desc','create_time'=>'desc'])->field('news_id,title,content,create_time')->page($page,config('app.limit'))->select()->toArray(); $data = Db::name('news')->where($where)->page($page,config('app.limit'))->order(['sort_id'=>'desc','create_time'=>'desc'])->field('news_id,title,content,create_time,pic')->page($page,config('app.limit'))->select()->toArray();
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
$data[$k]['content'] = mb_substr(strip_tags($v['content']),0,100); $data[$k]['content'] = mb_substr(strip_tags($v['content']),0,100);
} }
...@@ -57,8 +57,11 @@ class News extends Base{ ...@@ -57,8 +57,11 @@ class News extends Base{
public function noticeList() { public function noticeList() {
$where['village_id'] = Request::param('village_id'); $where['village_id'] = Request::param('village_id');
$page = Request::param('page',1); $page = Request::param('page',1);
$data = Db::name('notice')->order(['sort_id'=>'desc','create_time'=>'desc'])->where($where)->field('notice_id,title,author,create_time')->page($page,config('app.limit'))->select()->toArray(); $data = Db::name('notice')->order(['sort_id'=>'desc','create_time'=>'desc'])->where($where)->field('notice_id,title,author,create_time,content')->page($page,config('app.limit'))->select()->toArray();
$total = Db::name('notice')->where($where)->count(); $total = Db::name('notice')->where($where)->count();
foreach ($data as $k =>$v) {
$data[$k]['content'] = mb_substr(strip_tags($v['content']),0,100);
}
$res['total'] = $total; $res['total'] = $total;
$res['data'] = Common::changeField($data); $res['data'] = Common::changeField($data);
return $this->returnJson($res); return $this->returnJson($res);
...@@ -73,4 +76,7 @@ class News extends Base{ ...@@ -73,4 +76,7 @@ class News extends Base{
} }
\ No newline at end of file
...@@ -64,7 +64,6 @@ class Payreturn extends BaseController ...@@ -64,7 +64,6 @@ class Payreturn extends BaseController
} }
Db::name('pay_order')->where($where)->save($save); Db::name('pay_order')->where($where)->save($save);
Db::name('cost')->where('cost_id','in',$cost_ids_arr)->save($save); Db::name('cost')->where('cost_id','in',$cost_ids_arr)->save($save);
Db::commit(); Db::commit();
return true; return true;
}catch(\Exception $e){ }catch(\Exception $e){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment