Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/api/user/User.php

@@ -933,6 +933,9 @@ class User extends BaseController
                 //赠送积分 完善实名送90个积分，同时送邀请人50个积分
                 $userRepository->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','', '', 1, '', 1);
                 $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
+                Db::name('user')
+                    ->where('uid', $member_id)
+                    ->update(['real_name' => $params['user_name'], 'nickname' => $params['user_name']]);
                 if($member_info['spread_uid']){
                     //好友完善实名系统赠送50个积分
                     $spreadUid = $member_info['spread_uid'];
@@ -1283,8 +1286,11 @@ class User extends BaseController
         $data['birthday'] = $this->request->param('birthday', null);
         $data['addres'] = $this->request->param('addres', null);
         $data['mark'] = $this->request->param('mark', null);
-        $data['account'] = $this->request->param('account', null);
         $data['phone'] = $this->request->param('phone', null);
+        //        $data['phone'] = $this->request->param('phone', null);
+        if (!empty($data['phone'])) {
+            $data['account'] = $data['phone'];
+        }
         $data = array_filter($data, function($value) {
             return $value !== null;
         });