xiaogang 3 years ago
parent
commit
d7af1884ec

+ 1 - 1
app/Admin/Actions/Users/UsersInfo.php

@@ -20,7 +20,7 @@ class UsersInfo extends Form implements LazyRenderable
 
 
     public function handle(array $input)
     public function handle(array $input)
     {
     {
-        $user = User::query()->where(['id'=>$input['id'],'is_distory'=>0])->first();
+        $user = User::query()->where(['id'=>$input['id']])->first();
         if(!$user){
         if(!$user){
 
 
             return $this->response()->error('请刷新后重试');
             return $this->response()->error('请刷新后重试');

+ 1 - 1
app/Http/Controllers/Api/AuthorizationsController.php

@@ -323,7 +323,7 @@ class AuthorizationsController extends Controller
                 throw new Exception($validator->messages()->first());
                 throw new Exception($validator->messages()->first());
             }
             }
             //验证短信验证码
             //验证短信验证码
-          //  SmsService::checkSmsCodeByVerifyKey($request->verifyKey, $request->smsCode);
+            //SmsService::checkSmsCodeByVerifyKey($request->verifyKey, $request->smsCode);
 
 
             $user = User::where(['mobile'=>$request->mobile])->first();
             $user = User::where(['mobile'=>$request->mobile])->first();
             $user->password =$request->password;// Hash::make($request->password);
             $user->password =$request->password;// Hash::make($request->password);

+ 3 - 3
app/Http/Controllers/Api/UserController.php

@@ -237,9 +237,9 @@ class UserController extends Controller
                 return $this->response->errorForbidden('昵称已被使用');
                 return $this->response->errorForbidden('昵称已被使用');
             }
             }
         }
         }
-//        if(UserVipLimit::query()->where('user_id',$user->id)->value('user_info')==1){
-//            return $this->response->errorForbidden("每天只能修改一次");
-//        }
+        if(UserVipLimit::query()->where('user_id',$user->id)->value('user_info')==1){
+            return $this->response->errorForbidden("每天只能修改一次");
+        }
 
 
 //        $upd = array();
 //        $upd = array();
 //        if(isset($request->nickname)&&!empty($request->nickname)){
 //        if(isset($request->nickname)&&!empty($request->nickname)){

+ 7 - 1
app/Services/HomeService.php

@@ -31,7 +31,7 @@ class HomeService
     public function get_list($param){
     public function get_list($param){
         $query = User::query()
         $query = User::query()
             ->leftJoin("users_info",'users.id','=','users_info.user_id')
             ->leftJoin("users_info",'users.id','=','users_info.user_id')
-            ->select(['users.id','users.is_vip','users.tencent_im_user_id','users.sex','users.is_auth','users.latitude','users.longitude','users.online','users_info.avatar','users_info.nickname','users_info.area','users_info.birthday','users_info.height','users_info.weight','users_info.video'])
+            ->select(['users.id','users.is_vip','users.tencent_im_user_id','users.sex','users.is_auth','users.latitude','users.longitude','users.online','users_info.avatar','users_info.nickname','users_info.area','users_info.birthday','users_info.height','users_info.weight','users_info.video','users_info.photo'])
             ->addSelect(DB::raw("acos(cos(" .$param['latitude'] . "*pi()/180)*cos(cl_users.latitude*pi()/180)*cos(" . $param['longitude'] . "*pi()/180-cl_users.longitude*pi()/180)+sin(" . $param['latitude'] . "*pi()/180)*sin(cl_users.latitude * pi()/180)) * 6367000 AS distance"))
             ->addSelect(DB::raw("acos(cos(" .$param['latitude'] . "*pi()/180)*cos(cl_users.latitude*pi()/180)*cos(" . $param['longitude'] . "*pi()/180-cl_users.longitude*pi()/180)+sin(" . $param['latitude'] . "*pi()/180)*sin(cl_users.latitude * pi()/180)) * 6367000 AS distance"))
             ->where('users.is_distory','=','0');
             ->where('users.is_distory','=','0');
 
 
@@ -90,6 +90,12 @@ class HomeService
 
 
             $video = json_decode($v['video'],true);
             $video = json_decode($v['video'],true);
             $query['data'][$k]['has_video'] = count($video)>0?1:0;
             $query['data'][$k]['has_video'] = count($video)>0?1:0;
+
+            $photo = json_decode($v['photo'],true);
+            if(count($photo)>0){
+                $query['data'][$k]['avatar'] = $photo[0]['url'];
+            }
+
         }
         }
         return $query;
         return $query;
     }
     }