diff --git a/app/index/config/view.php b/app/index/config/view.php index 78a968a0..0fefd60b 100644 --- a/app/index/config/view.php +++ b/app/index/config/view.php @@ -7,7 +7,7 @@ use Detection\MobileDetect; $detect = new MobileDetect(); $view_device_name = 'pc'; -if ($detect->isMobile() || $detect->isTablet()) { +if ($detect->isMobile() || $detect->isTablet() || request()->get('mtpl') == 1) { $view_device_name = 'mobile'; } diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php index 46393073..8a78e6d8 100644 --- a/app/index/controller/Article.php +++ b/app/index/controller/Article.php @@ -122,6 +122,7 @@ class Article extends Common 'image' ]) ->where('id', '<>', $id) + ->language($this->lang_id) ->order(['release_time' => 'desc', 'id' => 'desc']) ->limit(3) ->select(); diff --git a/app/index/view/pc/public/base.html b/app/index/view/pc/public/base.html index 82fd15d2..b565e8e5 100644 --- a/app/index/view/pc/public/base.html +++ b/app/index/view/pc/public/base.html @@ -18,6 +18,13 @@ + {block name="header"} diff --git a/config/cookie.php b/config/cookie.php index d3b3aab9..c19f4fde 100644 --- a/config/cookie.php +++ b/config/cookie.php @@ -12,9 +12,9 @@ return [ // cookie 启用安全传输 'secure' => false, // httponly设置 - 'httponly' => false, + 'httponly' => true, // 是否使用 setcookie 'setcookie' => true, // samesite 设置,支持 'strict' 'lax' - 'samesite' => '', + 'samesite' => 'strict', ];