From 6e97b03e1b455e6975d7983a07abbb3dfc2591d5 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Tue, 29 Nov 2022 22:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/index_body.htm | 9 +++++++++
 src/static/web/css/admin.css      | 7 +++++--
 src/system/common.inc.php         | 4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm
index 4398a0c0..29504ae0 100644
--- a/src/admin/templets/index_body.htm
+++ b/src/admin/templets/index_body.htm
@@ -190,6 +190,7 @@
 	</div>
 	<script>
 		var currentStep = 1;
+		var hasNewVer = false;
 		//步骤
 		function dedeAlter(msg, t = 'info', loading = false) {
 			let loadingStr = loading ? '<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>' : '';
@@ -228,8 +229,10 @@
 					let rs = JSON.parse(data);
 					if (rs.code === 0) {
 						if (rs.result.HasNew === true) {
+							hasNewVer = true;
 							$(".updates-dot").show();
 						} else {
+							hasNewVer = false;
 							$(".updates-dot").hide();
 						}
 					} else {
@@ -257,6 +260,12 @@
 				})
 			})
 			$("#systemUpdate").click(function () {
+				if (hasNewVer === false) {
+					currentStep = 5;
+					showStepArea(currentStep);
+					$('#mdlUpdate').modal('show');
+					return;
+				}
 				$('#mdlUpdate').modal('show');
 				showStepArea(currentStep);
 				currentStep++;
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index bcc341e5..95e23f05 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -609,8 +609,11 @@ span.page-link {
 	float:right;
 	cursor:pointer
 }
+.updates-dot{
+	display: none;
+}
 @media (min-width:480px) {
 	.modal-dialog {
-	max-width:500px
-}
+		max-width:500px
+	}
 }
\ No newline at end of file
diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index b2e45c2a..be270a8c 100755
--- a/src/system/common.inc.php
+++ b/src/system/common.inc.php
@@ -187,10 +187,10 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.0.0'; //详细版本号
+$cfg_version_detail = '6.2.0'; //详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
-$cfg_softname = '得得系统';
+$cfg_softname = '得德系统';
 $cfg_soft_enname = 'DedeV6';
 $cfg_soft_devteam = 'DedeBIZ';
 //文档的默认命名规则