客户列表和详情修改

application/index/controller/Member.php

@@ -249,7 +249,9 @@ class Member extends Basic{
                 $where['a.first_login_time'] = ['between time', [$params['first_login_start'] . ' 00:00:00', $where['a.first_login_time'] = $params['first_login_end'] . ' 23:59:59']];
             }
 
-            $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,a.first_login_time,a.last_login_time,a.agent_id,a.vip';
+            $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.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand';
+
 
             try {
                 $data['list'] = $this->user->getUserAgent($pageNo, $pageSize, 'a.id DESC', $fields, $where, $type);

application/model/Users.php

@@ -304,7 +304,8 @@ class Users extends Model
     public function getClient($id)
     {
         if ($id) {
-            $field = "a.id as user_id,a.user_nick,a.user_name,a.user_phone,a.sex,a.agent_id,a.industry_type,a.price_demand,a.area_demand,a.create_time,b.name,b.phone";
+            $field = "a.id as user_id,a.user_nick,a.user_pic,a.other_pic,a.user_name,a.user_phone,a.sex,a.agent_id,
+            a.industry_type,a.price_demand,a.area_demand,a.create_time,b.name,b.phone,a.first_login_time";
 
             $data           = $this->field($field)
                 ->alias('a')
@@ -313,6 +314,14 @@ class Users extends Model
             $data['agents'] = $data['name'] . '-' . $data['phone'];
 
             $data['user_phone'] = hide_customer_phone($data['user_phone']);
+
+            if (empty($data['user_pic'])) {
+                $data['user_pic'] = $data['other_pic'];
+            } else {
+                $data['user_pic'] = HEADERIMGURL . $data['user_pic'];
+            }
+
+            unset($data['other_pic']);
             unset($data['name']);
             unset($data['phone']);
         } else {