create_time

application/api_broker/controller/HomePageLog.php

@@ -140,7 +140,7 @@ class HomePageLog extends Basic
             $result[$key]['img']        = $res_a[0]['img'];
             $result[$key]['store_name'] = $res_a[0]['store_name'];
             if ($if_search)
-                $result[$key]['create_time'] = date("Y-m-d H:i:s",$value["create_time"]);
+                $result[$key]['create_time'] = date("Y-m-d H:i:s",$value["create_time"] / 1000);
 
             //判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
             $ser                                           = new UserExpiredTimeService();

application/index/controller/Remark.php

@@ -223,13 +223,15 @@ class Remark extends Basic
         if (!empty($this->params['site_id'])) {
             $site_id = $this->params['site_id'];
         }
+        $if_search = false;
 
         if ($this->siteId == "10001" && ($this->params['agent_id'] > 0 || !empty($this->params["content"])) && empty($this->params['user_id'])) {
             $searchService = new SearchService();
-            $params['search_content'] = $this->params['content'];
+            $this->params['search_content'] = $this->params['content'];
             $search_result = $searchService->searchByKeyword($this->params, $this->params['pageNo'], $this->params['pageSize'], $this->params['agent_id']);
             $search_result = json_decode($search_result, true);
             $result        = $search_result["result"]["items"];
+            $if_search = true;
         } else {
             $follow_up_service = new PhoneFollowUpService($site_id);
             $result_data = $follow_up_service->getPhoneFollowList($this->params['start_date'], $this->params['end_date'], $where, $this->userId);
@@ -256,11 +258,16 @@ class Remark extends Basic
                 $list[$k]['label_name'] = $v['label_name'];
                 $list[$k]['is_outstrip_twenty_four_hours'] = $v['is_outstrip_twenty_four_hours'];
                 $list[$k]['is_outpace_call_num'] = $v['is_outpace_call_num'];
-                $list[$k]['create_time'] = $v['create_time'];
                 $list[$k]['user_id'] = $v['user_id'];
                 $list[$k]['content'] = $v['content'];
                 $list[$k]['user_status'] = $v['user_status'];
                 $list[$k]['id'] = $v['id'];
+
+                if ($if_search) {
+                    $list[$k]['create_time'] = date('Y-m-d H:i:s', $v['create_time']/1000);
+                } else {
+                    $list[$k]['create_time'] = $v['create_time'];
+                }
             }
         }
         $data['data']['list'] = $list;