Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

5 years ago · 7ff7758df2
parent ef0b3c86f0 9b026796f2
commit 7ff7758df2
1 changed files with 3 additions and 0 deletions
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@ -204,6 +204,9 @@ class MemberController extends ThinkController
                $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']);
                $v['lock_status'] = get_info_status($v['lock_status'],4);
                $v['check_status'] = $v['check_status']==1 ? "正常" :"拉黑";
+                if(get_info_status($v['lock_status'],4) != '锁定') {
+                    $v['lock_status'] = '';
+                }
                // $data[$k] = $v;
            }