更新

app/Admin/Actions/Users/UserVip.php

@@ -6,7 +6,7 @@ namespace App\Admin\Actions\Users;
 use Dcat\Admin\Grid\RowAction;
 use Dcat\Admin\Widgets\Modal;
 use Illuminate\Http\Request;
-
+use App\Admin\Actions\Users\UserVipForm;
 class UserVip extends RowAction
 {
     protected $title = '<i class="feather icon-award"></i> 设置VIP';

app/Services/NoticeService.php

@@ -26,14 +26,15 @@ class NoticeService
         $query = UserLikeModel::query();
         if($param['type']==1){
             //我喜欢
-//            $query = $query->with(['like_user'=>function($query){
-//                $query->select('id','sex','is_vip','tencent_im_user_id');
-//            },'like_user_info'])->where('user_id',$param['user_id']);
+            $query = $query->with(['like_user'=>function($query){
+                $query->select('id','sex','is_vip','tencent_im_user_id');
+            },'like_user_info'])->where('user_id',$param['user_id']);
+
+//            $query = $query->leftJoin('users','users_like.like_id','=','users.id')
+//                ->leftJoin('users_info','users_like.like_id','=','users_info.user_id')
+//                ->where('users_like.user_id',$param['user_id'])
+//                ->select(['users_like.id','users_like.user_id','users_like.like_id','users_like.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
 
-            $query = $query->leftJoin('users','users_like.like_id','=','users.id')
-                ->leftJoin('users_info','users_like.like_id','=','users_info.user_id')
-                ->where('users_like.user_id',$param['user_id'])
-                ->select(['users_like.id','users_like.user_id','users_like.like_id','users_like.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
         }else{
             //喜欢我
 //            $query = $query->with(['user'=>function($query){
@@ -45,6 +46,8 @@ class NoticeService
                 ->where('users_like.like_id',$param['user_id'])
                 ->select(['users_like.id','users_like.user_id','users_like.like_id','users_like.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
 
+
+
             //清除喜欢我未读状态
             UserLikeModel::query()->where(['like_id'=>$param['user_id'],'status'=>0])->update(['status'=>1]);
         }
@@ -55,7 +58,6 @@ class NoticeService
         foreach ($query['data'] as $k=>$v){
             $query['data'][$k]['distance'] = 0;  //计算距离
             $query['data'][$k]['age'] = !empty($v['birthday'])?birthday($v['birthday']):0;  //计算距离
-
         }
         return $query;
     }