Merge branch 'feature/group_type' into dev

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)

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 />