|
@@ -351,9 +351,9 @@ class ActivityController extends BaseController
|
|
|
public function summerHoliday(Request $request)
|
|
public function summerHoliday(Request $request)
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- //$encode_distribution_channel_id = encodeDistributionChannelId($this->distribution_channel_id);
|
|
|
|
|
- $encode_distribution_channel_id = 2;
|
|
|
|
|
- $sites = env('YEAR_ACTIVITY_CHANNEL', '');
|
|
|
|
|
|
|
+ $encode_distribution_channel_id = encodeDistributionChannelId($this->distribution_channel_id);
|
|
|
|
|
+ //$encode_distribution_channel_id = 2;
|
|
|
|
|
+ /*$sites = env('YEAR_ACTIVITY_CHANNEL', '');
|
|
|
$not_access_url = env('H5_SCHEME', 'https') . '://site' . $encode_distribution_channel_id . '.' . env('CUSTOM_HOST') . '.com/';
|
|
$not_access_url = env('H5_SCHEME', 'https') . '://site' . $encode_distribution_channel_id . '.' . env('CUSTOM_HOST') . '.com/';
|
|
|
if (empty($sites)) {
|
|
if (empty($sites)) {
|
|
|
return redirect()->to($not_access_url);
|
|
return redirect()->to($not_access_url);
|
|
@@ -361,7 +361,7 @@ class ActivityController extends BaseController
|
|
|
$site_arr = explode(',', $sites);
|
|
$site_arr = explode(',', $sites);
|
|
|
if (!in_array($this->distribution_channel_id, $site_arr)) {
|
|
if (!in_array($this->distribution_channel_id, $site_arr)) {
|
|
|
return redirect()->to($not_access_url);
|
|
return redirect()->to($not_access_url);
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
$token = $request->input('token');
|
|
$token = $request->input('token');
|
|
|
$activity_info = ActivityService::getByToken($token);
|
|
$activity_info = ActivityService::getByToken($token);
|
|
|
if (!$activity_info) {
|
|
if (!$activity_info) {
|
