添加密码登录

app/Services/Api/MemberService.php

@@ -522,12 +522,8 @@ class MemberService extends BaseService
         }
 
         // 验证是否注册，没有则注册
-        $data = $this->model->where(['email' => $email, 'mark' => 1])->select(['id', 'username','point_id', 'parent_id', 'code', 'status'])->first();
+        $data = $this->model->where(['email' => $email, 'mark' => 1])->select(['id', 'username','point_id', 'parent_id', 'code', 'status','password'])->first();
         $data = $data ? $data->toArray() : [];
-        if(!empty($data)){
-            $this->error = 1003;
-            return $data;
-        }
 
         if(!empty($password)){
             if(get_password($password) != $data['password']){
@@ -606,7 +602,7 @@ class MemberService extends BaseService
         }
 
         // 验证是否注册，没有则注册
-        $data = $this->model->where(['mobile' => $mobile, 'mark' => 1])->select(['id', 'username','point_id','mobile', 'parent_id', 'code', 'status'])->first();
+        $data = $this->model->where(['mobile' => $mobile, 'mark' => 1])->select(['id', 'username','point_id','mobile', 'parent_id', 'code', 'status','password'])->first();
         $data = $data ? $data->toArray() : [];
 
         if(!empty($password)){