Merge remote-tracking branch 'origin/test-hujun1.15' into test-hujun1.15

application/index/controller/CellPhone.php

@@ -168,7 +168,7 @@ class CellPhone extends Basic
         $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
 
         $report = new SecretReport();
-        $field = 'agents_id,users_id,release_time,start_time,call_type,call_time,time';
+        $field = 'agents_id,users_id,release_time,start_time,call_type,call_time,time,voice_file';
         $where = [];
 
         if ($this->params['start_time']) {

application/model/SecretReport.php

@@ -60,9 +60,18 @@ class SecretReport extends Model
 
             if ($v->users_id) {
                 $result[$k]['user_nick'] = Db::table('u_users')->where('id',$v->users_id)->value('user_nick');
+                $result[$k]['follow_up'] = Db::table('u_phone_follow_up')->where('user_id',$v->users_id)->value('content');
             } else {
                 $result[$k]['user_nick'] = "";
+                $result[$k]['follow_up'] = "";
             }
+
+            if ($v->voice_file) {
+                $result[$k]['voice_file'] = CURRENT_URL.'public'.DS.'static'.DS.'voice'.$v->voice_file;
+            } else {
+                $result[$k]['voice_file'] = "";
+            }
+
             $result[$k]['time']  = $v->time;
             //主叫收费
             if ($v->call_type == 0) {