tanyuan
/
wx.sstbc.com
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of 101.132.227.52:tanyuan/wx.sstbc.com

Browse Source 
 Conflicts:
	app/Http/Controllers/Mobile/UserController.php
master
cody 6 months ago
parent d72d748f89 b306b433d8
commit c8e9e9e589
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File

21
app/Http/Controllers/Mobile/UserController.php
Unescape View File

@ -312,20 +312,12 @@ class UserController extends CommonController
$messages = [ $messages = [
'mobile.required' => '手机号必填', 'mobile.required' => '手机号必填',
'mobile.numeric' => '手机号格式错误', 'mobile.numeric' => '手机号格式错误',
<<<<<<< HEAD
// 'code' => '验证码必填',
=======
'code' => '验证码必填', 'code' => '验证码必填',
>>>>>>> 8508a4aca7d83d334aa2ec18b4291c6d5750a769
'is_bind' => '是否绑定必填', 'is_bind' => '是否绑定必填',
]; ];
$validator = Validator::make($all, [ $validator = Validator::make($all, [
'mobile' => 'required|numeric', 'mobile' => 'required|numeric',
<<<<<<< HEAD
// 'code' => 'required',
=======
'code' => 'required', 'code' => 'required',
>>>>>>> 8508a4aca7d83d334aa2ec18b4291c6d5750a769
'is_bind' => 'required', 'is_bind' => 'required',
], $messages); ], $messages);
if ($validator->fails()) { if ($validator->fails()) {
@ -369,32 +361,19 @@ class UserController extends CommonController
$messages = [ $messages = [
'mobile.required' => '手机号必填', 'mobile.required' => '手机号必填',
'mobile.numeric' => '手机号格式错误', 'mobile.numeric' => '手机号格式错误',
<<<<<<< HEAD
// 'code' => '验证码必填',
];
$validator = Validator::make($all, [
'mobile' => 'required|numeric',
// 'code' => 'required',
=======
'code' => '验证码必填', 'code' => '验证码必填',
]; ];
$validator = Validator::make($all, [ $validator = Validator::make($all, [
'mobile' => 'required|numeric', 'mobile' => 'required|numeric',
'code' => 'required', 'code' => 'required',
>>>>>>> 8508a4aca7d83d334aa2ec18b4291c6d5750a769
], $messages); ], $messages);
if ($validator->fails()) { if ($validator->fails()) {
return $this->fail([StarterResponseCode::START_ERROR_PARAMETER, implode(',', $validator->errors()->all())]); return $this->fail([StarterResponseCode::START_ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
} }
$key = 'sms_' . $all['mobile']; $key = 'sms_' . $all['mobile'];
$check = Cache::get($key); $check = Cache::get($key);
<<<<<<< HEAD
// if (empty($check)) return $this->fail([ResponseCode::ERROR_BUSINESS, '请先发送验证码']);
// if ($check['code'] != $all['code']) return $this->fail([ResponseCode::ERROR_BUSINESS, '验证码错误']);
=======
if (empty($check)) return $this->fail([ResponseCode::ERROR_BUSINESS, '请先发送验证码']); if (empty($check)) return $this->fail([ResponseCode::ERROR_BUSINESS, '请先发送验证码']);
if ($check['code'] != $all['code']) return $this->fail([ResponseCode::ERROR_BUSINESS, '验证码错误']); if ($check['code'] != $all['code']) return $this->fail([ResponseCode::ERROR_BUSINESS, '验证码错误']);
>>>>>>> 8508a4aca7d83d334aa2ec18b4291c6d5750a769
// 判断手机号是否存在 // 判断手机号是否存在
$hasMobile = User::where('mobile', $all['mobile'])->first(); $hasMobile = User::where('mobile', $all['mobile'])->first();
if ($hasMobile) { if ($hasMobile) {

Write Preview
Loading…
Cancel
Save