短信修改

application/api/controller/Member.php

@@ -147,7 +147,7 @@ class Member extends Basic
                         $jwt_data['phone']   = $phone;
                         $jwt_data['code']    = $_code;
 
-//                        $data['data']['sms_code']   = $_code;
+                        $data['data']['sms_code']   = $_code;
                         $data['data']['token']  = $jwt->createToken($jwt_data);
                         $data['status'] = 200;
                         $data['msg']    = '发送短信成功';
@@ -207,9 +207,9 @@ class Member extends Basic
                 'phone'=> $phone,
                 'code' => $code,
                 'is_success' => 1,
-            ])->whereTime('send_time', '>',time()-58)->find();
+            ])->whereTime('send_time', '>',time()-300)->find();
 
-            if (time() - strtotime($note_data->send_time) > 300) {
+            if (!$note_data) {
                 return $this->response(101, '请重新获取验证码');
             }
         }
@@ -260,8 +260,8 @@ class Member extends Basic
                             $insert_data['AuthToken'] = $jwt->createToken($jwt_data);
                             $insert_data['id'] = $this->user->id;
 
-                            Session::set('u_user', $insert_data['data']);   //登录
-                            Session::delete('_code');      //销毁验证码
+//                            Session::set('u_user', $insert_data['data']);   //登录
+//                            Session::delete('_code');      //销毁验证码
                             $data['data'] = $insert_data;
                             $data['msg']  = '注册成功';
                             $data['status'] = 200;
@@ -494,6 +494,8 @@ class Member extends Basic
 
         if ($note_data) {
             $data['status'] = 200;
+        } else {
+            $data['msg']    = '验证码错误';
         }
 
         return $this->response($data['status'], $data['msg'], $data['data']);