gq 8 years ago
parent
commit
82a6e6c616

+ 1 - 0
server/app/Http/Controllers/Api/V1/DreamController.php

xqd
@@ -333,6 +333,7 @@ class DreamController extends Controller
         $data = [
             'user_id' =>$user->id,
             'dream_id' =>$request->id,
+            'dream_user_id' =>DreamInfoModel::find($request->id)->user_id,
         ];
         $info = UserCareDream::where('user_id',$user->id)->
             where('dream_id',$request->id)->first();

+ 2 - 9
server/app/Http/Controllers/Api/V1/IndexController.php

xqd xqd
@@ -204,6 +204,7 @@ class IndexController extends Controller
             $banner = $this->getBanner();
     //        获取其他用户信息 及梦想
             $dreams = DreamInfoModel::orderBy('score','desc')->limit(20)->paginate(20);
+            $this->dreams($dreams);
             return $this->api(compact('banner','users','dreams'));
         }
     }
@@ -384,20 +385,12 @@ class IndexController extends Controller
             $dream->dream_user =  $dream->dreamUser;
 //            计算被关注总人数
             $user_id =  $dream->user_id;
-            $data = UserCareUser::where('other_user_id',$user_id)->get();
+            $data = UserCareDream::where('dream_id',$dream->id)->get();
             $dream->care_num = count($data);
             $dream->dream_imgs_first = $dream->dreamImgsFirst?$dream->dreamImgsFirst->pic:'';
 //            梦想详情  detailed  图片 ,评论 ,回复
             $arr = [] ;
             $arr['dream_imgs'] = $dream->dreamImgs;
-            $arr['comments'] = $dream->DreamInfo;
-            foreach (  $arr['comments'] as $k => $v){
-                $v->pic =  UserInfoModel::find($v->user_id)->pic;
-                $v->replay = $v->replay;
-                foreach ($v->replay as $k1 => $v1){
-                    $v1->pic =  UserInfoModel::find($v1->user_id)->pic;
-                }
-            }
             $dream->dream_detailed = $arr;
         }
     }

+ 1 - 0
server/app/Models/UserCareDream.php

xqd
@@ -10,5 +10,6 @@ class UserCareDream extends Model
     protected  $fillable = [
         'user_id',
         'dream_id',
+        'dream_user_id',
         ];
 }