edit

service/agent/src/Auth.php

@@ -14,13 +14,20 @@ class Auth
     public function login()
     {
     	$mobile = Dever::input('mobile');
+        $pass = Dever::input('pass');
         $where['mobile'] = Dever::load('agent/lib/member')->checkMobile($mobile);
-        Dever::load('agent/lib/member')->checkMcode($where['mobile']);
+        if (!$pass) {
+            Dever::load('agent/lib/member')->checkMcode($where['mobile']);
+        }
+        
         $user = Dever::db('agent/member')->find($where);
 
         if (!$user) {
             Dever::alert('登录失败，手机号错误，请重新输入');
         }
+        if ($pass && $user['password'] != sha1($pass)) {
+            Dever::alert('登录失败，密码错误，请重新输入');
+        }
 
         if ($user && $user['status'] == 2) {
         	$data = Dever::load('passport/reg')->getSign($user['id']);