| xqd
@@ -6,6 +6,7 @@ use App\Models\Product;
|
|
|
use App\Models\ProductType;
|
|
|
use App\Models\ReportLog;
|
|
|
use App\Models\UserCollect;
|
|
|
+use App\Models\UserFollow;
|
|
|
use App\Models\UserLike;
|
|
|
use Illuminate\Http\Request;
|
|
|
|
| xqd
@@ -183,6 +184,12 @@ class ProductController extends Controller
|
|
|
}
|
|
|
$list = $query->where('status',1)
|
|
|
->paginate(intval($limit));
|
|
|
+ foreach ($list as $v){
|
|
|
+ $v['is_collect'] = 0;
|
|
|
+ if(!empty($this->userId)){
|
|
|
+ $v['is_collect'] = UserCollect::query()->where('product_id',$v['id'])->where('user_id',$this->userId)->count();
|
|
|
+ }
|
|
|
+ }
|
|
|
return $this->success(pages($list,$go));
|
|
|
}
|
|
|
|
| xqd
@@ -194,8 +201,17 @@ class ProductController extends Controller
|
|
|
|
|
|
$data = Product::query()
|
|
|
->with('user:id,name,nickname,avatar,company_name,company_url,production_project')
|
|
|
- ->select("id","name","user_id","content","image","type")->first();
|
|
|
+ ->select("id","name","user_id","content","image","type","url")->first();
|
|
|
|
|
|
+ $data['is_collect'] = 0; // 收藏
|
|
|
+ $data['is_follow'] = 0; // 关注
|
|
|
+ $data['is_like'] = 0; // 喜欢
|
|
|
+ if(!empty($this->userId)){
|
|
|
+ $data['is_collect'] = UserCollect::query()->where('product_id',$data['id'])->where('user_id',$this->userId)->count();
|
|
|
+ $data['is_follow'] = UserFollow::query()->where('to_user_id',$data['user_id'])->where('user_id',$this->userId)->count();
|
|
|
+ $data['is_like'] = UserLike::query()->where('product_id',$data['id'])->where('user_id',$this->userId)->count();
|
|
|
+ }
|
|
|
+ $data['user']['follow_count'] = UserFollow::query()->where('user_id',$data['user_id'])->count();
|
|
|
return $this->success($data);
|
|
|
|
|
|
}
|