From 5a94d66b3f64aa1823c7bf48260055b0f75b6b77 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Sun, 24 Apr 2022 23:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Index.php    | 1 +
 app/admin/view/index/main.html    | 2 +-
 app/install/controller/Index.php  | 1 +
 app/install/view/index/step1.html | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index a90660e..a4f8dfb 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -53,6 +53,7 @@ class Index extends BaseController
         View::assign('goodsCount', $goodsCount);
         View::assign('fileCount', $fileCount);
         View::assign('install', $install);
+        View::assign('TP_VERSION',\think\facade\App::version());
         return View();
     }
 
diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html
index 87263bd..71e26ca 100644
--- a/app/admin/view/index/main.html
+++ b/app/admin/view/index/main.html
@@ -142,7 +142,7 @@
 					</tr>
 					<tr>
 						<td class="info-td">ThinkPHP版本</td>
-						<td colspan="3">{:TP_VERSION}<a class="layui-badge layui-bg-blue" style="margin-left:8px" href="https://www.kancloud.cn/manual/thinkphp6_0" target="_blank">TP6文档</a></td>
+						<td colspan="3">{TP_VERSION}<a class="layui-badge layui-bg-blue" style="margin-left:8px" href="https://www.kancloud.cn/manual/thinkphp6_0" target="_blank">TP6文档</a></td>
 					</tr>
 					<tr>
 						<td class="info-td">Layui版本</td>
diff --git a/app/install/controller/Index.php b/app/install/controller/Index.php
index 016a429..5e2295f 100644
--- a/app/install/controller/Index.php
+++ b/app/install/controller/Index.php
@@ -26,6 +26,7 @@ class Index
 
     public function index()
     {
+		View::assign('TP_VERSION',\think\facade\App::version());
         return view('step1');
     }
 
diff --git a/app/install/view/index/step1.html b/app/install/view/index/step1.html
index 4ec65d8..b6dfd30 100644
--- a/app/install/view/index/step1.html
+++ b/app/install/view/index/step1.html
@@ -34,7 +34,7 @@
 				</ul>
 			</div>
 			<div style="padding:20px; background-color:#fff;line-height: 27px; border-radius:0 0 6px 6px">
-				<p>勾股CMS是一套基于ThinkPHP{$TP_version} + Layui{:LAYUI_VERSION} + MySql打造的轻量级、高性能快速建站的内容管理系统。后台管理模块，一目了然，操作简单，通用型后台权限管理框架，紧随潮流、开箱即用，让WEB开发更简单！<br><br>
+				<p>勾股CMS是一套基于ThinkPHP{$TP_VERSION} + Layui{:LAYUI_VERSION} + MySql打造的轻量级、高性能快速建站的内容管理系统。后台管理模块，一目了然，操作简单，通用型后台权限管理框架，紧随潮流、开箱即用，让WEB开发更简单！<br><br>
 					<strong>开源协议：</strong><br>
 					本系统遵循Apache Lisense 2.0开源协议发布，并提供免费使用。<br>
 					Apache Licence是著名的非盈利开源组织Apache采用的协议。该协议和BSD类似，鼓励代码共享和尊重原作者的著作权，允许代码修改，再作为开源或商业软件发布。需要满足的条件：<br>