用户批量禁用和注销

application/admin/view/user/user/index.html

@@ -21,7 +21,7 @@
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
-
+-->
                         <div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>-->
+                        </div>
 
                         
                     </div>

application/api/controller/User.php

@@ -225,8 +225,11 @@ class User extends Api
         $userInfo = Db::name('user')->where(['mini_openid'=>$openid])->find();
 
         if($userInfo) {
-            if ($userInfo['status'] != 1) {
-                $this->error(__('Account is locked'));
+            if ($userInfo['status'] == 0) {
+                $this->error('账号已被禁用');
+            }
+            if ($userInfo['status'] == -1) {
+                $this->error('账号已被注销');
             }
             //如果已经有账号则直接登录
             $res = $this->auth->direct($userInfo['id']);

application/common/library/Auth.php

@@ -103,8 +103,12 @@ class Auth
                 $this->setError('Account not exist');
                 return false;
             }
-            if ($user['status'] != 1) {
-                $this->setError('Account is locked');
+            if ($user['status'] == 0) {
+                $this->setError('账号已被禁用');
+                return false;
+            }
+            if ($user['status'] == -1) {
+                $this->setError('账号已被注销');
                 return false;
             }
             $this->_user = $user;