Your Name 3 years ago
parent
commit
319fac953a
2 changed files with 3 additions and 3 deletions
  1. 1 1
      learn/active/database/info.php
  2. 2 2
      learn/active/src/Auth.php

+ 1 - 1
learn/active/database/info.php

@@ -403,7 +403,7 @@ return array
             'default'   => '1',
             'desc'      => '核销人员',
             'match'     => 'option',
-            'search'    => 'selects',
+            // 'search'    => 'selects',
             'update'    => 'checkbox',
             'option'    => $off,
             // 'list'      => $search_auth == 2 ? true : false,

+ 2 - 2
learn/active/src/Auth.php

@@ -14,7 +14,7 @@ Class Auth
 			$this->checkMcode($mobile);
 		} 
 		if ($user) {
-			if($user['pass'] != sha1($pass) && $user['old_pwd'] != md5($pass. $user['old_salt'])) {
+			if($pass && $user['pass'] != sha1($pass) && $user['old_pwd'] != md5($pass. $user['old_salt'])) {
 				Dever::alert('密码不正确');
 			}
 			$data = Dever::load('passport/reg')->getSign($user['id']);
@@ -22,7 +22,7 @@ Class Auth
 		} else {
 			$member = Dever::db('agent/member')->find(array('mobile'=>$mobile));
 			if ($member) {
-				if($member['pass'] != sha1($pass) && $member['old_pwd'] != md5($pass. $member['old_salt'])) {
+				if($pass && $member['pass'] != sha1($pass) && $member['old_pwd'] != md5($pass. $member['old_salt'])) {
 					Dever::alert('密码不正确');
 				}
 				$insert['mid'] = $member['id'];