From 93fe724c15515912f6d41c19c0ff5e21e79f0716 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Thu, 9 Jan 2020 14:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=94=A8=E6=88=B7=E9=94=81?=
 =?UTF-8?q?=E5=AE=9A=E5=A4=87=E6=B3=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/MemberController.class.php | 2 +-
 Application/Admin/View/Member/user_info.html            | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 190b99bf6..7f6f4bde7 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -138,7 +138,7 @@ class MemberController extends ThinkController
         
         //计算用户列表
         $data =  M("user","tab_")
-        ->field("tab_user.id,`device_number`,`age_status`,`account`,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,`register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(sum(ss.pay_amount), 0) AS recharge_total")
+        ->field("tab_user.id,`device_number`,`age_status`,`account`,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark,`register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(sum(ss.pay_amount), 0) AS recharge_total")
         ->where($map)
         ->group("tab_user.id")
         // ->page($page, $row)
diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html
index 99a583c77..11d4073a2 100644
--- a/Application/Admin/View/Member/user_info.html
+++ b/Application/Admin/View/Member/user_info.html
@@ -227,6 +227,7 @@
                     <th  >注册IP</th>
                     <th  >最后登录时间</th>
                     <th  >设备号</th>
+                    <th  >锁定备注</th>
                     <th  >账号状态</th>
                     <th  >拉黑状态</th>
                     <th  >操作</th>
@@ -309,6 +310,9 @@
                                     {$data.device_number|encryptStr}
                                 </if>
                             </td>
+                            <td >
+                                {$data.lock_remark}
+                            </td>
                             <if condition="get_info_status($data['lock_status'],4) eq 锁定">
                                 <td style="color:red;">已{:get_info_status($data['lock_status'],4)}</td>
                                 <else />