Skip to content

李洋 / 消息系统

Go to a project
Commit 572c0a1a by CnChunfeng
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !7
parents 1c291baa 74d8a6b4
Inline Side-by-side
Showing with 6 additions and 6 deletions
app/Http/Controllers/MessageApiController.php
...@@ -40,7 +40,7 @@ class MessageApiController extends Controller ...@@ -40,7 +40,7 @@ class MessageApiController extends Controller
$data = $request->all(); $data = $request->all();
try{ try{
$returnData = (new SystemNoticeLogic())->getSystemUpdateList($data); $returnData = (new SystemNoticeLogic())->getSystemUpdateList($data);
echo json_encode(['code'=>0,'count'=>count($returnData),'data'=>$returnData,'msg'=>'获取成功']); echo json_encode(['code'=>0,'count'=>$returnData['total'],'data'=>$returnData['data'],'msg'=>'获取成功']);
exit(); exit();
}catch(\Exception $e){ }catch(\Exception $e){
echo json_encode(['code'=>400,'msg'=>$e->getMessage()]); echo json_encode(['code'=>400,'msg'=>$e->getMessage()]);
...@@ -68,7 +68,7 @@ class MessageApiController extends Controller ...@@ -68,7 +68,7 @@ class MessageApiController extends Controller
$data = $request->all(); $data = $request->all();
try{ try{
$returnData = (new SystemNoticeLogic())->getSystemPreachList($data); $returnData = (new SystemNoticeLogic())->getSystemPreachList($data);
echo json_encode(['code'=>0,'count'=>count($returnData),'data'=>$returnData,'msg'=>'获取成功']); echo json_encode(['code'=>0,'count'=>$returnData['total'],'data'=>$returnData['data'],'msg'=>'获取成功']);
exit(); exit();
}catch(\Exception $e){ }catch(\Exception $e){
echo json_encode(['code'=>400,'msg'=>$e->getMessage()]); echo json_encode(['code'=>400,'msg'=>$e->getMessage()]);
...@@ -82,7 +82,7 @@ class MessageApiController extends Controller ...@@ -82,7 +82,7 @@ class MessageApiController extends Controller
$data = $request->all(); $data = $request->all();
try{ try{
$returnData = (new SystemNoticeLogic())->getSystemBulletinList($data); $returnData = (new SystemNoticeLogic())->getSystemBulletinList($data);
echo json_encode(['code'=>0,'count'=>count($returnData),'data'=>$returnData,'msg'=>'获取成功']); echo json_encode(['code'=>0,'count'=>$returnData['total'],'data'=>$returnData['data'],'msg'=>'获取成功']);
exit(); exit();
}catch(\Exception $e){ }catch(\Exception $e){
echo json_encode(['code'=>400,'msg'=>$e->getMessage()]); echo json_encode(['code'=>400,'msg'=>$e->getMessage()]);
......
app/Logic/SystemNoticeLogic.php
...@@ -38,7 +38,7 @@ class SystemNoticeLogic ...@@ -38,7 +38,7 @@ class SystemNoticeLogic
$value['data_json'] = json_encode($value); $value['data_json'] = json_encode($value);
} }
return $returnData['data']; return $returnData;
} }
//获得系统宣讲列表 //获得系统宣讲列表
...@@ -56,7 +56,7 @@ class SystemNoticeLogic ...@@ -56,7 +56,7 @@ class SystemNoticeLogic
$value['data_json'] = json_encode($value); $value['data_json'] = json_encode($value);
} }
return $returnData['data']; return $returnData;
} }
//获得系统公告列表 //获得系统公告列表
...@@ -73,7 +73,7 @@ class SystemNoticeLogic ...@@ -73,7 +73,7 @@ class SystemNoticeLogic
$value['create_time'] = date('Y-m-d H:i:s',$value['create_time']); $value['create_time'] = date('Y-m-d H:i:s',$value['create_time']);
$value['data_json'] = json_encode($value); $value['data_json'] = json_encode($value);
} }
return $returnData['data']; return $returnData;
} }
//保存或者新增数据 //保存或者新增数据
......
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 sign in to comment