diff --git a/application/index/controller/Install.php b/application/index/controller/Install.php index cac3a358..91c44c6f 100644 --- a/application/index/controller/Install.php +++ b/application/index/controller/Install.php @@ -17,7 +17,7 @@ use think\facade\Session; class Install extends Controller { - public function index($stop = 1) + public function index($step = 1) { $rootPath = Env::get('root_path'); @@ -34,7 +34,7 @@ class Install extends Controller $isFileInfo = function_exists('finfo_open'); $isMysqli = class_exists('mysqli'); - switch ($stop) { + switch ($step) { case 1: // 运行环境检测 $testing = $phpVerGt56 && $isCurl && $isFileInfo && $isZip && $isMysqli; @@ -116,7 +116,7 @@ class Install extends Controller } $this->assign([ - 'stop' => $stop + 'step' => $step ]); return $this->fetch(); } diff --git a/application/index/view/install/index.html b/application/index/view/install/index.html index 27830624..cc5f4a49 100644 --- a/application/index/view/install/index.html +++ b/application/index/view/install/index.html @@ -32,7 +32,7 @@
- {switch stop} + {switch step} {case 1}

- 运行环境检测

@@ -103,7 +103,7 @@ {if (!$testing) } 检测不通过 {else/} - 下一步 + 下一步 {/if} {/case} @@ -180,7 +180,7 @@ $('#configure-mysql-form').submit(function (e) { e.preventDefault(); $.ajax({ - url: "{:url('install/index', ['stop' => 2])}", + url: "{:url('install/index', ['step' => 2])}", data: $(this).serialize(), type: 'POST', dataType: 'JSON', @@ -188,7 +188,7 @@ }, success: function (response) { if (response.code) { - location.href = "{:url('install/index',['stop' => 3])}"; + location.href = "{:url('install/index',['step' => 3])}"; } else { mdui.snackbar({ message: response.msg, @@ -206,7 +206,7 @@ $('#configure-admin-form').submit(function (e) { e.preventDefault(); $.ajax({ - url: "{:url('install/index', ['stop' => 3])}", + url: "{:url('install/index', ['step' => 3])}", data: $(this).serialize(), type: 'POST', dataType: 'JSON', @@ -214,7 +214,7 @@ }, success: function (response) { if (response.code) { - location.href = "{:url('install/index', ['stop' => 4])}"; + location.href = "{:url('install/index', ['step' => 4])}"; } else { mdui.snackbar({ message: response.msg,