diff --git a/main.go b/main.go index 06b7351..78f0e45 100644 --- a/main.go +++ b/main.go @@ -15,20 +15,15 @@ func main() { // 路由 r.GET("/", func(c *gin.Context) { - c.HTML(200, "pages/index.html", gin.H{ - "Title": "首页", - }) + c.HTML(200, "index", gin.H{}) }) r.GET("/about", func(c *gin.Context) { - c.HTML(200, "pages/about.html", gin.H{ - "Title": "关于我们", - }) + c.HTML(200, "about", gin.H{}) }) r.GET("/articles", func(c *gin.Context) { - c.HTML(200, "pages/articles.html", gin.H{ - "Title": "文章列表", + c.HTML(200, "articles", gin.H{ "Articles": []map[string]string{ {"Title": "Gin框架入门", "Date": "2025-11-23"}, {"Title": "Go语言最佳实践", "Date": "2025-11-20"}, @@ -37,9 +32,7 @@ func main() { }) r.GET("/contact", func(c *gin.Context) { - c.HTML(200, "pages/contact.html", gin.H{ - "Title": "联系我们", - }) + c.HTML(200, "contact", gin.H{}) }) r.Run(":8080") diff --git a/templates/layout/base.html b/templates/layout/base.html index 509c25f..dae822f 100644 --- a/templates/layout/base.html +++ b/templates/layout/base.html @@ -1,4 +1,4 @@ -{{ define "layout/base.html" }} +{{ define "base" }} @@ -7,7 +7,7 @@ - {{ template "layout/navbar.html" . }} + {{ template "navbar" . }}
{{ block "content" . }}{{ end }} diff --git a/templates/layout/navbar.html b/templates/layout/navbar.html index 620bffd..e84efe0 100644 --- a/templates/layout/navbar.html +++ b/templates/layout/navbar.html @@ -1,6 +1,6 @@ -{{ define "layout/navbar.html" }} +{{ define "navbar" }}