挂售

app/api/controller/AuthController.php

@@ -44,8 +44,8 @@ class AuthController
         if ($user) {
             if ($user->pwd !== md5($request->param('password')))
                 return app('json')->fail('账号或密码错误');
-            if ($user->pwd === md5(123456))
-                return app('json')->fail('请修改您的初始密码，再尝试登陆！');
+//            if ($user->pwd === md5(123456))
+//                return app('json')->fail('请修改您的初始密码，再尝试登陆！');
         } else {
             return app('json')->fail('账号或密码错误');
         }
@@ -452,7 +452,7 @@ class AuthController
         if (User::where('phone', $phone)->where('user_type', '<>', 'h5')->count())
             return app('json')->fail('此手机已经绑定，无法多次绑定！');
         if (User::where('account', $phone)->where('phone', $phone)->where('user_type', 'h5')->find()) {
-            if (!$step) return app('json')->success('H5已有账号是否绑定此账号上', ['is_bind' => 1]);
+            if (!$step) return app('json')->fail('H5已有账号是否绑定此账号上', ['is_bind' => 1]);
             $userInfo->phone = $phone;
         } else {
             $userInfo->account = $phone;