From 42f3cda1a9bbe49e0829da45ded7fe77cfcd1dd6 Mon Sep 17 00:00:00 2001 From: HCLonely Date: Sun, 25 Apr 2021 12:25:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A1=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AD=90=E9=A1=B5=E9=9D=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/index.ejs | 2 +- layout/layout.ejs | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layout/index.ejs b/layout/index.ejs index c88825a..0cef5b5 100644 --- a/layout/index.ejs +++ b/layout/index.ejs @@ -1,5 +1,5 @@ <% const isChildPage = page.type === 'child' %> -<% const setting = isChildPage ? Object.assign(theme, page) : theme %> +<% const setting = isChildPage ? Object.assign({}, theme, page) : theme %> <%# console.log(page.path) %>
diff --git a/layout/layout.ejs b/layout/layout.ejs index 5eba869..ace396e 100644 --- a/layout/layout.ejs +++ b/layout/layout.ejs @@ -1,6 +1,6 @@ -<% const setting = page ? Object.assign(theme, page) : theme %> +<% const setting = page ? Object.assign({}, theme, page) : theme %> <%- partial('common/head', {setting:setting}) %> diff --git a/package.json b/package.json index 4b62805..a41c485 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-webstack", - "version": "2.0.3", + "version": "2.0.4", "description": "A hexo theme based on webstack.", "keywords": [ "hexo",