Merge branch 'dev' into 'master'

Dev

See merge request !7

app/Http/Controllers/MessageApiController.php

@@ -40,7 +40,7 @@ class MessageApiController extends Controller
         $data = $request->all();
         try{
             $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();
         }catch(\Exception $e){
             echo json_encode(['code'=>400,'msg'=>$e->getMessage()]);
@@ -68,7 +68,7 @@ class MessageApiController extends Controller
         $data = $request->all();
         try{
             $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();
         }catch(\Exception $e){
             echo json_encode(['code'=>400,'msg'=>$e->getMessage()]);
@@ -82,7 +82,7 @@ class MessageApiController extends Controller
         $data = $request->all();
         try{
             $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();
         }catch(\Exception $e){
             echo json_encode(['code'=>400,'msg'=>$e->getMessage()]);

app/Logic/SystemNoticeLogic.php

@@ -38,7 +38,7 @@ class SystemNoticeLogic
             $value['data_json'] = json_encode($value);
         }
 
-        return $returnData['data'];
+        return $returnData;
     }
 
     //获得系统宣讲列表
@@ -56,7 +56,7 @@ class SystemNoticeLogic
             $value['data_json'] = json_encode($value);
         }
 
-        return $returnData['data'];
+        return $returnData;
     }
 
     //获得系统公告列表
@@ -73,7 +73,7 @@ class SystemNoticeLogic
             $value['create_time'] = date('Y-m-d H:i:s',$value['create_time']);
             $value['data_json'] = json_encode($value);
         }
-        return $returnData['data'];
+        return $returnData;
     }
 
     //保存或者新增数据