From 3f0f3b75bace505e17162aff3169cb368dba44e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E4=B8=80=E5=B3=B0?= <1feng.0595@gmail.com> Date: Mon, 16 Oct 2017 00:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/UserController.php | 49 ++- app/Http/Model/User.php | 38 ++- public/images/weixin/ad_tit.png | Bin 5396 -> 3022 bytes .../views/weixin/user/userinfo.blade.php | 286 ++++++++++++++++-- routes/web.php | 1 + 5 files changed, 339 insertions(+), 35 deletions(-) diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 3952e46..bae8163 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -31,8 +31,15 @@ class UserController extends CommonController //修改用户信息 public function userInfoUpdate(Request $request) { - $data = ''; - if($request->input('user_name', null)!==null){$data['user_name'] = $request->input('user_name');} + if($request->input('user_name', null)!==null) + { + $data['user_name'] = $request->input('user_name'); + + if(User::getOneUser($data)) + { + return ReturnData::create(ReturnData::PARAMS_ERROR,null,'用户名已存在'); + } + } if($request->input('email', null)!==null){$data['email'] = $request->input('email');} if($request->input('sex', null)!==null){$data['sex'] = $request->input('sex');} if($request->input('birthday', null)!==null){$data['birthday'] = $request->input('birthday');} @@ -49,13 +56,47 @@ class UserController extends CommonController if($request->input('password', null)!==null){$data['password'] = $request->input('password');} if($request->input('head_img', null)!==null){$data['head_img'] = $request->input('head_img');} - if ($data != '') + if (isset($data)) { - User::modify(['id'=>Token::$uid],$data); + User::modify(array('id'=>Token::$uid),$data); } return ReturnData::create(ReturnData::SUCCESS); } + + //修改用户密码、支付密码 + public function userPasswordUpdate(Request $request) + { + if($request->input('password', '')!='' && $request->input('old_password', '')!='') + { + $data['password'] = $request->input('password'); + $data['old_password'] = $request->input('old_password'); + + if($data['password'] == $data['old_password']){return ReturnData::create(ReturnData::PARAMS_ERROR,null,'新旧密码相同');} + } + + if($request->input('pay_password', '')!='') + { + $data['pay_password'] = $request->input('pay_password'); + $data['old_pay_password'] = $request->input('old_pay_password',''); + + if($data['pay_password'] == $data['old_pay_password']){return ReturnData::create(ReturnData::PARAMS_ERROR,null,'新旧密码相同');} + } + + if (isset($data)) + { + $res = User::userPasswordUpdate(array('id'=>Token::$uid),$data); + + if($res === false) + { + return ReturnData::create(ReturnData::SYSTEM_FAIL,null,$res); + } + + return ReturnData::create(ReturnData::SUCCESS); + } + + return ReturnData::create(ReturnData::PARAMS_ERROR); + } //用户列表 public function userList(Request $request) diff --git a/app/Http/Model/User.php b/app/Http/Model/User.php index fad8ab2..521d03b 100644 --- a/app/Http/Model/User.php +++ b/app/Http/Model/User.php @@ -128,14 +128,46 @@ class User extends BaseModel } //获取用户信息 - public static function getUserInfo($user_id) + public static function getUserInfo($user_id) { $user = self::where('id', $user_id)->first(); if(!$user){return false;} $user->reciever_address = UserAddress::getOne($user->address_id); $user->collect_goods_count = CollectGoods::where('user_id', $user_id)->count(); - - return $user; + + $userinfo = $user->makeVisible(array('pay_password'))->toArray(); + $user->pay_password = 0; + if($userinfo['pay_password']){$user->pay_password = 1;} + + return $user; + } + + //修改用户密码、支付密码 + public static function userPasswordUpdate($where,array $param) + { + extract($param); + $data = ''; + + $user = self::where($where)->first(); + if(!$user){return false;} + + $user = $user->makeVisible(array('password','pay_password'))->toArray(); + + if(isset($old_password) && $old_password!=$user['password']){return false;} //旧密码错误 + if(isset($password) && $password==''){return false;} //新密码为空 + + if(isset($old_pay_password) && $old_pay_password!=$user['pay_password']){return false;} + if(isset($pay_password) && $pay_password==''){return false;} + + if(isset($password)){$data['password'] = $password;} + if(isset($pay_password)){$data['pay_password'] = $pay_password;} + + if ($data != '' && self::where($where)->update($data)) + { + return true; + } + + return false; } //注册 diff --git a/public/images/weixin/ad_tit.png b/public/images/weixin/ad_tit.png index 9ecc662c17ce916d47dc2368134202184953ce4a..f492eaaaef21db5cfc79f28c55d0d3f0d82c138a 100644 GIT binary patch delta 2359 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 delta 4778 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
    -
  • +
  • @@ -35,15 +35,19 @@

    头像

    - -
    • + + + -
  • +

  • 性别

     
    @@ -167,20 +212,66 @@ function update_nickname()
    • +
+ +
    +
  • +
    +

    修改密码

    +
     
    +
    + +
    • + -
- -
    -
  • -
    -

    修改密码

    -
     
    -
    - -
    • -
  • +

  • 支付密码

     
    -
    • + +
安全退出
diff --git a/routes/web.php b/routes/web.php index 90dbe42..767d642 100644 --- a/routes/web.php +++ b/routes/web.php @@ -131,6 +131,7 @@ Route::group(['prefix' => 'dataapi', 'namespace' => 'Api', 'middleware' => ['web Route::post('/user_signin', 'UserController@signin'); //签到 Route::get('/user_info', 'UserController@userInfo'); //用户详细信息 Route::post('/user_info_update', 'UserController@userInfoUpdate'); //修改用户信息 + Route::post('/user_password_update', 'UserController@userPasswordUpdate'); //修改用户密码、支付密码 Route::get('/user_list', 'UserController@userList'); //用户列表 Route::get('/user_money_list', 'UserMoneyController@userMoneyList'); //用户余额明细