同步修改客户跟进返回字段

application/index/controller/Remark.php

@@ -100,7 +100,7 @@ class Remark extends Basic
                 $where['agent_id'] = ['in', $agent_id_arr];
             }
         }
-        $field = 'user_id,create_time,content,user_status,labels_id,agent_id';
+        $field = 'user_id,create_time,content,user_status,labels_id,agent_id as f_agent_id';
         $data['data']['list'] = $u_phone_follow->getFollowList($pageNo, $pageSize, $order_ = 'id desc', $field, $where);
 
         foreach ($data['data']['list'] as $k=>$v) {

application/model/UPhoneFollowPp.php

@@ -277,14 +277,16 @@ class UPhoneFollowPp extends BaseModel
         $label_data = $m_label->field('id,name')->where('type', 1)->select();
         foreach ($data as $k => $v) {
 
-            if (!empty($v['agent_id'])) {
-                $data[$k]['admin'] = $m_agent->getAgentsById($v['agent_id'], 'name');
+            if (!empty($v['f_agent_id'])) {
+                $data[$k]['admin'] = $m_agent->getAgentsById($v['f_agent_id'], 'name');
             }
 
             if (!empty($v['user_id'])) {
-                $user_data = $m_user->getUserById('user_name,user_phone', $v['user_id']);
-                $data[$k]['user_name'] = $user_data['user_name'];
+                $user_data = $m_user->getUserById('user_name,user_phone,vip,agent_id', $v['user_id']);
+                $data[$k]['user_name']  = $user_data['user_name'];
                 $data[$k]['user_phone'] = $user_data['user_phone'];
+                $data[$k]['vip']        = $user_data['vip'];
+                $data[$k]['agent_id']   = $user_data['agent_id']; //客户客方
             }
 
             if (!isset($v['labels_id'])) {