修复主页显示子页面的bug

HCLonely · HCLonely · commit 42f3cda1a9bb · 2021-04-25T12:25:00.000+08:00
diff --git 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) %>
 <body class="page-body">
 <div class="page-container">
diff --git a/layout/layout.ejs b/layout/layout.ejs
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="<%= config.language %>">
-<% const setting = page ? Object.assign(theme, page) : theme %>
+<% const setting = page ? Object.assign({}, theme, page) : theme %>
 <head>
   <%- partial('common/head', {setting:setting}) %>
 </head>
diff --git 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",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hexo-theme-webstack",`
`3`		`- "version": "2.0.3",`
	`3`	`+ "version": "2.0.4",`
`4`	`4`	`"description": "A hexo theme based on webstack.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"hexo",`