xiaogang 3 年之前
父节点
当前提交
c17f3281ae
共有 4 个文件被更改,包括 14 次插入13 次删除
  1. 7 8
      app/Helper/function.php
  2. 5 5
      app/Http/Controllers/Api/UserController.php
  3. 1 0
      app/Services/HomeService.php
  4. 1 0
      app/Services/UserService.php

+ 7 - 8
app/Helper/function.php

@@ -144,17 +144,16 @@ function birthday($birthday){
  * @return bool
  * @return bool
  */
  */
 function look_log($user_id,$look_id){
 function look_log($user_id,$look_id){
+    $last_look = DB::table('users_look')->where(['user_id'=>$user_id,'look_id'=>$look_id])->first();
+    if($last_look){
+        //如果看过 刷新看人的时间
+        $last_look->atime = date("Y-m-d H:i:s");
+        $last_look->save();
+        return true;
+    }
     $ins['user_id'] = $user_id;
     $ins['user_id'] = $user_id;
     $ins['look_id'] = $look_id;
     $ins['look_id'] = $look_id;
     $ins['atime'] = date("Y-m-d H:i:s");
     $ins['atime'] = date("Y-m-d H:i:s");
-    $last_look = DB::table('users_look')->where(['user_id'=>$user_id,'look_id'=>$look_id])
-//        ->orderBy('atime','desc')
-        ->first();
-    if($last_look
-//        && date('d')==date('d',strtotime($last_look->atime))
-    ){
-        return true;
-    }
     DB::table('users_look')->insert($ins);
     DB::table('users_look')->insert($ins);
     DB::table('users')->where('id','=',$look_id)->increment('look_num',1);
     DB::table('users')->where('id','=',$look_id)->increment('look_num',1);
     return true;
     return true;

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

@@ -130,7 +130,7 @@ class UserController extends Controller
                 'avatar' =>$request->avatar,
                 'avatar' =>$request->avatar,
                 'nickname' =>htmlspecialchars($request->nickname),
                 'nickname' =>htmlspecialchars($request->nickname),
                 'birthday' =>$request->birthday,
                 'birthday' =>$request->birthday,
-                'video' => !empty($request->video)?json_encode(['url'=>$request->video]) :[],
+                'video' => !empty($request->video)?json_encode(['url'=>$request->video,'thumb'=>$request->thumb??""]) :[],
             ]);
             ]);
             if($pid!=0){
             if($pid!=0){
                 $user->pid = $pid;
                 $user->pid = $pid;
@@ -247,9 +247,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)){
@@ -323,7 +323,7 @@ class UserController extends Controller
             }else{
             }else{
                 //视频
                 //视频
                 $user_video = json_decode($userinfo->video,true);
                 $user_video = json_decode($userinfo->video,true);
-                $user_video []= ['url'=>$request->post('url')];
+                $user_video []= ['url'=>$request->post('url'),'thumb'=>$request->post('thumb')];
                 $userinfo->video = json_encode($user_video);
                 $userinfo->video = json_encode($user_video);
             }
             }
             $userinfo->save();
             $userinfo->save();

+ 1 - 0
app/Services/HomeService.php

@@ -202,6 +202,7 @@ class HomeService
             foreach ($video_info as $k=>$v){
             foreach ($video_info as $k=>$v){
                 $video_arr = array();
                 $video_arr = array();
                 $video_arr['url'] = $v['url'];
                 $video_arr['url'] = $v['url'];
+                $video_arr['thumb'] = isset($v['thumb'])?$v['thumb']:"";
                 $video_arr['state'] = 0;
                 $video_arr['state'] = 0;
                 array_unshift($photo,$video_arr);
                 array_unshift($photo,$video_arr);
             }
             }

+ 1 - 0
app/Services/UserService.php

@@ -55,6 +55,7 @@ class UserService
                 $query->where('is_distory',0)->select();
                 $query->where('is_distory',0)->select();
             })
             })
             ->groupBy('user_id')
             ->groupBy('user_id')
+            ->orderByDesc('atime')
             ->paginate(request('perPage',20));
             ->paginate(request('perPage',20));
         $res = $res->toArray();
         $res = $res->toArray();
         //改变看过状态
         //改变看过状态