合并分支 'heshupeng' 到 'master'

手机号



查看合并请求 !245

@@ -852,7 +852,7 @@ class Lists extends Api
             $this->error('两次密码不一致，请重新输入');
             $this->error('两次密码不一致，请重新输入');
         }
         }
 
 
-        $result1 = Db::name('user')->where('phone',$phone)->find();
+        $result1 = Db::name('user')->where('mobile',$phone)->find();
         if(empty($result1)){
         if(empty($result1)){
             $this->error('该手机号暂无绑定账号');
             $this->error('该手机号暂无绑定账号');
         }
         }

@@ -72,7 +72,7 @@ class User extends Api
         if(empty($data['card'])){
         if(empty($data['card'])){
             $data['card'] = '';
             $data['card'] = '';
         }
         }
-        if(empty($data['phone'])){
+        if(empty($data['mobile'])){
             $data['phone'] = '';
             $data['phone'] = '';
         }
         }
         if(empty($data['work_address'])){
         if(empty($data['work_address'])){
@@ -115,6 +115,10 @@ class User extends Api
         $code = $this->request->param('code');
         $code = $this->request->param('code');
         $image = $this->request->param('image');
         $image = $this->request->param('image');
         if(!empty($phone)){
         if(!empty($phone)){
+            $have_mobile = Db::name('user')->where('mobile', $phone)->where('id', '<>', $user_id)->find();
+            if($have_mobile){
+                $this->error('手机号已存在');
+            }
             if(empty($code)){
             if(empty($code)){
                 $this->error('验证码不能为空');
                 $this->error('验证码不能为空');
             }
             }
@@ -129,6 +133,7 @@ class User extends Api
             $params['sex'] = $sex;
             $params['sex'] = $sex;
         }
         }
         if($phone){
         if($phone){
+            $params['mobile'] = $phone;
             $params['phone'] = $phone;
             $params['phone'] = $phone;
         }
         }
         if(empty($data['image']) && $image){
         if(empty($data['image']) && $image){
@@ -253,7 +258,7 @@ class User extends Api
         }
         }
 
 
         $user_info = Db::name('user')->where('id',$user_id)->find();
         $user_info = Db::name('user')->where('id',$user_id)->find();
-        if(empty($user_info['image']) || empty($user_info['phone'])){
+        if(empty($user_info['image']) || empty($user_info['mobile'])){
             $this->error('请先完善个人信息');
             $this->error('请先完善个人信息');
         }
         }