From de7e992d171173463dae6200b325f952cedab15b Mon Sep 17 00:00:00 2001
From: "675061370@qq.com" <you@example.com>
Date: Sun, 15 Sep 2024 18:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E5=88=AB=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=87=87=E9=9B=86=E7=9A=84=E9=97=AE=E9=A2=98=E5=8F=8A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=AA=E9=9D=99=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/view/common/header.html  | 6 +++---
 extend/quarkPlugin/QuarkPlugin.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/index/view/common/header.html b/app/index/view/common/header.html
index 56756e9..00b6745 100644
--- a/app/index/view/common/header.html
+++ b/app/index/view/common/header.html
@@ -7,9 +7,9 @@
     {/notempty}
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width,user-scalable=no,maximum-scale=1.0">
-    <title>{if condition="isset($detail) && $detail.title"}{$detail.title} - {$config.app_name}{else /}{$config.app_name}{notempty name="$config.app_title"} - {$config.app_title}{/notempty}{/if}</title>
-    <meta name="keywords" content="{notempty name="detail"}{$detail.title},{/notempty}{$config.app_keywords}" />
-    <meta name="description" content="{notempty name="detail"}{$detail.title} - {/notempty}{$config.app_description}" />
+    <title>{if condition="isset($detail) && $detail.title"}{$detail.title} - {$config.app_name}{elseif condition="isset($keyword) && $keyword"}{$keyword} - {$config.app_name}{else /}{$config.app_name}{notempty name="$config.app_title"} - {$config.app_title}{/notempty}{/if}</title>
+    <meta name="keywords" content="{notempty name="keyword"}{$keyword},{/notempty}{notempty name="detail"}{$detail.title},{/notempty}{$config.app_keywords}" />
+    <meta name="description" content="{notempty name="keyword"}{$keyword} - {/notempty}{notempty name="detail"}{$detail.title} - {/notempty}{$config.app_description}" />
     <link rel="stylesheet" href="/static/index/css/index.min.css">
     <link rel="stylesheet" href="/static/index/css/app.css">
     <link rel="stylesheet" href="/static/index/css/m.css">
diff --git a/extend/quarkPlugin/QuarkPlugin.php b/extend/quarkPlugin/QuarkPlugin.php
index bf119f7..cb01bc6 100644
--- a/extend/quarkPlugin/QuarkPlugin.php
+++ b/extend/quarkPlugin/QuarkPlugin.php
@@ -209,7 +209,7 @@ class QuarkPlugin
                 $title = $value['title'];
             }
             
-            if(empty($this->source_category_id)){
+            if(!empty($value['source_category_id'])){
                 $source_category_id = $value['source_category_id']??0;
             }else{
                 $source_category_id = $this->source_category_id;