合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2057

@@ -25,7 +25,7 @@ class MonthCountLogic extends BaseLogic
      */
      */
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
-        $lists = $this->model->list($map,$order,$filed,'desc',12);
+        $lists = $this->model->list($map,$order,$filed,'desc',36);
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
             foreach ($lists as $k => $v){
             foreach ($lists as $k => $v){
                 if(empty($v['source_country'])){
                 if(empty($v['source_country'])){
@@ -55,7 +55,7 @@ class MonthCountLogic extends BaseLogic
      */
      */
     public function getIpPvCount(){
     public function getIpPvCount(){
         $count = new Count();
         $count = new Count();
-        $startTime = date("Y-m-d", strtotime("-11 months", mktime(0, 0, 0)));
+        $startTime = date("Y-m-d", strtotime("-35 months", mktime(0, 0, 0)));
         $ensTime = date('Y-m-d',time());
         $ensTime = date('Y-m-d',time());
         $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']],'id',['*'],'asc');
         $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']],'id',['*'],'asc');
         $groupedData = [];
         $groupedData = [];