客户昵称和名字

application/index/controller/Member.php

@@ -176,7 +176,7 @@ class Member extends Basic{
                 $type = 3;
             }
 
-            $fields = 'a.id,a.user_nick,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status';
+            $fields = 'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status';
             $data['list'] = $this->user->getUserAgent($pageNo, $pageSize, 'a.id DESC', $fields, $where, $type);
             $data['total'] = $this->user->getUserAgentTotal($where, $type);
             $return = $this->response($data['status'], $data['msg'], $data);
@@ -291,10 +291,6 @@ class Member extends Basic{
     public function pcEditClient() {
         $data = [];
 
-        if (empty($this->params['user_nick']) || empty($this->params['user_phone'])) {
-            return $this->response(101, 'user_nick or user_phone or id is null');
-        }
-
         if ($this->request->isPost()) {
             
             //编辑用户

application/index/controller/Remark.php

@@ -156,8 +156,9 @@ class Remark extends Basic
         }
 
         $user = new Users();
-        $user_res = $user->useraction_search_user_res($user_id);
+        $user_res = $user->useraction_search_user_res($user_id, 1);
         $user_res['user_pic'] = HEADERIMGURL.$user_res['user_pic'];
+
         $table      = new AAgents();
         $Agents_res = $table->Agents_res($user_res['agent_id']);
 

application/index/view/member/users_list.html

@@ -337,12 +337,6 @@
                                 <span class="fore-span ld-Marheight">面积:</span>
                                 <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name="name" type="number"><span class="fore-span ld-Marheight">元</span>
 
-                                
-                                
-                                
-                                
-                                
-                                
                                 <span class="fore-span ld-Marheight">电话:</span>
                                 <span class="fore-span ld-Marheight" id="cus_phone"></span>
                                 <div class="row">
@@ -352,6 +346,21 @@
                                 <span class="fore-span ld-Marheight" id="cus_date"></span>
                                 <div class="row">
 
+                                </div>
+                                <span class="fore-span ld-Marheight">邀请人:</span>
+                                <span class="fore-span ld-Marheight" id="referrer_user"></span>
+                                <div class="row">
+
+                                </div>
+                                <span class="fore-span ld-Marheight">昵称:</span>
+                                <span class="fore-span ld-Marheight" id="cus_nick"></span>
+                                <div class="row">
+
+                                </div>
+                                <span class="fore-span ld-Marheight">注册时间:</span>
+                                <span class="fore-span ld-Marheight" id="registration_time"></span>
+                                <div class="row">
+
                                 </div>
 
                                 <div class="form-group" >

application/model/Users.php

@@ -205,8 +205,8 @@ class Users extends Model
      */
     public function edit($data, $id = 0)
     {
-        if (!empty($data['user_nick'])) {
-            $insert_data['user_nick'] = $data['user_nick'];
+        if (!empty($data['user_name'])) {
+            $insert_data['user_name'] = $data['user_name'];
         }
         if (!empty($data['user_phone'])) {
             $insert_data['user_phone'] = $data['user_phone'];
@@ -300,17 +300,38 @@ class Users extends Model
 
     /**
      * @param $user_id
+     * @param int $referrer 是否查询邀请人
      * @return mixed
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\Exception
      * @throws \think\exception\DbException
      */
-    public function useraction_search_user_res($user_id)
+    public function useraction_search_user_res($user_id, int $referrer = 0)
     {
-        return db('u_users')
+        $field = 'id as user_id,agent_id,sex,user_nick,user_name,user_pic,user_status,user_phone,create_time,
+        referrer_source,referrer_id,registration_time';
+        $data = db('u_users')
             ->where('id', $user_id)
-            ->field('id as user_id,agent_id,sex,user_nick,user_pic,user_status,user_phone,create_time')
+            ->field($field)
+            ->find();
+
+        if ($referrer != 0) {
+            if ($data['referrer_source'] == 10) {
+                $referrer_user = $data['referrer_user'] = db('u_users')
+                    ->where('id', $data['referrer_id'])
+                    ->field('user_phone,user_name')
                     ->find();
+                $referrer_user_string = $referrer_user['user_name'] . '-'.$referrer_user['user_phone'];
+            } else {
+                $referrer_user = $data['referrer_user'] = db('a_agents')
+                    ->where('id', $data['referrer_id'])
+                    ->field('name,phone')
+                    ->find();
+                $referrer_user_string = $referrer_user['name'] . '-'.$referrer_user['phone'];
+            }
+            $data['referrer_user'] = $referrer_user_string ;
+        }
+
+        return $data;
     }
 
     /*public function user_search($phone_or_name,$Two_days_ago,$user_id,$pagesize,$pagenum) {

public/resource/js/user.js

@@ -229,7 +229,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
         Submit_follow: function() { //提交
             var params = {};
             params.id = user.user_id;
-            params.user_nick = $("#cus_name").val();
+            params.user_name = $("#cus_name").val();
             params.user_phone = $("#cus_phone").html()
             params.agents_id = user.agent_id2;
             params.sex = $("#sex").val();
@@ -329,10 +329,13 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                     if(data.code == 200){
                         if (data.data) {
                             $("#cus_id").html(data.data.user_info.user_id);//客户编号
-                            $("#cus_name").val(data.data.user_info.user_nick);//姓名
+                            $("#cus_name").val(data.data.user_info.user_name);//姓名
+                            $("#cus_nick").html(data.data.user_info.user_nick);//昵称
+                            $("#registration_time").html(data.data.user_info.registration_time);//昵称
                             $("#sex").val(data.data.user_info.sex);//性别
                             $("#cus_phone").html(data.data.user_info.user_phone);//电话
                             $("#cus_date").html(data.data.user_info.create_time);//上传时间
+                            $("#referrer_user").html(data.data.user_info.referrer_user);//上传时间
                             $("#cus_fang").val(data.data.user_info.agentinfo);//客方
                             var caozuo_table="";
                             $.each(data['data']['user_date'], function(i, item) {

public/resource/template/user_template_tpl.html

@@ -4,8 +4,8 @@
     <tr>
         <td>[%= it[item]['id'] %]</td>
         <td>
-            [% if(it[item]["user_nick"] != null) { %]
-                [%= it[item]["user_nick"] %]
+            [% if(it[item]["user_name"] != null) { %]
+                [%= it[item]["user_name"] %]
             [% } %]
         </td>
         <td>[%= it[item]["user_phone"] %]</td>
@@ -32,8 +32,8 @@
             [% } %]
         </td>
         <td>
-            [% if (it[item]['user_name'] != null){ %]
-                [%= it[item]["user_name"] %]
+            [% if (it[item]['user_nick'] != null){ %]
+                [%= it[item]["user_nick"] %]
             [% } %]
         </td>
         <td>