Merge branch 'feature/pop_rules' into dev

Application/Home/Controller/PromoteController.class.php

@@ -238,7 +238,7 @@ class PromoteController extends BaseController
         ->where("(type = 1 and pop_time = {$currentTime}) or (type = 2 and pop_time = {$week})")
         ->order("sort asc, id desc")
         ->select();
-        $this->assign("match_rules_id", $match_rules ? json_encode(array_column($match_rules, 'id')) : []);
+        $this->assign("match_rules_id", $match_rules ? json_encode(array_column($match_rules, 'id')) : 'null');
 
         $this->assign("user_count", $user_count);
         $this->assign("total_money", $total_money);