Merge branch 'test'

application/index/service/UserLogService.php

@@ -109,32 +109,7 @@ class  UserLogService
         $data['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
         /*判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期 end*/
 
-        /*查询客户邀请人 start*/
-        /*引荐人来源 10：会员 20：b端经纪人*/
-        if ($user_arr['referrer_source'] == 0) {
-            $user_invite_info = [];
-        } elseif ($user_arr['referrer_source'] == 10) {
-            $userArr = $this->userModel->selectUser($user_arr['referrer_id'], "id,user_phone");
-            if (!$userArr) {
-                $user_invite_info = [];
-            } else {
-                $user_invite_info['referrer_source'] = $user_arr['referrer_source'];
-                $user_invite_info['user_phone'] = $userArr['user_phone'] ? preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $userArr['user_phone']) : '';
-                $user_invite_info['id'] = $userArr['id'];
-            }
-        } else {
-            $model = new AAgents();
-            $result = $model->searchAgentsByKeyword("id,name,phone", ["id" => $user_arr['referrer_id']]);
-            if (!$result) {
-                $user_invite_info = [];
-            } else {
-                $user_invite_info['referrer_source'] = $user_arr['referrer_source'];
-                $user_invite_info['name'] = $result[0]['name'];
-                $user_invite_info['phone'] = $result[0]['phone'];
-            }
-        }
-        $data['user_invite_info'] = $user_invite_info;
-        /*查询客户邀请人 end*/
+
 
 
         // 判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定
@@ -164,9 +139,17 @@ class  UserLogService
         $s_index_user = new UserService();
         $data['user_bind_list'] = $s_index_user->userBindInfo($user_id);
 
+        /**
+         * 以下是新方法，上面的找时间替换掉
+         */
+
         #拨打电话按钮是否显示  0:显示 1:不显示
         $data['is_phone_button_show'] = $this->isPhoneButtonShow($user_id,$user_arr['user_phone'],$user_arr["agent_id"],$agent_id,$user_arr['vip']);
 
+        $invite_info = $this->userDetailUserInvite($user_arr['referrer_id'],$user_arr['referrer_source']);
+        $data['user_inviter_phone'] = $invite_info['invite_phone'];
+        $data['user_inviter_id'] = $invite_info['invite_id'];
+
         return ["code" => 200, "data" => $data];
     }
 
@@ -471,7 +454,7 @@ class  UserLogService
             $referrer_user_string['invite_id'] = $referrer_id;
         } else {
             $referrer_res = $this->agentModel->verifyUser('name,phone', '', [ 'id' => $referrer_id ]);
-            $referrer_user_string['invite_phone'] = $referrer_res['phone'];
+            $referrer_user_string['invite_phone'] = $referrer_res['name'].'-'.$referrer_res['phone'];
             $referrer_user_string['invite_id'] = '';
         }
         return $referrer_user_string;

public/resource/js/user.js

@@ -1773,7 +1773,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 								
 							}
 							 $(".user-details-introduce-id").html(data.data.user_info.referrer_user); //转介绍详情
-							 $("#introduce_edit_user").val(data.data.user_info.referrer_user); //转介绍编辑
+							 $("#introduce_edit_user").val(data.data.user_inviter_phone+'-'+data.data.user_inviter_id); //转介绍编辑
 							if(data.data.user_invite_info.referrer_source == 10){
 								$(".user-details-introduce").html('是'); //转介绍详情
 							}else{

public/resource/js/user_genjing_modal.js

@@ -1192,7 +1192,8 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 								$("#user_label_edit").val(2);
 								
 							}
-							 $(".user-details-introduce-id").html(data.data.user_info.referrer_user); //转介绍详情
+							 $(".user-details-introduce-id").html(data.data.user_inviter_phone+'-'+data.data.user_inviter_id); //转介绍详情
+							 
 							 $("#introduce_edit_user").val(data.data.user_info.referrer_user); //转介绍编辑
 							if(data.data.user_invite_info.referrer_source == 10){
 								$(".user-details-introduce").html('是'); //转介绍详情