Merge branch 'stabble'

app/Http/Controllers/Wap/User/CoflController.php

@@ -614,6 +614,12 @@ class CoflController extends Controller
         $uid = $request->get('uid',0);
         //$user_cookie = Cookie::get(env('COOKIE_AUTH_WEB_WECHAT'));
         //$uid = $user_cookie ? decrypt($user_cookie) : null;
+        $cookie_crm_img = Cookie::get('crm_person_img');
+        $cookie_crm_name = Cookie::get('crm_person_name','');
+        if($cookie_crm_img){
+            return view('jump.guidePersonalAccountOurs',['img'=>$cookie_crm_img,'name'=>$cookie_crm_name]);
+        }
+
         $env_config = redisEnvMulti('ACTIVE_GUIDE_PERSONAL_ACCOUNT_OURS_QRCODE',
             'ACTIVE_GUIDE_PERSONAL_ACCOUNT_MAX_UV','ACTIVE_GUIDE_PERSONAL_ACCOUNT_ID',
             'ACTIVE_GUIDE_PERSONAL_ACCOUNT_MAX_EVERY_UV');
@@ -687,6 +693,9 @@ class CoflController extends Controller
             $page = 'jump.guidePersonalAccountOurs';
         }*/
         $page = 'jump.guidePersonalAccountOurs';
+        $time = strtotime(date('Y-m-d',time()+86400))-time();
+        Cookie::queue('crm_person_img', $img,$time);
+        Cookie::queue('crm_person_name', $name,$time);
         //$page = 'jump.guidePersonalAccount';
         //$img = collect($imgs)->random();
         return view($page,['img'=>$img,'name'=>$name]);

app/Http/Controllers/Wap/Web/ActivityController.php

@@ -351,9 +351,9 @@ class ActivityController extends BaseController
     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/';
         if (empty($sites)) {
             return redirect()->to($not_access_url);
@@ -361,7 +361,7 @@ class ActivityController extends BaseController
         $site_arr = explode(',', $sites);
         if (!in_array($this->distribution_channel_id, $site_arr)) {
             return redirect()->to($not_access_url);
-        }
+        }*/
         $token = $request->input('token');
         $activity_info = ActivityService::getByToken($token);
         if (!$activity_info) {

app/Http/Middleware/EncryptCookies.php

@@ -25,6 +25,8 @@ class EncryptCookies extends BaseEncrypter
         'cpc_ad_status',
         'crm',
         'crm_flag',
-        'is_paid'
+        'is_paid',
+        'crm_person_img',
+        'crm_person_name'
     ];
 }