完善功能

app/admin/controller/asset/HouseTypeController.php

@@ -104,7 +104,7 @@ class HouseTypeController extends Curd
         if (!empty($request->post('asset_house_address'))) {
             $data['asset_json'] = json_encode(['address' => $request->post('asset_house_address')]);
         }else{
-            $data['asset_json'] = [];
+            $data['asset_json'] = '[]';
         }
 
         return $data;

app/admin/controller/statistics/MemberController.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller\statistics;
 
 use app\model\Member;
+use support\Db;
 
 class MemberController
 {
@@ -11,9 +12,9 @@ class MemberController
         // 权益会员数量
         $memberCount = Member::where('member_is_owner', 'N')->count();
         // 业主数量
-        $owner = Member::where('member_is_owner', 'N')->count();
+        $ownerCount = Member::where('member_is_owner', 'N')->count();
         // 用户总数
-        $userCount = $memberCount + $owner;
+        $userCount = $memberCount + $ownerCount;
         // 今日新增用户数
         $todayTime = strtotime(date('Y-m-d 00:00:00'));
         $todayCount = Member::where('member_addtimes', '>', $todayTime)->count();
@@ -21,5 +22,23 @@ class MemberController
         $monthTime = strtotime(date('Y-m-01 00:00:00'));
         $monthCount = Member::where('member_addtimes', '>', $monthTime)->count();
 
+        // 折线图
+        $newAddition = Db::select("SELECT DATE_FORMAT(FROM_UNIXTIME(member_addtimes), '%Y/%m') AS `month`,count(*) as `num` FROM app_member group by month");
+        $newAdditionData = [];
+        foreach ($newAddition as $item){
+            $newAdditionData['category'][] = $item->month;
+            $newAdditionData['data'][] = $item->num;
+        }
+
+        $data = [
+            'memberCount'=>$memberCount,
+            'ownerCount'=>$ownerCount,
+            'userCount'=>$userCount,
+            'todayCount'=>$todayCount,
+            'monthCount'=>$monthCount,
+            'newAdditionData'=>$newAdditionData
+        ];
+
+        return json_success('',$data);
     }
 }