Merge branch 'ss' into stabble

app/Http/Controllers/Wap/Subscribe/SubscribeController.php

@@ -108,6 +108,7 @@ class SubscribeController extends BaseController
     //获取用户的强关信息
     function getFromUser()
     {
+        Cookie::queue('force_show_qrcode', 1, -1);
         $uid = $this->uid;
         $user_info = ForceSubscribeService::forceSubscribeUsersByUid(compact('uid'));
         if(isset($_GET['d']))

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

@@ -113,7 +113,7 @@ class RedirectController extends Controller
             //判断是否强制到服务号阅读
             if($link->force_show_qrcode)
             {
-                Cookie::queue('force_show_qrcode', 1, 0, null, null, false, false);
+                Cookie::queue('force_show_qrcode', 1, 1);
             }
             //
             $redirect_path = $request->get('redirect_path');