|
@@ -605,7 +605,7 @@ class BookController extends BaseController
|
|
|
|
|
|
if($release_type == '4' || $release_type == '5'){
|
|
if($release_type == '4' || $release_type == '5'){
|
|
//弹窗和充值页返回需要先判断频率跟权限
|
|
//弹窗和充值页返回需要先判断频率跟权限
|
|
- $advert = ChannelAdvert::select('id','photo as banner_url','type','content','person','frequency')
|
|
|
|
|
|
+ $advert = ChannelAdvert::select('id','photo as banner_url','activity_id','type','content','person','frequency')
|
|
->where('distribution_id',$distribution_id)
|
|
->where('distribution_id',$distribution_id)
|
|
->where('release_type',$release_type)
|
|
->where('release_type',$release_type)
|
|
->where('status',1)
|
|
->where('status',1)
|
|
@@ -664,7 +664,9 @@ class BookController extends BaseController
|
|
|
|
|
|
$activity = ActivityService::getById($advert['activity_id'] ?? 0);
|
|
$activity = ActivityService::getById($advert['activity_id'] ?? 0);
|
|
if ($activity){
|
|
if ($activity){
|
|
|
|
+ $advert['redirect_url'] = "/views/Activity";
|
|
$advert = self::getBackFormat($advert);
|
|
$advert = self::getBackFormat($advert);
|
|
|
|
+ $advert['param'] = ['token' => $activity['token']];
|
|
return response()->success($advert);
|
|
return response()->success($advert);
|
|
}else{
|
|
}else{
|
|
return response()->success([]);
|
|
return response()->success([]);
|