修正

app/api/model/User.php

@@ -5,5 +5,5 @@ use app\common\model\TimeModel;
 
 class User extends TimeModel
 {
-    protected $deleteTime = 'delete_time';
+//    protected $deleteTime = 'delete_time';
 }

app/api/service/UserService.php

@@ -18,14 +18,15 @@ class UserService {
      */
     public function login(string $uname,string $pass){
         // query db
-        $drs = User::where(['nick_name'=>$uname])->find();
+        $drs = User::where(['nick_name'=>$uname,'delete_time'=>0])->find();
         // 异常处理
         if(!isset($drs)){
             throwError('用户不存在');
             return -1;
         }else{
+            $fpass = password($pass.$drs['salt']);
             // 对比密码
-            if($drs['password'] != $pass){
+            if($drs['password'] != $fpass){
                 throwError('密码错误');
                 return false;
             }
@@ -40,10 +41,11 @@ class UserService {
      * @return bool
      */
     public function register(array $arr){
+        $salt = makeSalt(6);
         // 密码加密
-        $arr['password'] = password($arr['password']);
+        $arr['password'] = password($arr['password'].$salt);
         // 生成salt
-        $arr['salt'] = makeSalt(6);
+        $arr['salt'] = $salt;
         $dtime =time();
         $arr['create_time'] = $dtime;
         $arr['update_time'] = $dtime;