Browse Source

修复版本升级错误

tags/6.2.0
tianya 1 year ago
parent
commit
6e97b03e1b
3 changed files with 16 additions and 4 deletions
  1. +9
    -0
      src/admin/templets/index_body.htm
  2. +5
    -2
      src/static/web/css/admin.css
  3. +2
    -2
      src/system/common.inc.php

+ 9
- 0
src/admin/templets/index_body.htm View File

@@ -190,6 +190,7 @@
</div> </div>
<script> <script>
var currentStep = 1; var currentStep = 1;
var hasNewVer = false;
//步骤 //步骤
function dedeAlter(msg, t = 'info', loading = false) { function dedeAlter(msg, t = 'info', loading = false) {
let loadingStr = loading ? '<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>' : ''; 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); let rs = JSON.parse(data);
if (rs.code === 0) { if (rs.code === 0) {
if (rs.result.HasNew === true) { if (rs.result.HasNew === true) {
hasNewVer = true;
$(".updates-dot").show(); $(".updates-dot").show();
} else { } else {
hasNewVer = false;
$(".updates-dot").hide(); $(".updates-dot").hide();
} }
} else { } else {
@@ -257,6 +260,12 @@
}) })
}) })
$("#systemUpdate").click(function () { $("#systemUpdate").click(function () {
if (hasNewVer === false) {
currentStep = 5;
showStepArea(currentStep);
$('#mdlUpdate').modal('show');
return;
}
$('#mdlUpdate').modal('show'); $('#mdlUpdate').modal('show');
showStepArea(currentStep); showStepArea(currentStep);
currentStep++; currentStep++;


+ 5
- 2
src/static/web/css/admin.css View File

@@ -609,8 +609,11 @@ span.page-link {
float:right; float:right;
cursor:pointer cursor:pointer
} }
.updates-dot{
display: none;
}
@media (min-width:480px) { @media (min-width:480px) {
.modal-dialog { .modal-dialog {
max-width:500px
}
max-width:500px
}
} }

+ 2
- 2
src/system/common.inc.php View File

@@ -187,10 +187,10 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
$cfg_other_medias = $cfg_medias_dir.'/media'; $cfg_other_medias = $cfg_medias_dir.'/media';
//软件摘要信息,请不要删除,否则系统无法正确接收系统漏洞或升级信息 //软件摘要信息,请不要删除,否则系统无法正确接收系统漏洞或升级信息
$cfg_version = 'V6'; $cfg_version = 'V6';
$cfg_version_detail = '6.0.0'; //详细版本号
$cfg_version_detail = '6.2.0'; //详细版本号
$cfg_soft_lang = 'utf-8'; $cfg_soft_lang = 'utf-8';
$cfg_soft_public = 'base'; $cfg_soft_public = 'base';
$cfg_softname = '得系统';
$cfg_softname = '得系统';
$cfg_soft_enname = 'DedeV6'; $cfg_soft_enname = 'DedeV6';
$cfg_soft_devteam = 'DedeBIZ'; $cfg_soft_devteam = 'DedeBIZ';
//文档的默认命名规则 //文档的默认命名规则


Loading…
Cancel
Save