commit

app/api/controller/AuthController.php

@@ -6,6 +6,7 @@ namespace app\api\controller;
 
 use app\admin\model\sms\SmsRecord;
 use app\http\validates\user\RegisterValidates;
+use app\http\validates\user\RestValidates;
 use app\models\user\User;
 use app\models\user\UserToken;
 use app\models\user\WechatUser;
@@ -264,16 +265,16 @@ class AuthController
     {
         list($account, $captcha, $password) = UtilService::postMore([['account', ''], ['captcha', ''], ['password', '']], $request, true);
         try {
-            validate(RegisterValidates::class)->scene('register')->check(['account' => $account, 'captcha' => $captcha, 'password' => $password]);
+            validate(RestValidates::class)->scene('register')->check(['account' => $account, 'captcha' => $captcha, 'password' => $password]);
         } catch (ValidateException $e) {
             return app('json')->fail($e->getError());
         }
-//        $verifyCode = CacheService::get('code_' . $account);
-//        if (!$verifyCode)
-//            return app('json')->fail('请先获取验证码');
-//        $verifyCode = substr($verifyCode, 0, 6);
-//        if ($verifyCode != $captcha)
-//            return app('json')->fail('验证码错误');
+        $verifyCode = CacheService::get('code_' . $account);
+        if (!$verifyCode)
+            return app('json')->fail('请先获取验证码');
+        $verifyCode = substr($verifyCode, 0, 6);
+        if ($verifyCode != $captcha)
+            return app('json')->fail('验证码错误');
         if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
             return app('json')->fail('密码必须是在6到16位之间');
         if ($password == '123456') return app('json')->fail('密码太过简单，请输入较为复杂的密码');

app/api/controller/user/UserController.php

@@ -751,6 +751,7 @@ class UserController
         if (!$user) return app('json')->fail('没有当前用户');
 
         $userInfo = User::where('uid', $request->uid())->find();
+        if ($userInfo['is_real'] != 1)  return app('json')->fail('仅限团长转账');
         if ($userInfo['sp_final'] < $data['money']) return app('json')->fail('余额不足');
         User::beginTrans();
         $user['sp_final'] += $data['money'];
@@ -771,7 +772,7 @@ class UserController
     }
 
     /**
-     * 购买倒计时
+     * 修改密码
      * @param Request $request
      * @return mixed
      * @throws DataNotFoundException

app/http/validates/user/RestValidates.php

@@ -0,0 +1,44 @@
+<?php
+namespace app\http\validates\user;
+
+
+use think\Validate;
+
+/**
+ * 注册验证
+ * Class RegisterValidates
+ * @package app\http\validates\user
+ */
+class RestValidates extends Validate
+{
+    protected $regex = [ 'phone' => '/^1[3456789]\d{9}$/'];
+
+    protected $rule = [
+        'phone'  =>  'require|regex:phone',
+        'account'  =>  'require|regex:phone',
+        'captcha'  =>  'require|length:6',
+        'password'  =>  'require',
+    ];
+
+    protected $message  =   [
+        'phone.require'     =>  '手机号必须填写',
+        'phone.regex'       =>  '手机号格式错误',
+        'account.require'   =>  '手机号必须填写',
+        'account.regex'     =>  '手机号格式错误',
+        'captcha.require'   =>  '验证码必须填写',
+        'captcha.length'    =>  '验证码不能超过6个字符',
+        'password.require'  =>  '密码必须填写',
+    ];
+
+
+    public function sceneCode()
+    {
+        return $this->only(['phone']);
+    }
+
+
+    public function sceneRegister()
+    {
+        return $this->only(['account','captcha','password','payment_pas']);
+    }
+}